feat: Prepare for k8s 1.33 build

Alan Christie · Alan Christie · commit 3a10b63ebcad · 2025-08-01T10:46:14.000+01:00
diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml
diff --git a/.github/workflows/build-stable.yaml b/.github/workflows/build-stable.yaml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -40,13 +40,13 @@ repos:
     - py312
 # MyPy
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.15.0
+  rev: v1.17.0
   hooks:
   - id: mypy
     files: ^operator
 # Pylint
 - repo: https://github.com/pycqa/pylint
-  rev: v3.3.6
+  rev: v3.3.7
   hooks:
   - id: pylint
     files: ^operator
@@ -57,7 +57,7 @@ repos:
 # All files that end '.yaml' or '.yaml.j2'
 # See https://pre-commit.com/#filtering-files-with-types
 - repo: https://github.com/adrienverge/yamllint
-  rev: v1.37.0
+  rev: v1.37.1
   hooks:
   - id: yamllint
     types:
diff --git a/README.md b/README.md
@@ -6,9 +6,7 @@
 ![Architecture](https://img.shields.io/badge/architecture-amd64%20%7C%20arm64-lightgrey)
 
 [![build](https://github.com/informaticsmatters/squonk2-data-manager-jupyter-operator/actions/workflows/build.yaml/badge.svg)](https://github.com/informaticsmatters/squonk2-data-manager-jupyter-operator/actions/workflows/build.yaml)
-[![build latest](https://github.com/informaticsmatters/squonk2-data-manager-jupyter-operator/actions/workflows/build-latest.yaml/badge.svg)](https://github.com/informaticsmatters/squonk2-data-manager-jupyter-operator/actions/workflows/build-latest.yaml)
 [![build tag](https://github.com/informaticsmatters/squonk2-data-manager-jupyter-operator/actions/workflows/build-tag.yaml/badge.svg)](https://github.com/informaticsmatters/squonk2-data-manager-jupyter-operator/actions/workflows/build-tag.yaml)
-[![build stable](https://github.com/informaticsmatters/squonk2-data-manager-jupyter-operator/actions/workflows/build-stable.yaml/badge.svg)](https://github.com/informaticsmatters/squonk2-data-manager-jupyter-operator/actions/workflows/build-stable.yaml)
 
 ![GitHub](https://img.shields.io/github/license/informaticsmatters/squonk2-data-manager-jupyter-operator)
 
@@ -34,7 +32,7 @@ Prerequisites: -
 -   Python
 -   Docker
 -   A kubernetes config file
--   A compatible Kubernetes (e.g. 1.22 thru 1.24 if the operator is built for 1.23)
+-   A compatible Kubernetes (e.g. 1.32 thru 1.34 if the operator is built for 1.33)
 
 ## Contributing
 The project uses: -
@@ -69,7 +67,7 @@ is automatically built and pushed to Docker Hub using GitHub Actions.
 You can build and push the image yourself using docker-compose.
 The following will build an operator image with a specific tag: -
 
-    export IMAGE_TAG=23.1.0-alpha.1
+    export IMAGE_TAG=34.0.0-alpha.1
     docker compose build
     docker compose push
 
@@ -83,7 +81,6 @@ environment using the requirements in the root of the project...
     source venv/bin/activate
     pip install --upgrade pip
     pip install -r requirements.txt
-    ansible-galaxy install -r requirements.yaml
 
 Set your KUBECONFIG for the cluster and verify its right: -
 
diff --git a/build-requirements.txt b/build-requirements.txt
@@ -1,6 +1,6 @@
-ansible-lint == 6.17.2
-black == 23.7.0
-mypy == 1.4.1
-pre-commit == 3.3.3
-pylint == 2.17.4
-yamllint == 1.32.0
+ansible-lint == 25.7.0
+black == 25.1.0
+mypy == 1.17.0
+pre-commit == 4.2.0
+pylint == 3.3.7
+yamllint == 1.37.1
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -20,4 +20,4 @@ services:
   operator:
     build:
       context: operator
-    image: informaticsmatters/data-manager-jupyter-operator:${IMAGE_TAG:-19.2.0}
+    image: informaticsmatters/data-manager-jupyter-operator:${IMAGE_TAG:-33.0.0}
diff --git a/docker-desktop-parameters.yaml b/docker-desktop-parameters.yaml
@@ -3,7 +3,7 @@
 jo_ingress_domain: kubernetes.docker.internal
 jo_ingress_tls_secret: data-manager-api-tls
 jo_dmapi_namespace: data-manager-api
-jo_image_tag: 19.2.0
+jo_image_tag: 33.0.0
 jo_namespaces: data-manager-api
 
 jo_kubeconfig: "{{ lookup('env', 'KUBECONFIG') }}"
diff --git a/integration-parameters.yaml b/integration-parameters.yaml
@@ -1,6 +1,6 @@
 ---
 
-jo_image_tag: 19.2.0
+jo_image_tag: 33.0.0
 jo_dmapi_namespace: data-manager-api-integration
 
 jo_ingress_domain: squonk.it
diff --git a/local-parameters.yaml b/local-parameters.yaml
@@ -1,6 +1,6 @@
 ---
 
-jo_image_tag: 19.2.7
+jo_image_tag: 33.0.0
 jo_ingress_domain: kubernetes.docker.internal
 jo_namespaces: im-data-manager-api
 jo_namespace: im-data-manager-jupyter-operator
diff --git a/operator/Dockerfile b/operator/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.9-slim
+FROM python:3.12.11-slim
 
 # Labels
 LABEL maintainer='Alan Christie <achristie@informaticsmatters.com>'
diff --git a/operator/requirements.txt b/operator/requirements.txt
@@ -1,2 +1,2 @@
-kopf == 1.37.5
-kubernetes == 31.0.0
+kopf == 1.38.0
+kubernetes == 33.1.0
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-ansible == 8.2.0
-kubernetes == 31.0.0
-openshift == 0.13.1
+ansible == 11.8.0
+kubernetes == 31.1.0
+openshift == 0.13.2
diff --git a/requirements.yaml b/requirements.yaml
diff --git a/staging-parameters.yaml b/staging-parameters.yaml
@@ -1,6 +1,6 @@
 ---
 
-jo_image_tag: 19.2.2
+jo_image_tag: 33.0.0
 jo_dmapi_namespace: data-manager-api-staging
 
 jo_ingress_domain: squonk.it
diff --git a/xchem-dev-dev-parameters.yaml b/xchem-dev-dev-parameters.yaml
@@ -1,6 +1,6 @@
 ---
 
-jo_image_tag: 19.2.2
+jo_image_tag: 33.0.0
 jo_dmapi_namespace: data-manager-api-dev
 
 jo_ingress_domain: data-manager.xchem-dev.diamond.ac.uk
diff --git a/xchem-dev-integration-parameters.yaml b/xchem-dev-integration-parameters.yaml
@@ -1,6 +1,6 @@
 ---
 
-jo_image_tag: 31.0.11
+jo_image_tag: 33.0.0
 jo_dmapi_namespace: data-manager-api-integration
 
 jo_ingress_domain: data-manager-integration.xchem-dev.diamond.ac.uk
diff --git a/xchem-dev-test-parameters.yaml b/xchem-dev-test-parameters.yaml
@@ -1,6 +1,6 @@
 ---
 
-jo_image_tag: 31.0.11
+jo_image_tag: 33.0.0
 jo_dmapi_namespace: data-manager-api-test
 
 jo_ingress_domain: data-manager-test.xchem-dev.diamond.ac.uk
diff --git a/xchem-nw-dev-parameters.yaml b/xchem-nw-dev-parameters.yaml
@@ -1,6 +1,6 @@
 ---
 
-jo_image_tag: 31.0.11
+jo_image_tag: 33.0.0
 jo_dmapi_namespace: data-manager-api-dev
 
 jo_ingress_domain: data-manager.xchem-dev.diamond.ac.uk
diff --git a/xchem-prod-parameters.yaml b/xchem-prod-parameters.yaml
@@ -1,6 +1,6 @@
 ---
 
-jo_image_tag: 19.2.2
+jo_image_tag: 33.0.0
 jo_dmapi_namespace: data-manager-api-production
 
 jo_ingress_domain: data-manager.xchem.diamond.ac.uk

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.12.9-slim`
	`1`	`+FROM python:3.12.11-slim`
`2`	`2`
`3`	`3`	`# Labels`
`4`	`4`	`LABEL maintainer='Alan Christie <[email protected]>'`