Skip to content
Open
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: 4.11.1
automationFlavorsVersion: 0.15.3
automationFlavorsVersion: 0.15.2-1-gcd620d560b-snapshot
ocpCredentialsMode: Passthrough
dependencies:
- name: argo-workflows
Expand Down
5 changes: 5 additions & 0 deletions chart/infra-server/static/janitor-delete-openshift-4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions chart/infra-server/static/workflow-openshift-4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 14 additions & 0 deletions chart/infra-server/templates/openshift-4/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Loading