From e9ee222a162c4e0725102d1931a2e55e5111b290 Mon Sep 17 00:00:00 2001 From: stehessel Date: Thu, 16 Jul 2026 13:18:42 +0000 Subject: [PATCH 1/3] Bump automation flavors version for 9836514bf60caf3ee84711824d34e381a90cf256 --- chart/infra-server/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/infra-server/Chart.yaml b/chart/infra-server/Chart.yaml index a21c1af9e..612c378cf 100644 --- a/chart/infra-server/Chart.yaml +++ b/chart/infra-server/Chart.yaml @@ -8,7 +8,7 @@ sources: - https://github.com/stackrox/infra annotations: acsDemoVersion: 4.11.1 - automationFlavorsVersion: 0.15.3 + automationFlavorsVersion: 0.15.2-1-g9836514bf6-snapshot ocpCredentialsMode: Passthrough dependencies: - name: argo-workflows From 42787393aeef3385e0699255916ac1a3f7f85c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Thu, 16 Jul 2026 19:21:08 +0200 Subject: [PATCH 2/3] pass ocm token as secret --- .../static/janitor-delete-openshift-4.yaml | 5 +++++ .../infra-server/static/workflow-openshift-4.yaml | 5 +++++ .../templates/openshift-4/secrets.yaml | 14 ++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/chart/infra-server/static/janitor-delete-openshift-4.yaml b/chart/infra-server/static/janitor-delete-openshift-4.yaml index c0cc3370d..f856608ce 100644 --- a/chart/infra-server/static/janitor-delete-openshift-4.yaml +++ b/chart/infra-server/static/janitor-delete-openshift-4.yaml @@ -42,6 +42,11 @@ spec: secretKeyRef: name: openshift-4-gcp-service-account key: google-credentials.json + - name: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN + valueFrom: + secretKeyRef: + name: openshift-cluster-manager-token + key: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN - name: GCP_PROJECT value : "acs-team-temp-dev" volumeMounts: diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index a0430fce5..c1f64acd8 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -207,6 +207,11 @@ spec: secretKeyRef: name: openshift-4-gcp-service-account key: google-credentials.json + - name: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN + valueFrom: + secretKeyRef: + name: openshift-cluster-manager-token + key: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN - name: GCP_PROJECT value : "acs-team-temp-dev" volumeMounts: diff --git a/chart/infra-server/templates/openshift-4/secrets.yaml b/chart/infra-server/templates/openshift-4/secrets.yaml index 3fe49ca72..88f9f4a67 100644 --- a/chart/infra-server/templates/openshift-4/secrets.yaml +++ b/chart/infra-server/templates/openshift-4/secrets.yaml @@ -43,3 +43,17 @@ metadata: data: REDHAT_PULL_SECRET: |- {{ required ".Values.openshift_4__redhat_pull_secret_json is undefined" .Values.openshift_4__redhat_pull_secret_json }} + +--- + +apiVersion: v1 +kind: Secret +type: Opaque + +metadata: + name: openshift-cluster-manager-token + namespace: default + +data: + OPENSHIFT_CLUSTER_MANAGER_API_TOKEN: |- + {{ .Values.osdClusterManager.openshiftClusterManagerApiToken | b64enc }} From c1839bdf572d7cf5cd2c390889fa1b664a00cba8 Mon Sep 17 00:00:00 2001 From: stehessel Date: Thu, 16 Jul 2026 21:40:44 +0000 Subject: [PATCH 3/3] Bump automation flavors version for cd620d560baaf5e8deef87e7a0f929fbce71e79c --- chart/infra-server/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/infra-server/Chart.yaml b/chart/infra-server/Chart.yaml index 612c378cf..51823006e 100644 --- a/chart/infra-server/Chart.yaml +++ b/chart/infra-server/Chart.yaml @@ -8,7 +8,7 @@ sources: - https://github.com/stackrox/infra annotations: acsDemoVersion: 4.11.1 - automationFlavorsVersion: 0.15.2-1-g9836514bf6-snapshot + automationFlavorsVersion: 0.15.2-1-gcd620d560b-snapshot ocpCredentialsMode: Passthrough dependencies: - name: argo-workflows