Merge branch 'master' into release-1.8

astronomer · May 25, 2023 · fd60afc · fd60afc
2 parents caead48 + 0f3e8b7
commit fd60afc
Show file tree

Hide file tree

Showing 9 changed files with 168 additions and 160 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,137 +20,137 @@ workflows:
             - run_pre_commit
             - unittest-charts
       - airflow-test:
-          name: test-1-22-15-CeleryExecutor
-          kube_version: 1.22.15
+          name: test-1-22-17-CeleryExecutor
+          kube_version: 1.22.17
           executor: CeleryExecutor
           requires:
             - build-and-release-internal
 
       - airflow-test:
-          name: test-1-22-15-LocalExecutor
-          kube_version: 1.22.15
+          name: test-1-22-17-LocalExecutor
+          kube_version: 1.22.17
           executor: LocalExecutor
           requires:
             - build-and-release-internal
 
       - airflow-test:
-          name: test-1-22-15-KubernetesExecutor
-          kube_version: 1.22.15
+          name: test-1-22-17-KubernetesExecutor
+          kube_version: 1.22.17
           executor: KubernetesExecutor
           requires:
             - build-and-release-internal
 
       - airflow-test:
-          name: test-1-23-13-CeleryExecutor
-          kube_version: 1.23.13
+          name: test-1-23-17-CeleryExecutor
+          kube_version: 1.23.17
           executor: CeleryExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-23-13-LocalExecutor
-          kube_version: 1.23.13
+          name: test-1-23-17-LocalExecutor
+          kube_version: 1.23.17
           executor: LocalExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-23-13-KubernetesExecutor
-          kube_version: 1.23.13
+          name: test-1-23-17-KubernetesExecutor
+          kube_version: 1.23.17
           executor: KubernetesExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-24-7-CeleryExecutor
-          kube_version: 1.24.7
+          name: test-1-24-13-CeleryExecutor
+          kube_version: 1.24.13
           executor: CeleryExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-24-7-LocalExecutor
-          kube_version: 1.24.7
+          name: test-1-24-13-LocalExecutor
+          kube_version: 1.24.13
           executor: LocalExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-24-7-KubernetesExecutor
-          kube_version: 1.24.7
+          name: test-1-24-13-KubernetesExecutor
+          kube_version: 1.24.13
           executor: KubernetesExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-25-3-CeleryExecutor
-          kube_version: 1.25.3
+          name: test-1-25-9-CeleryExecutor
+          kube_version: 1.25.9
           executor: CeleryExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-25-3-LocalExecutor
-          kube_version: 1.25.3
+          name: test-1-25-9-LocalExecutor
+          kube_version: 1.25.9
           executor: LocalExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-25-3-KubernetesExecutor
-          kube_version: 1.25.3
+          name: test-1-25-9-KubernetesExecutor
+          kube_version: 1.25.9
           executor: KubernetesExecutor
           requires:
             - build-and-release-internal
 
             - approve-test-all
       - airflow-test:
-          name: test-1-26-0-CeleryExecutor
-          kube_version: 1.26.0
+          name: test-1-26-4-CeleryExecutor
+          kube_version: 1.26.4
           executor: CeleryExecutor
           requires:
             - build-and-release-internal
 
       - airflow-test:
-          name: test-1-26-0-LocalExecutor
-          kube_version: 1.26.0
+          name: test-1-26-4-LocalExecutor
+          kube_version: 1.26.4
           executor: LocalExecutor
           requires:
             - build-and-release-internal
 
       - airflow-test:
-          name: test-1-26-0-KubernetesExecutor
-          kube_version: 1.26.0
+          name: test-1-26-4-KubernetesExecutor
+          kube_version: 1.26.4
           executor: KubernetesExecutor
           requires:
             - build-and-release-internal
 
       - approve-release-prod:
           type: approval
           requires:
-            - "test-1-22-15-CeleryExecutor"
-            - "test-1-22-15-LocalExecutor"
-            - "test-1-22-15-KubernetesExecutor"
-            - "test-1-23-13-CeleryExecutor"
-            - "test-1-23-13-LocalExecutor"
-            - "test-1-23-13-KubernetesExecutor"
-            - "test-1-24-7-CeleryExecutor"
-            - "test-1-24-7-LocalExecutor"
-            - "test-1-24-7-KubernetesExecutor"
-            - "test-1-25-3-CeleryExecutor"
-            - "test-1-25-3-LocalExecutor"
-            - "test-1-25-3-KubernetesExecutor"
-            - "test-1-26-0-CeleryExecutor"
-            - "test-1-26-0-LocalExecutor"
-            - "test-1-26-0-KubernetesExecutor"
+            - "test-1-22-17-CeleryExecutor"
+            - "test-1-22-17-LocalExecutor"
+            - "test-1-22-17-KubernetesExecutor"
+            - "test-1-23-17-CeleryExecutor"
+            - "test-1-23-17-LocalExecutor"
+            - "test-1-23-17-KubernetesExecutor"
+            - "test-1-24-13-CeleryExecutor"
+            - "test-1-24-13-LocalExecutor"
+            - "test-1-24-13-KubernetesExecutor"
+            - "test-1-25-9-CeleryExecutor"
+            - "test-1-25-9-LocalExecutor"
+            - "test-1-25-9-KubernetesExecutor"
+            - "test-1-26-4-CeleryExecutor"
+            - "test-1-26-4-LocalExecutor"
+            - "test-1-26-4-KubernetesExecutor"
           filters:
             branches:
               only:
@@ -171,7 +171,7 @@ workflows:
 jobs:
   run_pre_commit:
     docker:
-      - image: quay.io/astronomer/ci-pre-commit:2023-04
+      - image: quay.io/astronomer/ci-pre-commit:2023-05
     steps:
       - checkout
       - run:
@@ -206,7 +206,7 @@ jobs:
 
   unittest-charts:
     docker:
-      - image: quay.io/astronomer/ci-helm-release:2023-04
+      - image: quay.io/astronomer/ci-helm-release:2023-05
     steps:
       - setup_remote_docker:
           version: 20.10.18
@@ -222,7 +222,7 @@ jobs:
 
   build-and-release-internal:
     docker:
-      - image: quay.io/astronomer/ci-helm-release:2023-04
+      - image: quay.io/astronomer/ci-helm-release:2023-05
     steps:
       - checkout
       - run:
@@ -262,7 +262,7 @@ jobs:
           path: test-results
   release-internal:
     docker:
-      - image: quay.io/astronomer/ci-helm-release:2023-04
+      - image: quay.io/astronomer/ci-helm-release:2023-05
     steps:
       - checkout
       - run:
@@ -271,7 +271,7 @@ jobs:
 
   release-public:
     docker:
-      - image: quay.io/astronomer/ci-helm-release:2023-04
+      - image: quay.io/astronomer/ci-helm-release:2023-05
     steps:
       - checkout
       - publish-github-release

diff --git a/.circleci/generate_circleci_config.py b/.circleci/generate_circleci_config.py
@@ -9,13 +9,19 @@
 # When adding a new version, look up the most recent patch version on Dockerhub
 # https://hub.docker.com/r/kindest/node/tags
 # This should match what is in tests/__init__.py
-kube_versions = ["1.22.15", "1.23.13", "1.24.7", "1.25.3", "1.26.0"]
+kube_versions = [
+    "1.22.17",
+    "1.23.17",
+    "1.24.13",
+    "1.25.9",
+    "1.26.4",
+]
 
 # https://circleci.com/docs/2.0/building-docker-images/#docker-version
 remote_docker_version = "20.10.18"
 
 executors = ["CeleryExecutor", "LocalExecutor", "KubernetesExecutor"]
-ci_runner_version = "2023-04"
+ci_runner_version = "2023-05"
 
 
 def main():

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ repos:
       - id: remove-tabs
         exclude_types: [makefile, binary]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.0.261"
+    rev: "v0.0.269"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix, --ignore, E501]

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ To delete an existing kind cluster and reinstall the helm chart from scratch
 
 ```sh
 # Optionally, you can specify a kubernetes version available from https://hub.docker.com/r/kindest/node/tags
-KUBE_VERSION=1.24.7
+KUBE_VERSION=1.24.13
 
 bin/reset-local-dev
 ```

diff --git a/bin/install-ci-tools b/bin/install-ci-tools
@@ -2,11 +2,11 @@
 set -e
 
 if [[ -z "${KIND_VERSION}" ]]; then
-  export KIND_VERSION="0.18.0"
+  export KIND_VERSION="0.19.0"
 fi
 
 if [[ -z "${HELM_VERSION}" ]]; then
-  export HELM_VERSION="3.11.3"
+  export HELM_VERSION="3.12.0"
 fi
 
 # Determine the platform we are running on

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.24.7}"
+KUBE_VERSION="${KUBE_VERSION:-1.24.13}"
 
 # Create a kind cluster
 kind create cluster --image "kindest/node:v${KUBE_VERSION}"