Skip to content

Commit

Permalink
Bump dev component versions (#493)
Browse files Browse the repository at this point in the history
* Bump dev component versions

* Bump kind, helm

* Update k8s versions.

* Add script to show latest k8s versions.
  • Loading branch information
danielhoherd committed Apr 19, 2024
1 parent a36b240 commit 9101932
Show file tree
Hide file tree
Showing 9 changed files with 308 additions and 262 deletions.
84 changes: 42 additions & 42 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,94 +41,94 @@ workflows:
- build-and-release-internal

- airflow-test:
name: test-1-26-13-CeleryExecutor
kube_version: 1.26.13
name: test-1-26-14-CeleryExecutor
kube_version: 1.26.14
executor: CeleryExecutor
requires:
- build-and-release-internal

- approve-test-all
- airflow-test:
name: test-1-26-13-LocalExecutor
kube_version: 1.26.13
name: test-1-26-14-LocalExecutor
kube_version: 1.26.14
executor: LocalExecutor
requires:
- build-and-release-internal

- approve-test-all
- airflow-test:
name: test-1-26-13-KubernetesExecutor
kube_version: 1.26.13
name: test-1-26-14-KubernetesExecutor
kube_version: 1.26.14
executor: KubernetesExecutor
requires:
- build-and-release-internal

- approve-test-all
- airflow-test:
name: test-1-27-10-CeleryExecutor
kube_version: 1.27.10
name: test-1-27-11-CeleryExecutor
kube_version: 1.27.11
executor: CeleryExecutor
requires:
- build-and-release-internal

- approve-test-all
- airflow-test:
name: test-1-27-10-LocalExecutor
kube_version: 1.27.10
name: test-1-27-11-LocalExecutor
kube_version: 1.27.11
executor: LocalExecutor
requires:
- build-and-release-internal

- approve-test-all
- airflow-test:
name: test-1-27-10-KubernetesExecutor
kube_version: 1.27.10
name: test-1-27-11-KubernetesExecutor
kube_version: 1.27.11
executor: KubernetesExecutor
requires:
- build-and-release-internal

- approve-test-all
- airflow-test:
name: test-1-28-6-CeleryExecutor
kube_version: 1.28.6
name: test-1-28-7-CeleryExecutor
kube_version: 1.28.7
executor: CeleryExecutor
requires:
- build-and-release-internal

- approve-test-all
- airflow-test:
name: test-1-28-6-LocalExecutor
kube_version: 1.28.6
name: test-1-28-7-LocalExecutor
kube_version: 1.28.7
executor: LocalExecutor
requires:
- build-and-release-internal

- approve-test-all
- airflow-test:
name: test-1-28-6-KubernetesExecutor
kube_version: 1.28.6
name: test-1-28-7-KubernetesExecutor
kube_version: 1.28.7
executor: KubernetesExecutor
requires:
- build-and-release-internal

- approve-test-all
- airflow-test:
name: test-1-29-1-CeleryExecutor
kube_version: 1.29.1
name: test-1-29-2-CeleryExecutor
kube_version: 1.29.2
executor: CeleryExecutor
requires:
- build-and-release-internal

- airflow-test:
name: test-1-29-1-LocalExecutor
kube_version: 1.29.1
name: test-1-29-2-LocalExecutor
kube_version: 1.29.2
executor: LocalExecutor
requires:
- build-and-release-internal

- airflow-test:
name: test-1-29-1-KubernetesExecutor
kube_version: 1.29.1
name: test-1-29-2-KubernetesExecutor
kube_version: 1.29.2
executor: KubernetesExecutor
requires:
- build-and-release-internal
Expand All @@ -139,18 +139,18 @@ workflows:
- "test-1-25-16-CeleryExecutor"
- "test-1-25-16-LocalExecutor"
- "test-1-25-16-KubernetesExecutor"
- "test-1-26-13-CeleryExecutor"
- "test-1-26-13-LocalExecutor"
- "test-1-26-13-KubernetesExecutor"
- "test-1-27-10-CeleryExecutor"
- "test-1-27-10-LocalExecutor"
- "test-1-27-10-KubernetesExecutor"
- "test-1-28-6-CeleryExecutor"
- "test-1-28-6-LocalExecutor"
- "test-1-28-6-KubernetesExecutor"
- "test-1-29-1-CeleryExecutor"
- "test-1-29-1-LocalExecutor"
- "test-1-29-1-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"
filters:
branches:
only:
Expand All @@ -171,7 +171,7 @@ workflows:
jobs:
run_pre_commit:
docker:
- image: quay.io/astronomer/ci-pre-commit:2024-02
- image: quay.io/astronomer/ci-pre-commit:2024-04
steps:
- checkout
- run:
Expand Down Expand Up @@ -206,7 +206,7 @@ jobs:

unittest-charts:
docker:
- image: quay.io/astronomer/ci-helm-release:2024-02
- image: quay.io/astronomer/ci-helm-release:2024-04
parallelism: 8
steps:
- setup_remote_docker:
Expand All @@ -225,7 +225,7 @@ jobs:

build-and-release-internal:
docker:
- image: quay.io/astronomer/ci-helm-release:2024-02
- image: quay.io/astronomer/ci-helm-release:2024-04
steps:
- checkout
- run:
Expand All @@ -239,7 +239,7 @@ jobs:
airflow-test:
machine:
# https://circleci.com/developer/machine/image/ubuntu-2204
image: ubuntu-2204:2023.07.2
image: ubuntu-2204:2024.01.2
resource_class: large
parameters:
executor:
Expand All @@ -265,7 +265,7 @@ jobs:
path: test-results
release-internal:
docker:
- image: quay.io/astronomer/ci-helm-release:2024-02
- image: quay.io/astronomer/ci-helm-release:2024-04
steps:
- checkout
- run:
Expand All @@ -274,7 +274,7 @@ jobs:

release-public:
docker:
- image: quay.io/astronomer/ci-helm-release:2024-02
- image: quay.io/astronomer/ci-helm-release:2024-04
steps:
- checkout
- publish-github-release
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
airflow-test:
machine:
# https://circleci.com/developer/machine/image/ubuntu-2204
image: ubuntu-2204:2023.07.2
image: ubuntu-2204:2024.01.2
resource_class: large
parameters:
executor:
Expand Down
16 changes: 8 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
exclude: '^(venv|\.vscode|tests/k8s_schema)' # regex
repos:
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: "v0.1.13"
rev: "v0.3.7"
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix, --ignore, E501]
- repo: https://github.com/psf/black
rev: 23.12.1
rev: 24.4.0
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-case-conflict
- id: check-executables-have-shebangs
Expand Down Expand Up @@ -42,19 +42,19 @@ repos:
- id: sort-simple-yaml
- id: trailing-whitespace
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.9.0.6
rev: v0.10.0.1
hooks:
- id: shellcheck
- 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/astronomer/pre-commit-hooks
rev: bd325c947efcba13c03b4f4c93d882f2f83ed6ff
rev: 8b2d969bd549cd7c9454cc8bb54eec5b35c2e5e6
hooks:
- id: remove-en-dashes
- id: remove-unicode-non-breaking-spaces
- id: replace-en-dashes
- id: replace-unicode-non-breaking-spaces
- id: remove-unicode-zero-width-non-breaking-spaces
- id: remove-unicode-zero-width-space
- repo: local
Expand Down
2 changes: 1 addition & 1 deletion bin/generate_circleci_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
kube_versions = metadata["test_k8s_versions"]

executors = ["CeleryExecutor", "LocalExecutor", "KubernetesExecutor"]
ci_runner_version = "2024-02"
ci_runner_version = "2024-04"


def main():
Expand Down
46 changes: 46 additions & 0 deletions bin/get-k8s-versions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/usr/bin/env python3

import argparse
import requests
import yaml


def get_latest_versions(repository, num_versions):
url = f"https://hub.docker.com/v2/repositories/{repository}/tags/"
response = requests.get(url)
data = response.json()

versions = {}
for tag in data["results"]:
version = tag["name"]
# Split version string into major, minor, and patch
major, minor, patch = [int(x.removeprefix("v")) for x in version.split(".")]
key = f"{major}.{minor}"
# Only keep the highest patch version for each major.minor
if key not in versions or versions[key] < patch:
versions[key] = patch
latest_versions = sorted([f"v{key}.{value}" for key, value in versions.items()])

return [x.removeprefix("v") for x in latest_versions[-num_versions:]]


def generate_yaml(versions):
return yaml.dump(versions, default_flow_style=False)


if __name__ == "__main__":
parser = argparse.ArgumentParser(
description="Generate a YAML list of latest Docker image versions"
)
parser.add_argument("-n", type=int, default=5, help="Number of versions to include")
parser.add_argument(
"--repo",
type=str,
default="kindest/node",
help="Docker repository (e.g., kindest/node)",
)
args = parser.parse_args()

latest_versions = get_latest_versions(args.repo, args.n)
yaml_list = generate_yaml(latest_versions)
print(yaml_list.strip())
4 changes: 2 additions & 2 deletions bin/install-ci-tools
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
set -e

if [[ -z "${KIND_VERSION}" ]]; then
export KIND_VERSION="0.20.0"
export KIND_VERSION="0.22.0"
fi

if [[ -z "${HELM_VERSION}" ]]; then
export HELM_VERSION="3.13.3"
export HELM_VERSION="3.14.4"
fi

# Determine the platform we are running on
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 9101932

Please sign in to comment.