Skip to content

Commit

Permalink
Remove k8s 1.22. Add some missing 1.27 stuff. (#1924)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhoherd committed Jul 12, 2023
1 parent 050b09c commit 9ce1a02
Show file tree
Hide file tree
Showing 23 changed files with 4,568 additions and 7,076 deletions.
36 changes: 7 additions & 29 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:

run_pre_commit:
docker:
- image: quay.io/astronomer/ci-pre-commit:2023-05
- image: quay.io/astronomer/ci-pre-commit:2023-07
steps:
- checkout
- run:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:

unittest-charts:
docker:
- image: quay.io/astronomer/ci-helm-release:2023-05
- image: quay.io/astronomer/ci-helm-release:2023-07
parallelism: 8
resource_class: xlarge
steps:
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:

release-to-internal:
docker:
- image: quay.io/astronomer/ci-helm-release:2023-05
- image: quay.io/astronomer/ci-helm-release:2023-07
steps:
- attach_workspace:
at: /tmp/workspace
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
release-to-public:
docker:
- image: quay.io/astronomer/ci-helm-release:2023-05
- image: quay.io/astronomer/ci-helm-release:2023-07
steps:
- attach_workspace:
at: /tmp/workspace
Expand All @@ -218,22 +218,6 @@ jobs:
bin/release-helm-chart -p /tmp/workspace/astronomer-*.tgz
- publish-github-release

platform-1-22-17:
machine:
image: ubuntu-2204:2023.02.1
resource_class: xlarge
environment:
KUBE_VERSION: v1.22.17
steps:
- helm-install:
astronomer-tags: "platform postgresql monitoring logging"
- run:
name: Check chart for k8s 1.22.17 compatibility with kubent
command: |
set -o pipefail
helm template --kube-version=v1.22.17 -f values.yaml --set global.baseDomain=example.com . |
kubent --cluster=false --helm3=false --filename -
when: always
platform-1-23-17:
machine:
image: ubuntu-2204:2023.02.1
Expand Down Expand Up @@ -396,14 +380,9 @@ workflows:
- approve-test-all-platforms:
type: approval

- platform-1-22-17:
requires:
- build-artifact
- platform-1-23-17:
requires:
- approve-test-all-platforms
- build-artifact

- platform-1-24-15:
requires:
- approve-test-all-platforms
Expand All @@ -429,7 +408,7 @@ workflows:
- gcp-astronomer-prod
requires:
- approve-internal-release
- platform-1-22-17
- platform-1-23-17
- platform-1-27-3
- approve-upgrade-test:
type: approval
Expand All @@ -449,7 +428,6 @@ workflows:
type: approval
requires:
- release-to-internal
- platform-1-23-17
- platform-1-24-15
- platform-1-25-11
- platform-1-26-6
Expand Down Expand Up @@ -487,7 +465,7 @@ workflows:
- run_pre_commit
- unittest-charts

- platform-1-22-17:
- platform-1-23-17:
requires:
- build-artifact

Expand All @@ -499,7 +477,7 @@ workflows:
context:
- gcp-astronomer-prod
requires:
- platform-1-22-17
- platform-1-23-17
- platform-1-27-3
filters:
branches:
Expand Down
4 changes: 2 additions & 2 deletions .circleci/generate_circleci_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
# recent patch version on Dockerhub
# This should match what is in tests/__init__.py
# https://hub.docker.com/r/kindest/node/tags
kube_versions = ["1.22.17", "1.23.17", "1.24.15", "1.25.11", "1.26.6", "1.27.3"]
kube_versions = ["1.23.17", "1.24.15", "1.25.11", "1.26.6", "1.27.3"]
# https://circleci.com/docs/2.0/building-docker-images/#docker-version
ci_remote_docker_version = "20.10.18"
# https://circleci.com/developer/machine/image/ubuntu-2204
machine_image_version = "ubuntu-2204:2023.02.1"
ci_runner_version = "2023-05"
ci_runner_version = "2023-07"


def list_docker_images(path):
Expand Down

0 comments on commit 9ce1a02

Please sign in to comment.