Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chart/infra-server/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sources:
- https://github.com/stackrox/infra
annotations:
acsDemoVersion: 5.0.0
automationFlavorsVersion: 0.17.3
automationFlavorsVersion: 0.17.6
ocpCredentialsMode: Passthrough
dependencies:
- name: argo-workflows
Expand Down
40 changes: 22 additions & 18 deletions chart/infra-server/static/flavors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,17 @@
description: Instructions for obtaining SSH access to instances in your cluster

####################
# openshift-4 #
# openshift-ipi #
####################
- id: openshift-4
name: OpenShift 4.x
description: OpenShift 4.x OCP or OKD cluster
- id: openshift-ipi
name: OpenShift IPI
description: OpenShift OCP or OKD cluster
availability: stable
workflow: configuration/workflow-openshift-4.yaml
workflow: configuration/workflow-openshift-ipi.yaml
aliases:
- ocp-4
- openshift-4
- ocp
parameters:
- name: name
description: cluster name
Expand Down Expand Up @@ -379,15 +381,16 @@
description: SSH credentials for optional VMs (present when vm-os is non-empty)

######################
# openshift-4-demo #
# openshift-ipi-demo #
######################
- id: openshift-4-demo
name: OpenShift 4.x Demo
description: OpenShift 4.x Demo
- id: openshift-ipi-demo
name: OpenShift IPI Demo
description: OpenShift IPI Demo
availability: stable
workflow: configuration/workflow-openshift-4-demo.yaml
workflow: configuration/workflow-openshift-ipi-demo.yaml
aliases:
- ocp-4-demo
- openshift-4-demo
parameters:
- name: name
description: cluster name
Expand Down Expand Up @@ -593,15 +596,16 @@
description: The password to login at the openshift console

############################
# openshift-4-perf-scale #
# openshift-ipi-perf-scale #
############################
- id: openshift-4-perf-scale
name: OpenShift 4.x Perf&Scale
description: OpenShift 4.x Perf&Scale
- id: openshift-ipi-perf-scale
name: OpenShift IPI Perf&Scale
description: OpenShift IPI Perf&Scale
availability: stable
workflow: configuration/workflow-openshift-4.yaml
workflow: configuration/workflow-openshift-ipi.yaml
aliases:
- ocp-4-perf-scale
- openshift-4-perf-scale
parameters:
- name: name
description: cluster name
Expand Down Expand Up @@ -1269,11 +1273,11 @@
description: Google Cloud zone to delete infrastructure from.
value: us-central1-a

- id: janitor-delete-openshift-4
- id: janitor-delete-openshift-ipi
name: Janitor delete Openshift
description: Flavor to delete Openshift 4 clusters
description: Flavor to delete Openshift IPI clusters
availability: janitorDelete
workflow: configuration/janitor-delete-openshift-4.yaml
workflow: configuration/janitor-delete-openshift-ipi.yaml
parameters:
- name: name
description: cluster name
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: argoproj.io/v1alpha1
kind: Workflow
metadata:
generateName: janitor-delete-openshift-4-
generateName: janitor-delete-openshift-ipi-
spec:
entrypoint: delete
arguments:
Expand All @@ -18,7 +18,7 @@ spec:
volumes:
- name: credentials
secret:
secretName: openshift-4-gcp-service-account
secretName: openshift-ipi-gcp-service-account

templates:
- name: delete
Expand All @@ -29,7 +29,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-ipi-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
command:
- entrypoint.sh
Expand All @@ -40,7 +40,7 @@ spec:
- name: GOOGLE_CREDENTIALS
valueFrom:
secretKeyRef:
name: openshift-4-gcp-service-account
name: openshift-ipi-gcp-service-account
key: google-credentials.json
- name: GCP_PROJECT
value : "acs-team-temp-dev"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: argoproj.io/v1alpha1
kind: Workflow
metadata:
generateName: openshift-4-demo-
generateName: openshift-ipi-demo-
spec:
entrypoint: start
onExit: stop
Expand Down Expand Up @@ -44,7 +44,7 @@ spec:
volumes:
- name: credentials
secret:
secretName: openshift-4-gcp-service-account
secretName: openshift-ipi-gcp-service-account
- name: demo-secrets
secret:
secretName: demo-secrets
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:

- name: create
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-ipi-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
volumeMounts:
- name: data
Expand All @@ -95,7 +95,7 @@ spec:
- name: GOOGLE_CREDENTIALS
valueFrom:
secretKeyRef:
name: openshift-4-gcp-service-account
name: openshift-ipi-gcp-service-account
key: google-credentials.json
- name: GCP_PROJECT
value : "acs-team-temp-dev"
Expand Down Expand Up @@ -154,7 +154,7 @@ spec:
parameters:
- name: kubeconfig-base64
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-ipi-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
command:
- ansible-playbook
Expand All @@ -173,7 +173,7 @@ spec:
- name: GOOGLE_CREDENTIALS
valueFrom:
secretKeyRef:
name: openshift-4-gcp-service-account
name: openshift-ipi-gcp-service-account
key: google-credentials.json
- name: CENTRAL_PORT
value: "443"
Expand Down Expand Up @@ -273,7 +273,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-ipi-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
command:
- entrypoint.sh
Expand All @@ -284,11 +284,10 @@ spec:
- name: GOOGLE_CREDENTIALS
valueFrom:
secretKeyRef:
name: openshift-4-gcp-service-account
name: openshift-ipi-gcp-service-account
key: google-credentials.json
- name: GCP_PROJECT
value : "acs-team-temp-dev"
volumeMounts:
- name: data
mountPath: /data

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: argoproj.io/v1alpha1
kind: Workflow
metadata:
generateName: openshift-4-
generateName: openshift-ipi-
spec:
entrypoint: start
onExit: stop
Expand Down Expand Up @@ -47,7 +47,7 @@ spec:
volumes:
- name: credentials
secret:
secretName: openshift-4-gcp-service-account
secretName: openshift-ipi-gcp-service-account
- name: registry-pull-secret
secret:
secretName: infra-image-registry-pull-secret
Expand Down Expand Up @@ -102,7 +102,7 @@ spec:
archive:
none: {}
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-ipi-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
command:
- entrypoint.sh
Expand All @@ -114,7 +114,7 @@ spec:
- name: GOOGLE_CREDENTIALS
valueFrom:
secretKeyRef:
name: openshift-4-gcp-service-account
name: openshift-ipi-gcp-service-account
key: google-credentials.json
- name: GCP_PROJECT
value : "acs-team-temp-dev"
Expand Down Expand Up @@ -209,7 +209,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-ipi-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
command:
- entrypoint.sh
Expand All @@ -220,7 +220,7 @@ spec:
- name: GOOGLE_CREDENTIALS
valueFrom:
secretKeyRef:
name: openshift-4-gcp-service-account
name: openshift-ipi-gcp-service-account
key: google-credentials.json
- name: GCP_PROJECT
value : "acs-team-temp-dev"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,30 @@ kind: Secret
type: Opaque
Comment thread
tommartensen marked this conversation as resolved.
Resolved

metadata:
name: openshift-4-gcp-service-account
name: openshift-ipi-gcp-service-account
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
namespace: default

data:
google-credentials.json: |-
{{ required ".Values.openshift_4__gcp_service_account_key_json is undefined" .Values.openshift_4__gcp_service_account_key_json }}


---

# (deprecated) this secret is used for openshift-4 provisioning with
# stackrox.com GCP and can be removed once the migration away from that account
# and its projects are complete. In the meantime this must remain to facilitate
# drain and rollback if required.
# (deprecated) this secret was renamed to openshift-ipi-gcp-service-account.
# Workflows created before the rename reference the old name in their stored
# specs and can remain suspended at their wait step across the upgrade; without
# this secret their destroy step cannot run. It can be removed once no
# workflows created before the rename are left.
apiVersion: v1
kind: Secret
type: Opaque

metadata:
name: google-credentials-openshift-4
name: openshift-4-gcp-service-account
namespace: default

data:
google-credentials.json: |-
{{ required ".Values.openshift_4__google_credentials_json is undefined" .Values.openshift_4__google_credentials_json }}

@tommartensen tommartensen Nov 19, 2026 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this value from secrets + SA after merge


{{ required ".Values.openshift_4__gcp_service_account_key_json is undefined" .Values.openshift_4__gcp_service_account_key_json }}

---

Expand Down
11 changes: 0 additions & 11 deletions chart/infra-server/templates/openshift/secrets.yaml

This file was deleted.

12 changes: 6 additions & 6 deletions chart/infra-server/templates/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ data:
workflow-qa-demo.yaml: |-
{{- tpl (.Files.Get "static/workflow-qa-demo.yaml" ) . | b64enc | nindent 4 }}

workflow-openshift-4.yaml: |-
{{- tpl (.Files.Get "static/workflow-openshift-4.yaml" ) . | b64enc | nindent 4 }}
workflow-openshift-ipi.yaml: |-
{{- tpl (.Files.Get "static/workflow-openshift-ipi.yaml" ) . | b64enc | nindent 4 }}

workflow-openshift-4-demo.yaml: |-
{{- tpl (.Files.Get "static/workflow-openshift-4-demo.yaml" ) . | b64enc | nindent 4 }}
workflow-openshift-ipi-demo.yaml: |-
{{- tpl (.Files.Get "static/workflow-openshift-ipi-demo.yaml" ) . | b64enc | nindent 4 }}

workflow-eks.yaml: |-
{{- tpl (.Files.Get "static/workflow-eks.yaml" ) . | b64enc | nindent 4 }}
Expand Down Expand Up @@ -74,8 +74,8 @@ data:
janitor-delete-gke-default.yaml: |-
{{- tpl (.Files.Get "static/janitor-delete-gke-default.yaml" ) . | b64enc | nindent 4 }}

janitor-delete-openshift-4.yaml: |-
{{- tpl (.Files.Get "static/janitor-delete-openshift-4.yaml" ) . | b64enc | nindent 4 }}
janitor-delete-openshift-ipi.yaml: |-
{{- tpl (.Files.Get "static/janitor-delete-openshift-ipi.yaml" ) . | b64enc | nindent 4 }}

janitor-delete-openshift-rosa.yaml: |-
{{- tpl (.Files.Get "static/janitor-delete-openshift-rosa.yaml" ) . | b64enc | nindent 4 }}
Expand Down
10 changes: 8 additions & 2 deletions cmd/infractl/janitor/find/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,16 @@ var (
"test-simulate", // for e2e tests
"gke-default",
"demo",
"openshift-4",
"openshift-4-demo",
"openshift-ipi",
"openshift-ipi-demo",
Comment thread
tommartensen marked this conversation as resolved.
Resolved
"osd-on-gcp",
"qa-demo",
"openshift-ipi-perf-scale",
// Legacy IDs from before the rename to openshift-ipi; clusters created
// before the rename keep these as their flavor. Remove once no
// pre-rename clusters are left.
"openshift-4",
"openshift-4-demo",
"openshift-4-perf-scale",
"openshift-multi",
}
Expand Down
6 changes: 3 additions & 3 deletions scripts/cost-estimation/render_costs.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"demo": 33,
"gke-default": 10,
"ibmroks": 56,
"openshift-4": 29,
"openshift-4-demo": 53,
"openshift-4-perf-scale": 70,
"openshift-ipi": 29,
"openshift-ipi-demo": 53,
"openshift-ipi-perf-scale": 70,
"openshift-multi": 10,
"osd-on-gcp": 35,
"qa-demo": 33,
Expand Down
Loading