Skip to content

Commit

Permalink
Update CI to use 1.32 eks and kops clusters
Browse files Browse the repository at this point in the history
  • Loading branch information
ElijahQuinones committed Jan 30, 2025
1 parent 4122af3 commit 0a3ca65
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions hack/e2e/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ OUTPOST_INSTANCE_TYPE=${OUTPOST_INSTANCE_TYPE:-${INSTANCE_TYPE}}
# kops: must include patch version (e.g. 1.19.1)
# eksctl: mustn't include patch version (e.g. 1.19)
# NOTE: Keep KOPS at v1.29.x until ELB usage bug fixed
K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-1.31.4}
K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-1.31}
K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-1.32.1}
K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-1.32}

EBS_INSTALL_SNAPSHOT=${EBS_INSTALL_SNAPSHOT:-"true"}
EBS_INSTALL_SNAPSHOT_VERSION=${EBS_INSTALL_SNAPSHOT_VERSION:-"v8.2.0"}
Expand Down
4 changes: 3 additions & 1 deletion hack/e2e/metrics/metrics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ collect_metrics() {
echo -e "$DEPLOYMENT_TIME" >"$METRICS_DIR_PATH/deployment_time.txt"

log "Collecting resource metrics"
install_metrics_server
if [[ "${CLUSTER_TYPE}" == "kops" ]]; then
install_metrics_server
fi
check_pod_metrics
collect_resource_metrics "kube-system" "app=ebs-csi-node" "$METRICS_DIR_PATH/node_resource_metrics.yaml"
collect_resource_metrics "kube-system" "app=ebs-csi-controller" "$METRICS_DIR_PATH/controller_resource_metrics.yaml"
Expand Down
4 changes: 2 additions & 2 deletions hack/tools/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ AWSCLI_VERSION="2.23.3"
# https://github.com/helm/chart-testing
CT_VERSION="v3.12.0"
# https://github.com/eksctl-io/eksctl
EKSCTL_VERSION="v0.197.0"
EKSCTL_VERSION="v0.202.0"
# https://github.com/onsi/ginkgo
GINKGO_VERSION="v2.22.2"
# https://github.com/golangci/golangci-lint
Expand All @@ -34,7 +34,7 @@ GOMPLATE_VERSION="v4.3.0"
HELM_VERSION="v3.17.0"
# https://github.com/kubernetes/kops
# NOTE: We pin kops to a commit instead of a release to support newer versions of k8s earlier
KOPS_COMMIT="aaa35cc5304f9b191ca9828b552e62bddc5b263a"
KOPS_COMMIT="0789af746b4e5beb6eab4b9a4b42b88f3c072d19"
# https://pkg.go.dev/sigs.k8s.io/kubetest2?tab=versions
KUBETEST2_VERSION="v0.0.0-20241216131453-22d5b1410bef"
# https://github.com/golang/mock
Expand Down

0 comments on commit 0a3ca65

Please sign in to comment.