Add k8s 1.30, update various dev component versions (#497)

* Update pre-commit hooks * Add k8s 1.30, update other k8s versions * Rework some shell logic. Update kind and helm. * default to k8s 1.30.0
astronomer · May 20, 2024 · ab78b45 · ab78b45
1 parent 23adf3d
commit ab78b45
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 52 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,94 +41,118 @@ workflows:
             - build-and-release-internal
 
       - airflow-test:
-          name: test-1-26-14-CeleryExecutor
-          kube_version: 1.26.14
+          name: test-1-26-15-CeleryExecutor
+          kube_version: 1.26.15
           executor: CeleryExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-26-14-LocalExecutor
-          kube_version: 1.26.14
+          name: test-1-26-15-LocalExecutor
+          kube_version: 1.26.15
           executor: LocalExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-26-14-KubernetesExecutor
-          kube_version: 1.26.14
+          name: test-1-26-15-KubernetesExecutor
+          kube_version: 1.26.15
           executor: KubernetesExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-27-11-CeleryExecutor
-          kube_version: 1.27.11
+          name: test-1-27-13-CeleryExecutor
+          kube_version: 1.27.13
           executor: CeleryExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-27-11-LocalExecutor
-          kube_version: 1.27.11
+          name: test-1-27-13-LocalExecutor
+          kube_version: 1.27.13
           executor: LocalExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-27-11-KubernetesExecutor
-          kube_version: 1.27.11
+          name: test-1-27-13-KubernetesExecutor
+          kube_version: 1.27.13
           executor: KubernetesExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-28-7-CeleryExecutor
-          kube_version: 1.28.7
+          name: test-1-28-9-CeleryExecutor
+          kube_version: 1.28.9
           executor: CeleryExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-28-7-LocalExecutor
-          kube_version: 1.28.7
+          name: test-1-28-9-LocalExecutor
+          kube_version: 1.28.9
           executor: LocalExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-28-7-KubernetesExecutor
-          kube_version: 1.28.7
+          name: test-1-28-9-KubernetesExecutor
+          kube_version: 1.28.9
           executor: KubernetesExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-29-2-CeleryExecutor
-          kube_version: 1.29.2
+          name: test-1-29-4-CeleryExecutor
+          kube_version: 1.29.4
+          executor: CeleryExecutor
+          requires:
+            - build-and-release-internal
+
+            - approve-test-all
+      - airflow-test:
+          name: test-1-29-4-LocalExecutor
+          kube_version: 1.29.4
+          executor: LocalExecutor
+          requires:
+            - build-and-release-internal
+
+            - approve-test-all
+      - airflow-test:
+          name: test-1-29-4-KubernetesExecutor
+          kube_version: 1.29.4
+          executor: KubernetesExecutor
+          requires:
+            - build-and-release-internal
+
+            - approve-test-all
+      - airflow-test:
+          name: test-1-30-0-CeleryExecutor
+          kube_version: 1.30.0
           executor: CeleryExecutor
           requires:
             - build-and-release-internal
 
       - airflow-test:
-          name: test-1-29-2-LocalExecutor
-          kube_version: 1.29.2
+          name: test-1-30-0-LocalExecutor
+          kube_version: 1.30.0
           executor: LocalExecutor
           requires:
             - build-and-release-internal
 
       - airflow-test:
-          name: test-1-29-2-KubernetesExecutor
-          kube_version: 1.29.2
+          name: test-1-30-0-KubernetesExecutor
+          kube_version: 1.30.0
           executor: KubernetesExecutor
           requires:
             - build-and-release-internal
@@ -139,18 +163,21 @@ workflows:
             - "test-1-25-16-CeleryExecutor"
             - "test-1-25-16-LocalExecutor"
             - "test-1-25-16-KubernetesExecutor"
-            - "test-1-26-14-CeleryExecutor"
-            - "test-1-26-14-LocalExecutor"
-            - "test-1-26-14-KubernetesExecutor"
-            - "test-1-27-11-CeleryExecutor"
-            - "test-1-27-11-LocalExecutor"
-            - "test-1-27-11-KubernetesExecutor"
-            - "test-1-28-7-CeleryExecutor"
-            - "test-1-28-7-LocalExecutor"
-            - "test-1-28-7-KubernetesExecutor"
-            - "test-1-29-2-CeleryExecutor"
-            - "test-1-29-2-LocalExecutor"
-            - "test-1-29-2-KubernetesExecutor"
+            - "test-1-26-15-CeleryExecutor"
+            - "test-1-26-15-LocalExecutor"
+            - "test-1-26-15-KubernetesExecutor"
+            - "test-1-27-13-CeleryExecutor"
+            - "test-1-27-13-LocalExecutor"
+            - "test-1-27-13-KubernetesExecutor"
+            - "test-1-28-9-CeleryExecutor"
+            - "test-1-28-9-LocalExecutor"
+            - "test-1-28-9-KubernetesExecutor"
+            - "test-1-29-4-CeleryExecutor"
+            - "test-1-29-4-LocalExecutor"
+            - "test-1-29-4-KubernetesExecutor"
+            - "test-1-30-0-CeleryExecutor"
+            - "test-1-30-0-LocalExecutor"
+            - "test-1-30-0-KubernetesExecutor"
           filters:
             branches:
               only:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -53,10 +53,12 @@ repos:
   - repo: https://github.com/astronomer/pre-commit-hooks
     rev: 8b2d969bd549cd7c9454cc8bb54eec5b35c2e5e6
     hooks:
-      - id: replace-en-dashes
-      - id: replace-unicode-non-breaking-spaces
+      - id: CVE-2017-18342
       - id: remove-unicode-zero-width-non-breaking-spaces
       - id: remove-unicode-zero-width-space
+      - id: replace-en-dashes
+      - id: replace-greek-question-mark
+      - id: replace-unicode-non-breaking-spaces
   - repo: local
     hooks:
       - id: ensure-rolebinding-without-dash
@@ -68,7 +70,7 @@ repos:
       - id: circle-config-yaml
         name: Ensure .circleci/config.yml is up to date
         language: python
-        files: "(config.yml|config.yml.j2|generate_circleci_config.py)$"
+        files: "(config.yml|config.yml.j2|generate_circleci_config.py|yaml|tpl)$"
         entry: bin/generate_circleci_config.py
         additional_dependencies: ["jinja2", "PyYAML"]
       - id: helm-dependency-update

diff --git a/bin/install-ci-tools b/bin/install-ci-tools
@@ -1,22 +1,19 @@
 #!/bin/bash
 set -e
 
-if [[ -z "${KIND_VERSION}" ]]; then
-  export KIND_VERSION="0.22.0"
-fi
-
-if [[ -z "${HELM_VERSION}" ]]; then
-  export HELM_VERSION="3.14.4"
-fi
+export KIND_VERSION="${KIND_VERSION:-0.23.0}"
+export HELM_VERSION="${HELM_VERSION:-3.15.0}"
 
 # Determine the platform we are running on
 OS=$(uname | tr '[:upper:]' '[:lower:]')
 
 # Set up a bin location
 mkdir -p /tmp/bin
 PATH=/tmp/bin:$PATH
+
 # Save our current directory so we can come back
-CURRENT_DIR=$(pwd)
+CURRENT_DIR="${PWD}"
+
 cd /tmp
 
 echo "Installing Kubernetes in Docker (kind) version ${KIND_VERSION}..."

diff --git a/bin/start-kind-cluster b/bin/start-kind-cluster
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2181
 
-KUBE_VERSION="${KUBE_VERSION:-1.28.0}"
+KUBE_VERSION="${KUBE_VERSION:-1.30.0}"
 
 # Create a kind cluster
 kind create cluster --image "kindest/node:v${KUBE_VERSION}"

diff --git a/metadata.yaml b/metadata.yaml
@@ -2,7 +2,8 @@
 # https://hub.docker.com/r/kindest/node/tags
 test_k8s_versions:
   - 1.25.16
-  - 1.26.14
-  - 1.27.11
-  - 1.28.7
-  - 1.29.2
+  - 1.26.15
+  - 1.27.13
+  - 1.28.9
+  - 1.29.4
+  - 1.30.0