update Kubernetes versions throughout CI (#1460)

* update Kube versions throughout CI so nightlies run against supported versions of Kubernetes.
hashicorp · Sep 1, 2022 · 1ffa44a · 1ffa44a
1 parent 9e6b1f7
commit 1ffa44a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 96 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -538,7 +538,7 @@ jobs:
       - checkout
       - install-prereqs
       - create-kind-clusters:
-          version: "v1.22.4"
+          version: "v1.24.0"
       - restore_cache:
           keys:
             - consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
@@ -570,7 +570,7 @@ jobs:
       - checkout
       - install-prereqs
       - create-kind-clusters:
-          version: "v1.22.4"
+          version: "v1.24.0"
       - restore_cache:
           keys:
             - consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
@@ -653,8 +653,8 @@ jobs:
   ########################
   # ACCEPTANCE TESTS
   ########################
-  acceptance-gke-1-20:
-    parallelism: 6
+  acceptance-gke-1-23:
+    parallelism: 2
     environment:
       - TEST_RESULTS: /tmp/test-results
     docker:
@@ -721,8 +721,8 @@ jobs:
           fail_only: true
           failure_message: "GKE acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"
 
-  acceptance-gke-cni-1-20:
-    parallelism: 3
+  acceptance-gke-cni-1-23:
+    parallelism: 2
     environment:
       - TEST_RESULTS: /tmp/test-results
     docker:
@@ -789,8 +789,8 @@ jobs:
           fail_only: true
           failure_message: "GKE CNI acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"
 
-  acceptance-aks-1-21:
-    parallelism: 6
+  acceptance-aks-1-22:
+    parallelism: 3
     environment:
       - TEST_RESULTS: /tmp/test-results
     docker:
@@ -846,7 +846,7 @@ jobs:
           fail_only: true
           failure_message: "AKS acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"
 
-  acceptance-aks-cni-1-21:
+  acceptance-aks-cni-1-22:
     parallelism: 3
     environment:
       - TEST_RESULTS: /tmp/test-results
@@ -902,8 +902,8 @@ jobs:
           fail_only: true
           failure_message: "AKS CNI acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"
 
-  acceptance-eks-1-19:
-    parallelism: 6
+  acceptance-eks-1-21:
+    parallelism: 3
     environment:
       - TEST_RESULTS: /tmp/test-results
     docker:
@@ -965,7 +965,7 @@ jobs:
           fail_only: true
           failure_message: "EKS acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"
 
-  acceptance-eks-cni-1-19:
+  acceptance-eks-cni-1-21:
     parallelism: 3
     environment:
       - TEST_RESULTS: /tmp/test-results
@@ -1082,76 +1082,6 @@ jobs:
           fail_only: true
           failure_message: "OpenShift acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}"
 
-  acceptance-kind-1-23:
-    parallelism: 6
-    environment:
-      - TEST_RESULTS: /tmp/test-results
-    machine:
-      image: ubuntu-2004:202010-01
-    resource_class: xlarge
-    steps:
-      - checkout
-      - install-prereqs
-      - create-kind-clusters:
-          version: "v1.23.0"
-      - restore_cache:
-          keys:
-            - consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
-      - run:
-          name: go mod download
-          working_directory: *acceptance-mod-path
-          command: go mod download
-      - save_cache:
-          key: consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
-          paths:
-            - ~/.go_workspace/pkg/mod
-      - run: mkdir -p $TEST_RESULTS
-      - run-acceptance-tests:
-          additional-flags: -use-kind -kubecontext="kind-dc1" -secondary-kubecontext="kind-dc2" -enable-transparent-proxy
-      - store_test_results:
-          path: /tmp/test-results
-      - store_artifacts:
-          path: /tmp/test-results
-      - slack/status:
-          channel: *slack-channel
-          fail_only: true
-          failure_message: "Acceptance tests against Kind with Kubernetes v1.23 failed. Check the logs at: ${CIRCLE_BUILD_URL}"
-
-  acceptance-kind-cni-1-23:
-    parallelism: 3
-    environment:
-      - TEST_RESULTS: /tmp/test-results
-    machine:
-      image: ubuntu-2004:202010-01
-    resource_class: xlarge
-    steps:
-      - checkout
-      - install-prereqs
-      - create-kind-cni-clusters:
-          version: "v1.23.0"
-      - restore_cache:
-          keys:
-            - consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
-      - run:
-          name: go mod download
-          working_directory: *acceptance-mod-path
-          command: go mod download
-      - save_cache:
-          key: consul-helm-modcache-v2-{{ checksum "acceptance/go.mod" }}
-          paths:
-            - ~/.go_workspace/pkg/mod
-      - run: mkdir -p $TEST_RESULTS
-      - run-acceptance-tests:
-          additional-flags: -use-kind -kubecontext="kind-dc1" -secondary-kubecontext="kind-dc2" -enable-transparent-proxy -enable-cni
-      - store_test_results:
-          path: /tmp/test-results
-      - store_artifacts:
-          path: /tmp/test-results
-      - slack/status:
-          channel: *slack-channel
-          fail_only: true
-          failure_message: "Acceptance tests for CNI against Kind with Kubernetes v1.23 failed. Check the logs at: ${CIRCLE_BUILD_URL}"
-
   acceptance-kind-1-23-consul-nightly-1-11:
     environment:
       - TEST_RESULTS: /tmp/test-results
@@ -1318,36 +1248,30 @@ workflows:
       # - acceptance-openshift:
       #    requires:
       #      - cleanup-azure-resources
-      - acceptance-gke-1-20:
+      - acceptance-gke-1-23:
           requires:
             - cleanup-gcp-resources
             - dev-upload-docker
-      - acceptance-gke-cni-1-20:
+      - acceptance-gke-cni-1-23:
           requires:
             - cleanup-gcp-resources
             - dev-upload-docker
-      - acceptance-eks-1-19:
+      - acceptance-eks-1-21:
           requires:
             - cleanup-eks-resources
             - dev-upload-docker
-      - acceptance-eks-cni-1-19:
+      - acceptance-eks-cni-1-21:
           requires:
             - cleanup-eks-resources
             - dev-upload-docker
-      - acceptance-aks-1-21:
+      - acceptance-aks-1-22:
           requires:
             - cleanup-azure-resources
             - dev-upload-docker
-      - acceptance-aks-cni-1-21:
+      - acceptance-aks-cni-1-22:
           requires:
             - cleanup-azure-resources
             - dev-upload-docker
-      - acceptance-kind-1-23:
-          requires:
-            - dev-upload-docker
-      - acceptance-kind-cni-1-23:
-          requires:
-            - dev-upload-docker
 
   nightly-acceptance-tests-consul:
     triggers:

diff --git a/charts/consul/test/terraform/eks/main.tf b/charts/consul/test/terraform/eks/main.tf
@@ -57,7 +57,7 @@ module "eks" {
   version = "17.20.0"
 
   cluster_name    = "consul-k8s-${random_id.suffix[count.index].dec}"
-  cluster_version = "1.20"
+  cluster_version = "1.21"
   subnets         = module.vpc[count.index].private_subnets
 
   vpc_id = module.vpc[count.index].vpc_id

diff --git a/charts/consul/test/terraform/gke/main.tf b/charts/consul/test/terraform/gke/main.tf
@@ -10,7 +10,7 @@ resource "random_id" "suffix" {
 
 data "google_container_engine_versions" "main" {
   location       = var.zone
-  version_prefix = "1.21."
+  version_prefix = "1.23."
 }
 
 resource "google_container_cluster" "cluster" {