From 5f7b3026b50df0f3c139957b9186197c8a7b27ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Thu, 18 Jun 2026 14:23:04 +0200 Subject: [PATCH 1/2] chore: bump same-repository references to v0.3.0 Updated all internal references from v0.1.0 and v0.1.1 to v0.3.0 for components and resources hosted at github.com/openstack-k8s-operators/gitops. Changes include: - Application manifests (ESO, VSO) - Example kustomization files (controlplane, dataplane, networks, dependencies) - Component and example documentation This ensures consistency across the repository for the v0.3.0 release. Co-Authored-By: Claude Sonnet 4.5 (claude-sonnet-4-5@20250929) --- applications/external-secrets-operator-redhat.yaml | 2 +- applications/external-secrets-operator.yaml | 2 +- applications/vault-secrets-operator.yaml | 2 +- charts/rhoso-apps/README.md | 2 +- components/secrets/README.md | 4 ++-- components/utilities/approve-installplan/README.md | 2 +- example/dependencies/kustomization.yaml | 2 +- example/openstack-controlplane/kustomization.yaml | 6 +++--- example/openstack-dataplane/kustomization.yaml | 4 ++-- example/openstack-networks/kustomization.yaml | 4 ++-- example/openstack-operator/README.md | 2 +- example/openstack-operator/kustomization.yaml | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/applications/external-secrets-operator-redhat.yaml b/applications/external-secrets-operator-redhat.yaml index 18a01cc..83a1b3f 100644 --- a/applications/external-secrets-operator-redhat.yaml +++ b/applications/external-secrets-operator-redhat.yaml @@ -15,7 +15,7 @@ spec: source: kustomize: components: - - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.1.1 + - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.3.0 path: resources/external-secrets-operator/redhat repoURL: https://github.com/openstack-k8s-operators/gitops.git targetRevision: HEAD diff --git a/applications/external-secrets-operator.yaml b/applications/external-secrets-operator.yaml index 7daaee2..8ed0ee5 100644 --- a/applications/external-secrets-operator.yaml +++ b/applications/external-secrets-operator.yaml @@ -15,7 +15,7 @@ spec: source: kustomize: components: - - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.1.1 + - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.3.0 path: resources/external-secrets-operator repoURL: https://github.com/openstack-k8s-operators/gitops.git targetRevision: HEAD diff --git a/applications/vault-secrets-operator.yaml b/applications/vault-secrets-operator.yaml index bdde851..ff9d9fb 100644 --- a/applications/vault-secrets-operator.yaml +++ b/applications/vault-secrets-operator.yaml @@ -15,7 +15,7 @@ spec: source: kustomize: components: - - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.1.1 + - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.3.0 path: resources/vault-secrets-operator repoURL: https://github.com/openstack-k8s-operators/gitops.git targetRevision: HEAD diff --git a/charts/rhoso-apps/README.md b/charts/rhoso-apps/README.md index 892b9f0..284c381 100644 --- a/charts/rhoso-apps/README.md +++ b/charts/rhoso-apps/README.md @@ -364,7 +364,7 @@ applications: operator-dependencies: kustomize: components: - - "https://github.com/openstack-k8s-operators/gitops/components/secrets/vault-secrets-operator?ref=v0.2.0" + - "https://github.com/openstack-k8s-operators/gitops/components/secrets/vault-secrets-operator?ref=v0.3.0" ``` `openstack-secrets` excerpt (Vault Secrets Operator style patch; adjust for diff --git a/components/secrets/README.md b/components/secrets/README.md index ae622fe..5201113 100644 --- a/components/secrets/README.md +++ b/components/secrets/README.md @@ -15,7 +15,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: [] components: - - https://github.com/openstack-k8s-operators/gitops/components/secrets/vault-secrets-operator?ref=feature/rhoso-apps-helm-chart + - https://github.com/openstack-k8s-operators/gitops/components/secrets/vault-secrets-operator?ref=v0.3.0 ``` Example including the Red Hat ESO overlay as a resource: @@ -24,5 +24,5 @@ Example including the Red Hat ESO overlay as a resource: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - https://github.com/openstack-k8s-operators/gitops/components/secrets/external-secrets-operator/redhat?ref=feature/rhoso-apps-helm-chart + - https://github.com/openstack-k8s-operators/gitops/components/secrets/external-secrets-operator/redhat?ref=v0.3.0 ``` diff --git a/components/utilities/approve-installplan/README.md b/components/utilities/approve-installplan/README.md index 6064f17..862bb68 100644 --- a/components/utilities/approve-installplan/README.md +++ b/components/utilities/approve-installplan/README.md @@ -17,7 +17,7 @@ runs first, the Subscription sync-wave patch will not apply. components: - pin-version - https://github.com/openstack-k8s-operators/architecture/lib/olm-openstack-subscriptions/overlays/default?ref=COMMIT_SHA - - https://github.com/openstack-k8s-operators/gitops/components/utilities/approve-installplan?ref=v0.1.0 + - https://github.com/openstack-k8s-operators/gitops/components/utilities/approve-installplan?ref=v0.3.0 ``` Images: `registry.redhat.io/openshift4/ose-tools-rhel9:latest` (Job). diff --git a/example/dependencies/kustomization.yaml b/example/dependencies/kustomization.yaml index d4c8b9d..490bdd8 100644 --- a/example/dependencies/kustomization.yaml +++ b/example/dependencies/kustomization.yaml @@ -6,4 +6,4 @@ components: - https://github.com/openstack-k8s-operators/architecture/lib/olm-deps?ref=7da5f2e1dc2bfce99e269b0017783679ca405d8c - https://github.com/openstack-k8s-operators/architecture/lib/metallb?ref=7da5f2e1dc2bfce99e269b0017783679ca405d8c - https://github.com/openstack-k8s-operators/architecture/lib/nmstate?ref=7da5f2e1dc2bfce99e269b0017783679ca405d8c - - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.1.0 + - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.3.0 diff --git a/example/openstack-controlplane/kustomization.yaml b/example/openstack-controlplane/kustomization.yaml index 3b512fd..e9cfeb8 100644 --- a/example/openstack-controlplane/kustomization.yaml +++ b/example/openstack-controlplane/kustomization.yaml @@ -4,9 +4,9 @@ kind: Kustomization components: # Remote refs (for CI/ArgoCD): - - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.1.0 - - https://github.com/openstack-k8s-operators/gitops/components/rhoso/controlplane/controlplane?ref=v0.1.0 - - https://github.com/openstack-k8s-operators/gitops/components/rhoso/controlplane/services/watcher?ref=v0.1.0 + - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.3.0 + - https://github.com/openstack-k8s-operators/gitops/components/rhoso/controlplane/controlplane?ref=v0.3.0 + - https://github.com/openstack-k8s-operators/gitops/components/rhoso/controlplane/services/watcher?ref=v0.3.0 # Local paths (for "kustomize build" testing): # - ../../components/argocd/annotations # - ../../components/rhoso/controlplane/controlplane diff --git a/example/openstack-dataplane/kustomization.yaml b/example/openstack-dataplane/kustomization.yaml index d886274..e6c2640 100644 --- a/example/openstack-dataplane/kustomization.yaml +++ b/example/openstack-dataplane/kustomization.yaml @@ -4,8 +4,8 @@ kind: Kustomization components: # Remote refs (for CI/ArgoCD): - - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.1.0 - - https://github.com/openstack-k8s-operators/gitops/components/rhoso/dataplane?ref=v0.1.0 + - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.3.0 + - https://github.com/openstack-k8s-operators/gitops/components/rhoso/dataplane?ref=v0.3.0 # Local paths (for "kustomize build" testing): # - ../../components/argocd/annotations # - ../../components/rhoso/dataplane diff --git a/example/openstack-networks/kustomization.yaml b/example/openstack-networks/kustomization.yaml index 40a5f9a..1987025 100644 --- a/example/openstack-networks/kustomization.yaml +++ b/example/openstack-networks/kustomization.yaml @@ -4,8 +4,8 @@ kind: Kustomization components: # Remote refs (for CI/ArgoCD): - - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.1.0 - - https://github.com/openstack-k8s-operators/gitops/components/rhoso/controlplane/networking?ref=v0.1.0 + - https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.3.0 + - https://github.com/openstack-k8s-operators/gitops/components/rhoso/controlplane/networking?ref=v0.3.0 # Local paths (for "kustomize build" testing): # - ../../components/argocd/annotations # - ../../components/rhoso/controlplane/networking diff --git a/example/openstack-operator/README.md b/example/openstack-operator/README.md index ca0d2c2..040573d 100644 --- a/example/openstack-operator/README.md +++ b/example/openstack-operator/README.md @@ -21,7 +21,7 @@ See Red Hat documentation: | `catalog/values.yaml` | `ConfigMap` `olm-values` (channel, `redhat-operators`, index image, Manual approval) | | `pin-version/` | Adds `data.openstack-operator-version` for `spec.startingCSV` | | Remote component | `architecture` `olm-openstack-subscriptions/overlays/default` (pinned git ref in `kustomization.yaml`) | -| [approve-installplan](https://github.com/openstack-k8s-operators/gitops/tree/v0.1.0/components/utilities/approve-installplan) (`?ref=v0.1.0`) | Shared utility: RBAC, InstallPlan approval `Job`, Subscription sync-wave | +| [approve-installplan](https://github.com/openstack-k8s-operators/gitops/tree/v0.3.0/components/utilities/approve-installplan) (`?ref=v0.3.0`) | Shared utility: RBAC, InstallPlan approval `Job`, Subscription sync-wave | Component order in `kustomization.yaml` matters: the version pin runs before the remote OLM component; the approval `Component` runs after it so the Subscription exists when the sync-wave patch diff --git a/example/openstack-operator/kustomization.yaml b/example/openstack-operator/kustomization.yaml index 73be201..b2070e8 100644 --- a/example/openstack-operator/kustomization.yaml +++ b/example/openstack-operator/kustomization.yaml @@ -11,6 +11,6 @@ components: - pin-version - https://github.com/openstack-k8s-operators/architecture/lib/olm-openstack-subscriptions/overlays/default?ref=7da5f2e1dc2bfce99e269b0017783679ca405d8c # TODO: replace the local path with a git HTTPS URI, e.g. - # https://github.com/openstack-k8s-operators/gitops/components/utilities/approve-installplan?ref=v0.1.0 + # https://github.com/openstack-k8s-operators/gitops/components/utilities/approve-installplan?ref=v0.3.0 # once that tag includes this component (same pattern as other example overlays). - ../../components/utilities/approve-installplan From bcf64479586231919dfffc41a64dada4f69e482a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Thu, 18 Jun 2026 14:29:12 +0200 Subject: [PATCH 2/2] chore(helm): bump rhoso-apps chart and targetRevision to v0.3.0 Updated the helm chart version from 0.1.0 to 0.3.0 and bumped all targetRevision values in the default values.yaml to match the v0.3.0 release. This ensures all ArgoCD applications reference the correct version of the gitops repository components. Changes: - Chart.yaml: version 0.1.0 -> 0.3.0 - values.yaml: all targetRevision fields v0.1.0 -> v0.3.0 (7 applications) Co-authored-by: Claude Sonnet 4.5 (claude-sonnet-4-5@20250929) Co-Authored-By: Claude Sonnet 4.5 --- charts/rhoso-apps/Chart.yaml | 2 +- charts/rhoso-apps/tests/application_test.yaml | 2 +- charts/rhoso-apps/values.yaml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/rhoso-apps/Chart.yaml b/charts/rhoso-apps/Chart.yaml index 814cf8a..2b37cce 100644 --- a/charts/rhoso-apps/Chart.yaml +++ b/charts/rhoso-apps/Chart.yaml @@ -7,7 +7,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.3.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/rhoso-apps/tests/application_test.yaml b/charts/rhoso-apps/tests/application_test.yaml index 6a39dfb..c2bfa75 100644 --- a/charts/rhoso-apps/tests/application_test.yaml +++ b/charts/rhoso-apps/tests/application_test.yaml @@ -41,7 +41,7 @@ tests: value: example/controlplane - equal: path: spec.source.targetRevision - value: v0.1.0 + value: v0.3.0 - equal: path: spec.destination.server value: https://kubernetes.default.svc diff --git a/charts/rhoso-apps/values.yaml b/charts/rhoso-apps/values.yaml index f9a1739..76418e3 100644 --- a/charts/rhoso-apps/values.yaml +++ b/charts/rhoso-apps/values.yaml @@ -14,7 +14,7 @@ applications: syncOptions: - Prune=true syncWave: "-20" - targetRevision: v0.1.0 + targetRevision: v0.3.0 # Deploy openstack-operator. # This covers "Deploying RHOSO - chapter 1" # https://docs.redhat.com/en/documentation/red_hat_openstack_services_on_openshift/18.0/html/deploying_red_hat_openstack_services_on_openshift/assembly_installing-and-preparing-the-openstack-operator @@ -25,7 +25,7 @@ applications: syncOptions: - Prune=true syncWave: "-20" - targetRevision: v0.1.0 + targetRevision: v0.3.0 # Create the main OpenStack Custom Resource. # This covers "Deploying RHOSO - chapter 1" # https://docs.redhat.com/en/documentation/red_hat_openstack_services_on_openshift/18.0/html/deploying_red_hat_openstack_services_on_openshift/assembly_installing-and-preparing-the-openstack-operator @@ -36,7 +36,7 @@ applications: syncOptions: - Prune=true syncWave: "-15" - targetRevision: v0.1.0 + targetRevision: v0.3.0 # Create cluster secrets by syncing from the secure backend (placeholder path). # Runs after operator-dependencies provides vault-secrets-operator or external-secrets-operator. # This covers "Deploying RHOSO - chapter 2.3" @@ -48,7 +48,7 @@ applications: syncOptions: - Prune=true syncWave: "-10" - targetRevision: v0.1.0 + targetRevision: v0.3.0 # Create underlying networks for controlplane and dataplane. # Covers "Deploying RHOSO - chapter 3" # https://docs.redhat.com/en/documentation/red_hat_openstack_services_on_openshift/18.0/html/deploying_red_hat_openstack_services_on_openshift/assembly_preparing-rhoso-networks_preparing @@ -59,7 +59,7 @@ applications: syncOptions: - Prune=true syncWave: "0" - targetRevision: v0.1.0 + targetRevision: v0.3.0 # Deploy and configure OpenStackControlPlane resource. # Covers "Deploying RHOSO - chapter 4" # https://docs.redhat.com/en/documentation/red_hat_openstack_services_on_openshift/18.0/html/deploying_red_hat_openstack_services_on_openshift/assembly_creating-the-control-plane @@ -72,7 +72,7 @@ applications: syncOptions: - Prune=true syncWave: "10" - targetRevision: v0.1.0 + targetRevision: v0.3.0 # Deploy and configure OpenStackDataPlaneNodeSet and OpenStackDataPlaneDeployment resources. # Covers "Deploying RHOSO - chapter 5" # https://docs.redhat.com/en/documentation/red_hat_openstack_services_on_openshift/18.0/html/deploying_red_hat_openstack_services_on_openshift/assembly_creating-the-data-plane @@ -83,4 +83,4 @@ applications: syncOptions: - Prune=true syncWave: "20" - targetRevision: v0.1.0 + targetRevision: v0.3.0