Skip to content

Commit f419052

Browse files
authored
Merge pull request #2323 from ElijahQuinones/k8s132
Update CI to use 1.32 eks and kops clusters
2 parents 9bee9ee + aa4e383 commit f419052

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

hack/e2e/config.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ OUTPOST_INSTANCE_TYPE=${OUTPOST_INSTANCE_TYPE:-${INSTANCE_TYPE}}
3535
# kops: must include patch version (e.g. 1.19.1)
3636
# eksctl: mustn't include patch version (e.g. 1.19)
3737
# NOTE: Keep KOPS at v1.29.x until ELB usage bug fixed
38-
K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-1.31.4}
39-
K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-1.31}
38+
K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-1.32.1}
39+
K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-1.32}
4040

4141
EBS_INSTALL_SNAPSHOT=${EBS_INSTALL_SNAPSHOT:-"true"}
4242
EBS_INSTALL_SNAPSHOT_VERSION=${EBS_INSTALL_SNAPSHOT_VERSION:-"v8.2.0"}

hack/e2e/metrics/metrics.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ collect_metrics() {
6565
echo -e "$DEPLOYMENT_TIME" >"$METRICS_DIR_PATH/deployment_time.txt"
6666

6767
log "Collecting resource metrics"
68-
install_metrics_server
68+
if [[ "${CLUSTER_TYPE}" == "kops" ]]; then
69+
install_metrics_server
70+
fi
6971
check_pod_metrics
7072
collect_resource_metrics "kube-system" "app=ebs-csi-node" "$METRICS_DIR_PATH/node_resource_metrics.yaml"
7173
collect_resource_metrics "kube-system" "app=ebs-csi-controller" "$METRICS_DIR_PATH/controller_resource_metrics.yaml"

hack/tools/install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ AWSCLI_VERSION="2.23.3"
2323
# https://github.com/helm/chart-testing
2424
CT_VERSION="v3.12.0"
2525
# https://github.com/eksctl-io/eksctl
26-
EKSCTL_VERSION="v0.197.0"
26+
EKSCTL_VERSION="v0.202.0"
2727
# https://github.com/onsi/ginkgo
2828
GINKGO_VERSION="v2.22.2"
2929
# https://github.com/golangci/golangci-lint
@@ -34,7 +34,7 @@ GOMPLATE_VERSION="v4.3.0"
3434
HELM_VERSION="v3.17.0"
3535
# https://github.com/kubernetes/kops
3636
# NOTE: We pin kops to a commit instead of a release to support newer versions of k8s earlier
37-
KOPS_COMMIT="aaa35cc5304f9b191ca9828b552e62bddc5b263a"
37+
KOPS_COMMIT="0789af746b4e5beb6eab4b9a4b42b88f3c072d19"
3838
# https://pkg.go.dev/sigs.k8s.io/kubetest2?tab=versions
3939
KUBETEST2_VERSION="v0.0.0-20241216131453-22d5b1410bef"
4040
# https://github.com/golang/mock

0 commit comments

Comments
 (0)