Skip to content

Commit

Permalink
dev component updates (#2146)
Browse files Browse the repository at this point in the history
* Rebuild requirements

* Update hooks. Add astronomer/pre-commit-hooks

* Update ci-runner versions

* Update more component versions
  • Loading branch information
danielhoherd committed Mar 3, 2024
1 parent ad07473 commit d0b2fe2
Show file tree
Hide file tree
Showing 8 changed files with 202 additions and 192 deletions.
60 changes: 30 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
run_pre_commit:
docker:
- image: quay.io/astronomer/ci-pre-commit:2024-02
- image: quay.io/astronomer/ci-pre-commit:2024-03
steps:
- checkout
- run:
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:

unittest-charts:
docker:
- image: quay.io/astronomer/ci-helm-release:2024-02
- image: quay.io/astronomer/ci-helm-release:2024-03
parallelism: 8
resource_class: xlarge
steps:
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:

release-to-internal:
docker:
- image: quay.io/astronomer/ci-helm-release:2024-02
- image: quay.io/astronomer/ci-helm-release:2024-03
steps:
- attach_workspace:
at: /tmp/workspace
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
release-to-public:
docker:
- image: quay.io/astronomer/ci-helm-release:2024-02
- image: quay.io/astronomer/ci-helm-release:2024-03
steps:
- attach_workspace:
at: /tmp/workspace
Expand All @@ -265,68 +265,68 @@ jobs:
helm template --kube-version=v1.25.16 -f values.yaml --set global.baseDomain=example.com . |
kubent --cluster=false --helm3=false --filename -
when: always
platform-1-26-13:
platform-1-26-14:
machine:
image: ubuntu-2204:2024.01.1
resource_class: xlarge
environment:
KUBE_VERSION: v1.26.13
KUBE_VERSION: v1.26.14
steps:
- helm-install:
astronomer-tags: "platform postgresql monitoring logging"
- run:
name: Check chart for k8s 1.26.13 compatibility with kubent
name: Check chart for k8s 1.26.14 compatibility with kubent
command: |
set -o pipefail
helm template --kube-version=v1.26.13 -f values.yaml --set global.baseDomain=example.com . |
helm template --kube-version=v1.26.14 -f values.yaml --set global.baseDomain=example.com . |
kubent --cluster=false --helm3=false --filename -
when: always
platform-1-27-10:
platform-1-27-11:
machine:
image: ubuntu-2204:2024.01.1
resource_class: xlarge
environment:
KUBE_VERSION: v1.27.10
KUBE_VERSION: v1.27.11
steps:
- helm-install:
astronomer-tags: "platform postgresql monitoring logging"
- run:
name: Check chart for k8s 1.27.10 compatibility with kubent
name: Check chart for k8s 1.27.11 compatibility with kubent
command: |
set -o pipefail
helm template --kube-version=v1.27.10 -f values.yaml --set global.baseDomain=example.com . |
helm template --kube-version=v1.27.11 -f values.yaml --set global.baseDomain=example.com . |
kubent --cluster=false --helm3=false --filename -
when: always
platform-1-28-6:
platform-1-28-7:
machine:
image: ubuntu-2204:2024.01.1
resource_class: xlarge
environment:
KUBE_VERSION: v1.28.6
KUBE_VERSION: v1.28.7
steps:
- helm-install:
astronomer-tags: "platform postgresql monitoring logging"
- run:
name: Check chart for k8s 1.28.6 compatibility with kubent
name: Check chart for k8s 1.28.7 compatibility with kubent
command: |
set -o pipefail
helm template --kube-version=v1.28.6 -f values.yaml --set global.baseDomain=example.com . |
helm template --kube-version=v1.28.7 -f values.yaml --set global.baseDomain=example.com . |
kubent --cluster=false --helm3=false --filename -
when: always
platform-1-29-1:
platform-1-29-2:
machine:
image: ubuntu-2204:2024.01.1
resource_class: xlarge
environment:
KUBE_VERSION: v1.29.1
KUBE_VERSION: v1.29.2
steps:
- helm-install:
astronomer-tags: "platform postgresql monitoring logging"
- run:
name: Check chart for k8s 1.29.1 compatibility with kubent
name: Check chart for k8s 1.29.2 compatibility with kubent
command: |
set -o pipefail
helm template --kube-version=v1.29.1 -f values.yaml --set global.baseDomain=example.com . |
helm template --kube-version=v1.29.2 -f values.yaml --set global.baseDomain=example.com . |
kubent --cluster=false --helm3=false --filename -
when: always

Expand Down Expand Up @@ -454,22 +454,22 @@ workflows:
- platform-1-25-16:
requires:
- build-artifact
- platform-1-26-13:
- platform-1-26-14:
requires:
- approve-test-all-platforms
- build-artifact

- platform-1-27-10:
- platform-1-27-11:
requires:
- approve-test-all-platforms
- build-artifact

- platform-1-28-6:
- platform-1-28-7:
requires:
- approve-test-all-platforms
- build-artifact

- platform-1-29-1:
- platform-1-29-2:
requires:
- build-artifact
- approve-internal-release:
Expand All @@ -488,7 +488,7 @@ workflows:
requires:
- approve-internal-release
- platform-1-25-16
- platform-1-29-1
- platform-1-29-2
- approve-upgrade-test:
type: approval
filters:
Expand All @@ -507,9 +507,9 @@ workflows:
type: approval
requires:
- release-to-internal
- platform-1-26-13
- platform-1-27-10
- platform-1-28-6
- platform-1-26-14
- platform-1-27-11
- platform-1-28-7
filters:
branches:
only:
Expand Down Expand Up @@ -548,7 +548,7 @@ workflows:
requires:
- build-artifact

- platform-1-29-1:
- platform-1-29-2:
requires:
- build-artifact

Expand All @@ -557,7 +557,7 @@ workflows:
- gcp-astronomer-prod
requires:
- platform-1-25-16
- platform-1-29-1
- platform-1-29-2
filters:
branches:
only:
Expand Down
16 changes: 13 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ repos:
- id: codespell
args: ["-L", "AKS,aks"]
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.5.4
rev: v1.5.5
hooks:
- id: remove-tabs
exclude_types: [makefile, binary]
- repo: https://github.com/psf/black
rev: 24.1.1
rev: 24.2.0
hooks:
- id: black
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: "v0.2.1"
rev: "v0.3.0"
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix, --ignore, E501]
Expand Down Expand Up @@ -67,3 +67,13 @@ repos:
rev: v0.9.0.6
hooks:
- id: shellcheck
- repo: https://github.com/astronomer/pre-commit-hooks
rev: 8b2d969bd549cd7c9454cc8bb54eec5b35c2e5e6
hooks:
- id: CVE-2017-18342
- id: remove-unicode-zero-width-non-breaking-spaces
- id: remove-unicode-zero-width-space
- id: replace-en-dashes
exclude: 'bin/kind/.*'
- id: replace-greek-question-mark
- id: replace-unicode-non-breaking-spaces
2 changes: 1 addition & 1 deletion bin/generate_circleci_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# https://circleci.com/developer/machine/image/ubuntu-2204
machine_image_version = "ubuntu-2204:2024.01.1"
ci_runner_version = "2024-02"
ci_runner_version = "2024-03"


def list_docker_images():
Expand Down
6 changes: 3 additions & 3 deletions bin/install-ci-tools
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
set -xeuo pipefail

KIND_VERSION="0.21.0" # https://github.com/kubernetes-sigs/kind/releases
HELM_VERSION="3.14.0" # https://github.com/helm/helm/releases
GCLOUD_VERSION="462.0.1"
KIND_VERSION="0.22.0" # https://github.com/kubernetes-sigs/kind/releases
HELM_VERSION="3.14.2" # https://github.com/helm/helm/releases
GCLOUD_VERSION="465.0.0"
MKCERT_VERSION="1.4.4" # https://github.com/FiloSottile/mkcert/tags
KUBENT_VERSION="0.7.1" # https://github.com/doitintl/kube-no-trouble/releases

Expand Down
2 changes: 1 addition & 1 deletion bin/setup-kind
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# shellcheck disable=SC1090
set -euo pipefail

export KUBE_VERSION="${KUBE_VERSION:-v1.25.11}"
export KUBE_VERSION="${KUBE_VERSION:-v1.29.2}"

# The path to the working directory - the root of the repo
GIT_ROOT="$(git -C "${0%/*}" rev-parse --show-toplevel)"
Expand Down
8 changes: 4 additions & 4 deletions metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://hub.docker.com/r/kindest/node/tags
test_k8s_versions:
- 1.25.16
- 1.26.13
- 1.27.10
- 1.28.6
- 1.29.1
- 1.26.14
- 1.27.11
- 1.28.7
- 1.29.2
Loading

0 comments on commit d0b2fe2

Please sign in to comment.