From 27c24a409f96fa77d914a7f5dc3b6595a2bafaef Mon Sep 17 00:00:00 2001 From: xeniape Date: Fri, 17 Jan 2025 13:09:52 +0100 Subject: [PATCH 1/4] update repo references --- deploy/helm/airflow-operator/crds/crds.yaml | 4 ++-- deploy/helm/airflow-operator/values.yaml | 2 +- .../airflow/pages/reference/environment-variables.adoc | 6 +++--- tests/templates/kuttl/ldap/70-install-airflow-python.yaml | 2 +- .../templates/kuttl/logging/50-install-airflow-python.yaml | 2 +- .../mount-dags-configmap/40-install-airflow-python.yaml | 2 +- .../kuttl/mount-dags-gitsync/40-install-airflow-python.yaml | 2 +- .../templates/kuttl/oidc/50-install-test-container.yaml.j2 | 2 +- tests/templates/kuttl/smoke/50-install-airflow-python.yaml | 2 +- tests/test-definition.yaml | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/deploy/helm/airflow-operator/crds/crds.yaml b/deploy/helm/airflow-operator/crds/crds.yaml index afa8785e..a6125873 100644 --- a/deploy/helm/airflow-operator/crds/crds.yaml +++ b/deploy/helm/airflow-operator/crds/crds.yaml @@ -611,7 +611,7 @@ spec: Consult the [Product image selection documentation](https://docs.stackable.tech/home/nightly/concepts/product_image_selection) for details. properties: custom: - description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0` + description: Overwrite the docker image. Specify the full docker image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0` type: string productVersion: description: Version of the product, e.g. `1.4.1`. @@ -638,7 +638,7 @@ spec: nullable: true type: array repo: - description: Name of the docker repo, e.g. `docker.stackable.tech/stackable` + description: Name of the docker repo, e.g. `oci.stackable.tech/sdp` nullable: true type: string stackableVersion: diff --git a/deploy/helm/airflow-operator/values.yaml b/deploy/helm/airflow-operator/values.yaml index fe38c40d..479a393b 100644 --- a/deploy/helm/airflow-operator/values.yaml +++ b/deploy/helm/airflow-operator/values.yaml @@ -1,7 +1,7 @@ # Default values for airflow-operator. --- image: - repository: docker.stackable.tech/stackable/airflow-operator + repository: oci.stackable.tech/sdp/airflow-operator pullPolicy: IfNotPresent pullSecrets: [] diff --git a/docs/modules/airflow/pages/reference/environment-variables.adoc b/docs/modules/airflow/pages/reference/environment-variables.adoc index 6c901acb..dc4e1d3e 100644 --- a/docs/modules/airflow/pages/reference/environment-variables.adoc +++ b/docs/modules/airflow/pages/reference/environment-variables.adoc @@ -30,7 +30,7 @@ docker run \ --env KUBECONFIG=/home/stackable/.kube/config \ --env KUBERNETES_CLUSTER_DOMAIN=mycluster.local \ --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \ -docker.stackable.tech/stackable/airflow-operator:latest +oci.stackable.tech/sdp/airflow-operator:latest ---- == PRODUCT_CONFIG @@ -56,7 +56,7 @@ docker run \ --env KUBECONFIG=/home/stackable/.kube/config \ --env PRODUCT_CONFIG=/my/product/config.yaml \ --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \ - docker.stackable.tech/stackable/airflow-operator:latest + oci.stackable.tech/sdp/airflow-operator:latest ---- == WATCH_NAMESPACE @@ -85,5 +85,5 @@ docker run \ --env KUBECONFIG=/home/stackable/.kube/config \ --env WATCH_NAMESPACE=test \ --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \ -docker.stackable.tech/stackable/airflow-operator:latest +oci.stackable.tech/sdp/airflow-operator:latest ---- diff --git a/tests/templates/kuttl/ldap/70-install-airflow-python.yaml b/tests/templates/kuttl/ldap/70-install-airflow-python.yaml index b0b6ca33..ba4d16a8 100644 --- a/tests/templates/kuttl/ldap/70-install-airflow-python.yaml +++ b/tests/templates/kuttl/ldap/70-install-airflow-python.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: test-airflow-python - image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev stdin: true tty: true diff --git a/tests/templates/kuttl/logging/50-install-airflow-python.yaml b/tests/templates/kuttl/logging/50-install-airflow-python.yaml index b0b6ca33..ba4d16a8 100644 --- a/tests/templates/kuttl/logging/50-install-airflow-python.yaml +++ b/tests/templates/kuttl/logging/50-install-airflow-python.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: test-airflow-python - image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev stdin: true tty: true diff --git a/tests/templates/kuttl/mount-dags-configmap/40-install-airflow-python.yaml b/tests/templates/kuttl/mount-dags-configmap/40-install-airflow-python.yaml index b0b6ca33..ba4d16a8 100644 --- a/tests/templates/kuttl/mount-dags-configmap/40-install-airflow-python.yaml +++ b/tests/templates/kuttl/mount-dags-configmap/40-install-airflow-python.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: test-airflow-python - image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev stdin: true tty: true diff --git a/tests/templates/kuttl/mount-dags-gitsync/40-install-airflow-python.yaml b/tests/templates/kuttl/mount-dags-gitsync/40-install-airflow-python.yaml index b0b6ca33..ba4d16a8 100644 --- a/tests/templates/kuttl/mount-dags-gitsync/40-install-airflow-python.yaml +++ b/tests/templates/kuttl/mount-dags-gitsync/40-install-airflow-python.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: test-airflow-python - image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev stdin: true tty: true diff --git a/tests/templates/kuttl/oidc/50-install-test-container.yaml.j2 b/tests/templates/kuttl/oidc/50-install-test-container.yaml.j2 index d1199711..5119ca9b 100644 --- a/tests/templates/kuttl/oidc/50-install-test-container.yaml.j2 +++ b/tests/templates/kuttl/oidc/50-install-test-container.yaml.j2 @@ -55,7 +55,7 @@ spec: fsGroup: 1000 containers: - name: python - image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev stdin: true tty: true resources: diff --git a/tests/templates/kuttl/smoke/50-install-airflow-python.yaml b/tests/templates/kuttl/smoke/50-install-airflow-python.yaml index 494c7929..e087a848 100644 --- a/tests/templates/kuttl/smoke/50-install-airflow-python.yaml +++ b/tests/templates/kuttl/smoke/50-install-airflow-python.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: test-airflow-python - image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev stdin: true tty: true resources: diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 7be72360..6c987771 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -11,12 +11,12 @@ dimensions: - 2.9.3 - 2.10.2 # To use a custom image, add a comma and the full name after the product version - # - 2.8.1,docker.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev + # - 2.8.1,oci.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev - name: airflow-latest values: - 2.10.2 # To use a custom image, add a comma and the full name after the product version - # - 2.8.1,docker.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev + # - 2.8.1,oci.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev - name: ldap-authentication values: - no-tls From 915b3edd40b8535ecf7f37cabf27c30c66541697 Mon Sep 17 00:00:00 2001 From: xeniape Date: Fri, 17 Jan 2025 13:32:44 +0100 Subject: [PATCH 2/4] adjust tag --- deploy/helm/airflow-operator/crds/crds.yaml | 4 ++-- .../airflow/pages/reference/environment-variables.adoc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/helm/airflow-operator/crds/crds.yaml b/deploy/helm/airflow-operator/crds/crds.yaml index a6125873..afa8785e 100644 --- a/deploy/helm/airflow-operator/crds/crds.yaml +++ b/deploy/helm/airflow-operator/crds/crds.yaml @@ -611,7 +611,7 @@ spec: Consult the [Product image selection documentation](https://docs.stackable.tech/home/nightly/concepts/product_image_selection) for details. properties: custom: - description: Overwrite the docker image. Specify the full docker image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0` + description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0` type: string productVersion: description: Version of the product, e.g. `1.4.1`. @@ -638,7 +638,7 @@ spec: nullable: true type: array repo: - description: Name of the docker repo, e.g. `oci.stackable.tech/sdp` + description: Name of the docker repo, e.g. `docker.stackable.tech/stackable` nullable: true type: string stackableVersion: diff --git a/docs/modules/airflow/pages/reference/environment-variables.adoc b/docs/modules/airflow/pages/reference/environment-variables.adoc index dc4e1d3e..95824a7f 100644 --- a/docs/modules/airflow/pages/reference/environment-variables.adoc +++ b/docs/modules/airflow/pages/reference/environment-variables.adoc @@ -30,7 +30,7 @@ docker run \ --env KUBECONFIG=/home/stackable/.kube/config \ --env KUBERNETES_CLUSTER_DOMAIN=mycluster.local \ --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \ -oci.stackable.tech/sdp/airflow-operator:latest +oci.stackable.tech/sdp/airflow-operator:0.0.0-dev ---- == PRODUCT_CONFIG @@ -56,7 +56,7 @@ docker run \ --env KUBECONFIG=/home/stackable/.kube/config \ --env PRODUCT_CONFIG=/my/product/config.yaml \ --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \ - oci.stackable.tech/sdp/airflow-operator:latest + oci.stackable.tech/sdp/airflow-operator:0.0.0-dev ---- == WATCH_NAMESPACE @@ -85,5 +85,5 @@ docker run \ --env KUBECONFIG=/home/stackable/.kube/config \ --env WATCH_NAMESPACE=test \ --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \ -oci.stackable.tech/sdp/airflow-operator:latest +oci.stackable.tech/sdp/airflow-operator:0.0.0-dev ---- From e8bf07496a7e8a33e967aa3271fef187e56ba96a Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Tue, 21 Jan 2025 15:05:55 +0100 Subject: [PATCH 3/4] use draft op-rs branch for oci changes --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- deploy/helm/airflow-operator/crds/crds.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c4f6a6cc..25416e32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2372,7 +2372,7 @@ dependencies = [ [[package]] name = "stackable-operator" version = "0.84.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.0#af0d1f19d8770d346096a38c6dc82ba70e371039" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore/docker-refs-to-oci#fc525b5dff25d5ea3fa57e762916f6233dc41879" dependencies = [ "chrono", "clap", @@ -2410,7 +2410,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.0#af0d1f19d8770d346096a38c6dc82ba70e371039" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore/docker-refs-to-oci#fc525b5dff25d5ea3fa57e762916f6233dc41879" dependencies = [ "darling", "proc-macro2", @@ -2421,7 +2421,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.0#af0d1f19d8770d346096a38c6dc82ba70e371039" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore/docker-refs-to-oci#fc525b5dff25d5ea3fa57e762916f6233dc41879" dependencies = [ "kube", "semver", diff --git a/Cargo.toml b/Cargo.toml index 9ea5236e..304b7074 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,11 +24,11 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.9" snafu = "0.8" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.0" } +#stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.0" } strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" # [patch."https://github.com/stackabletech/operator-rs.git"] -# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } +stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "chore/docker-refs-to-oci" } # stackable-operator = { path = "../operator-rs/crates/stackable-operator" } diff --git a/deploy/helm/airflow-operator/crds/crds.yaml b/deploy/helm/airflow-operator/crds/crds.yaml index afa8785e..a6125873 100644 --- a/deploy/helm/airflow-operator/crds/crds.yaml +++ b/deploy/helm/airflow-operator/crds/crds.yaml @@ -611,7 +611,7 @@ spec: Consult the [Product image selection documentation](https://docs.stackable.tech/home/nightly/concepts/product_image_selection) for details. properties: custom: - description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0` + description: Overwrite the docker image. Specify the full docker image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0` type: string productVersion: description: Version of the product, e.g. `1.4.1`. @@ -638,7 +638,7 @@ spec: nullable: true type: array repo: - description: Name of the docker repo, e.g. `docker.stackable.tech/stackable` + description: Name of the docker repo, e.g. `oci.stackable.tech/sdp` nullable: true type: string stackableVersion: From 484f80863f04a4716327d9a2031b18786b3e77ae Mon Sep 17 00:00:00 2001 From: xeniape Date: Thu, 30 Jan 2025 11:00:11 +0100 Subject: [PATCH 4/4] bump stackable-operator version and add changelog entry --- CHANGELOG.md | 5 +++++ Cargo.lock | 8 ++++---- Cargo.nix | 14 +++++++------- Cargo.toml | 6 +++--- crate-hashes.json | 6 +++--- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd3346a9..7972758f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,13 @@ - Run a `containerdebug` process in the background of each Airflow container to collect debugging information ([#557]). - Aggregate emitted Kubernetes events on the CustomResources ([#571]). +### Changed + +- Default to OCI for image metadata and product image selection ([#572]). + [#557]: https://github.com/stackabletech/airflow-operator/pull/557 [#571]: https://github.com/stackabletech/airflow-operator/pull/571 +[#572]: https://github.com/stackabletech/airflow-operator/pull/572 ## [24.11.1] - 2025-01-09 diff --git a/Cargo.lock b/Cargo.lock index 58bfb58f..ee5992e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2371,8 +2371,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.84.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#b8fe43f7368249bf95b06d6cba3fd0135f7523ac" +version = "0.85.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d" dependencies = [ "chrono", "clap", @@ -2410,7 +2410,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#b8fe43f7368249bf95b06d6cba3fd0135f7523ac" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d" dependencies = [ "darling", "proc-macro2", @@ -2421,7 +2421,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#b8fe43f7368249bf95b06d6cba3fd0135f7523ac" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d" dependencies = [ "kube", "semver", diff --git a/Cargo.nix b/Cargo.nix index adfd3711..691d50bf 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -7391,13 +7391,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.84.1"; + version = "0.85.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "b8fe43f7368249bf95b06d6cba3fd0135f7523ac"; - sha256 = "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i"; + rev = "59506c6202778889a27b6ae8153457e60a49c68d"; + sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5"; }; libName = "stackable_operator"; authors = [ @@ -7556,8 +7556,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "b8fe43f7368249bf95b06d6cba3fd0135f7523ac"; - sha256 = "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i"; + rev = "59506c6202778889a27b6ae8153457e60a49c68d"; + sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -7591,8 +7591,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "b8fe43f7368249bf95b06d6cba3fd0135f7523ac"; - sha256 = "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i"; + rev = "59506c6202778889a27b6ae8153457e60a49c68d"; + sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5"; }; libName = "stackable_shared"; authors = [ diff --git a/Cargo.toml b/Cargo.toml index af2e62b3..f26d8fc6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,11 +24,11 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.9" snafu = "0.8" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.85.0" } strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" -[patch."https://github.com/stackabletech/operator-rs.git"] -stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "chore/docker-refs-to-oci" } +# [patch."https://github.com/stackabletech/operator-rs.git"] +# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } # stackable-operator = { path = "../operator-rs/crates/stackable-operator" } diff --git a/crate-hashes.json b/crate-hashes.json index a0346ddb..290d87f2 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,6 +1,6 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#stackable-operator-derive@0.3.1": "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#stackable-operator@0.84.1": "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#stackable-shared@0.0.1": "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#stackable-operator-derive@0.3.1": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#stackable-operator@0.85.0": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#stackable-shared@0.0.1": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5", "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny" } \ No newline at end of file