Skip to content

Commit

Permalink
Update dev components (#1942)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhoherd authored and Simpcyclassy committed Jul 26, 2023
1 parent 86b24de commit f518ea9
Show file tree
Hide file tree
Showing 7 changed files with 466 additions and 465 deletions.
24 changes: 12 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ executors:
environment:
GIT_ORG: astronomer
docker:
- image: cimg/python:3.10
- image: cimg/python:3.11

orbs:
slack: circleci/slack@4.10.1
Expand All @@ -29,7 +29,7 @@ parameters:
jobs:
trivy-scan-docker:
docker:
- image: docker:20.10.18-git
- image: docker:20.10.24-git
shell: /bin/sh -leo pipefail
parameters:
docker_image:
Expand All @@ -44,7 +44,7 @@ jobs:
ASTRO_SEC_ENDPOINT: << parameters.report_url >>
steps:
- setup_remote_docker:
version: 20.10.18
version: 20.10.24
- checkout
- run:
name: Pull Docker image
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
steps:
- setup_remote_docker:
docker_layer_caching: true
version: 20.10.18
version: 20.10.24
- checkout
- run:
name: Create chart-tests-cache-key.txt
Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:

platform-1-23-17:
machine:
image: ubuntu-2204:2023.02.1
image: ubuntu-2204:2023.07.2
resource_class: xlarge
environment:
KUBE_VERSION: v1.23.17
Expand All @@ -236,7 +236,7 @@ jobs:
when: always
platform-1-24-15:
machine:
image: ubuntu-2204:2023.02.1
image: ubuntu-2204:2023.07.2
resource_class: xlarge
environment:
KUBE_VERSION: v1.24.15
Expand All @@ -252,7 +252,7 @@ jobs:
when: always
platform-1-25-11:
machine:
image: ubuntu-2204:2023.02.1
image: ubuntu-2204:2023.07.2
resource_class: xlarge
environment:
KUBE_VERSION: v1.25.11
Expand All @@ -268,7 +268,7 @@ jobs:
when: always
platform-1-26-6:
machine:
image: ubuntu-2204:2023.02.1
image: ubuntu-2204:2023.07.2
resource_class: xlarge
environment:
KUBE_VERSION: v1.26.6
Expand All @@ -284,7 +284,7 @@ jobs:
when: always
platform-1-27-3:
machine:
image: ubuntu-2204:2023.02.1
image: ubuntu-2204:2023.07.2
resource_class: xlarge
environment:
KUBE_VERSION: v1.27.3
Expand All @@ -305,7 +305,7 @@ jobs:
steps:
- checkout
- setup_remote_docker:
version: 20.10.18
version: 20.10.24
- run:
name: Check that commander image uses same Airflow chart version
command: make validate-commander-airflow-version
Expand Down Expand Up @@ -507,7 +507,7 @@ commands:
steps:
- setup_remote_docker:
docker_layer_caching: true
version: 20.10.18
version: 20.10.24
- attach_workspace:
at: /tmp/workspace
- run:
Expand Down Expand Up @@ -561,7 +561,7 @@ commands:
- checkout
- setup_remote_docker:
docker_layer_caching: true
version: 20.10.18
version: 20.10.24
- run:
name: Build the Docker image
command: |
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ executors:
environment:
GIT_ORG: astronomer
docker:
- image: cimg/python:3.10
- image: cimg/python:3.11

orbs:
slack: circleci/slack@4.10.1
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 @@ -13,9 +13,9 @@
# https://hub.docker.com/r/kindest/node/tags
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"
ci_remote_docker_version = "20.10.24"
# https://circleci.com/developer/machine/image/ubuntu-2204
machine_image_version = "ubuntu-2204:2023.02.1"
machine_image_version = "ubuntu-2204:2023.07.2"
ci_runner_version = "2023-07"


Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repos:
entry: .circleci/generate_circleci_config.py
additional_dependencies: ["jinja2"]
- repo: https://github.com/codespell-project/codespell
rev: v2.2.4
rev: v2.2.5
hooks:
- id: codespell
args: ["-L", "AKS,aks"]
Expand All @@ -20,11 +20,11 @@ repos:
- id: remove-tabs
exclude_types: [makefile, binary]
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.7.0
hooks:
- id: black
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: "v0.0.269"
rev: "v0.0.280"
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix, --ignore, E501]
Expand Down Expand Up @@ -58,6 +58,6 @@ repos:
- id: sort-simple-yaml
- id: trailing-whitespace
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.9.0.2
rev: v0.9.0.5
hooks:
- id: shellcheck
4 changes: 1 addition & 3 deletions requirements/chart-tests.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
black
docker
exceptiongroup # indirect, needed to satisfy hash requirement
filelock
GitPython
jmespath
jsonschema
kubernetes
pdbpp
pytest
pytest-forked
pytest-pretty
Expand All @@ -16,4 +14,4 @@ pytest-testinfra
pytest-xdist
PyYAML
requests
tomli # indirect, needed to satisfy hash requirement
tomli

0 comments on commit f518ea9

Please sign in to comment.