[Breaking] Update kind to 0.17.0 and update the default kube version …

…to 1.24 (#429) * Update kind to 0.16.0 and update the default kube version to 1.24 * Prep 11.14 release * shellcheck * fix token * Add kind_config option (#433) * Update kubernetes_e2e_tests.yml * Update kubernetes_e2e_tests.yml * Update e2e_start_kind_cluster.yml * Update e2e_start_kind_cluster.yml * Update kubernetes_e2e_tests.yml --------- Co-authored-by: Robert Brennan <accounts@rbren.io>
FairwindsOps · Feb 8, 2023 · eeb38f6 · eeb38f6
1 parent bf38673
commit eeb38f6
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -122,6 +122,8 @@ jobs:
       - oss-docs/install-tools
       - rok8s/get_vault_env:
           vault_path: repo/global/env
+      - rok8s/get_vault_env:
+          vault_path: repo/rok8s-scripts/env
       - *install_circleci
       - orb-tools/pack:
           source: orb/

diff --git a/bin/helm-deploy b/bin/helm-deploy
@@ -43,7 +43,6 @@ if [ "${HELM_TEMPLATE_ONLY}" != "true" ]; then
   fi
 
   HELM_DEFAULT_TIMEOUT=300s
-  HELM_HOME=${HELM_HOME}
 fi
 
 format_multiple_values_files() {

diff --git a/examples/ci/bitbucket-pipelines.yml b/examples/ci/bitbucket-pipelines.yml
@@ -1,4 +1,4 @@
-image: quay.io/reactiveops/ci-images:v11.13-stretch
+image: quay.io/reactiveops/ci-images:v11.14-stretch
 
 aliases:
   - &initialize-env |

diff --git a/examples/minimal-sops-secrets/README.md b/examples/minimal-sops-secrets/README.md
@@ -19,7 +19,7 @@ we run some of the scripts provided by rok8s-scripts. In particular, we use:
 * `k8s-deploy-and-verify` to deploy our image to Kubernetes and make sure the deployment succeeded
 	* This also calls the `k8s-deploy-secrets` script to decrypt and deploy secrets
 
-We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v11.13-stretch`,
+We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v11.14-stretch`,
 to ensure rok8s-scripts and its dependencies are available during the build and deploy jobs.
 
 ## Try it out

diff --git a/examples/minimal/README.md b/examples/minimal/README.md
@@ -18,7 +18,7 @@ we run some of the scripts provided by rok8s-scripts. In particular, we use:
 * `prepare-kubectl` to configure the `kubectl` command to be able to deploy resources to our Kubernetes cluster
 * `k8s-deploy-and-verify` to deploy our image to Kubernetes and make sure the deployment succeeded
 
-We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v11.13-stretch`,
+We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v11.14-stretch`,
 to ensure rok8s-scripts and its dependencies are available during the build and deploy jobs.
 
 ## Try it out

diff --git a/orb/commands/e2e_start_kind_cluster.yml b/orb/commands/e2e_start_kind_cluster.yml
@@ -3,19 +3,37 @@ parameters:
   kind_version:
     description: "The kind version to use. See https://github.com/kubernetes-sigs/kind/releases"
     type: string
-    default: "0.11.1"
+    default: "0.17.0"
   kind_node_image:
     description: "The kind node image to use.  See https://github.com/kubernetes-sigs/kind/releases"
     type: string
-    default: "kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9"
+    default: "kindest/node:v1.24.6@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1"
   kind_config:
     description: "A Kind config file to use for the cluster"
     type: string
     default: |
       kind: Cluster
       apiVersion: kind.x-k8s.io/v1alpha4
-      featureGates:
-        "RemoveSelfLink": false
+      kubeadmConfigPatches:
+      - |
+        apiVersion: kubeadm.k8s.io/v1beta3
+        kind: ClusterConfiguration
+        metadata:
+          name: config
+        apiServer:
+          certSANs:
+          - e2e-control-plane
+          - 127.0.0.1
+          - localhost
+        etcd:
+          serverCertSANs:
+          - e2e-control-plane
+          - 127.0.0.1
+          - localhost
+          peerCertSANs:
+          - e2e-control-plane
+          - 127.0.0.1
+          - localhost
 steps:
   - run:
       name: Start Kind Cluster

diff --git a/orb/executors/ci-images.yml b/orb/executors/ci-images.yml
@@ -1,6 +1,6 @@
 parameters:
   version:
     type: string
-    default: "v11.13-stretch"
+    default: "v11.14-stretch"
 docker:
   - image: quay.io/reactiveops/ci-images:<<parameters.version>>
diff --git a/orb/executors/default.yml b/orb/executors/default.yml
@@ -1,6 +1,6 @@
 parameters:
   version:
     type: string
-    default: "v11.13-stretch"
+    default: "v11.14-stretch"
 docker:
   - image: quay.io/reactiveops/ci-images:<<parameters.version>>
diff --git a/orb/jobs/kubernetes_e2e_tests.yml b/orb/jobs/kubernetes_e2e_tests.yml
@@ -16,15 +16,41 @@ parameters:
   kind_version:
     description: "The kind version to use. See https://github.com/kubernetes-sigs/kind/releases"
     type: string
-    default: "0.11.1"
+    default: "0.17.0"
   kind_node_image:
     description: "The kind node image to use.  See https://github.com/kubernetes-sigs/kind/releases"
     type: string
-    default: "kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6"
+    default: "kindest/node:v1.24.6@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1"
+  kind_config:
+    description: "A Kind config file to use for the cluster"
+    type: string
+    default: |
+      kind: Cluster
+      apiVersion: kind.x-k8s.io/v1alpha4
+      kubeadmConfigPatches:
+      - |
+        apiVersion: kubeadm.k8s.io/v1beta3
+        kind: ClusterConfiguration
+        metadata:
+          name: config
+        apiServer:
+          certSANs:
+          - e2e-control-plane
+          - 127.0.0.1
+          - localhost
+        etcd:
+          serverCertSANs:
+          - e2e-control-plane
+          - 127.0.0.1
+          - localhost
+          peerCertSANs:
+          - e2e-control-plane
+          - 127.0.0.1
+          - localhost
   command_runner_image:
     description: "The image to execute commands from against the kind cluster. Also where the script gets executed."
     type: string
-    default: "quay.io/reactiveops/ci-images:v11.13-alpine"
+    default: "quay.io/reactiveops/ci-images:v11.14-alpine"
   pre_script:
     description: "Script to run on the local machine before running script on command runner."
     type: string
@@ -88,6 +114,8 @@ steps:
   - e2e_start_kind_cluster:
       kind_node_image: << parameters.kind_node_image >>
       kind_version: << parameters.kind_version >>
+      kind_config: << parameters.kind_config >>
+
   - e2e_start_command_runner:
       command_runner_image: << parameters.command_runner_image >>
   - steps: << parameters.pre_script_steps >>