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: 4.11.1
automationFlavorsVersion: 0.15.2
automationFlavorsVersion: 0.15.3
ocpCredentialsMode: Passthrough
dependencies:
- name: argo-workflows
Expand Down
10 changes: 0 additions & 10 deletions chart/infra-server/static/flavors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
value: default
kind: hardcoded

- name: enable-psps
value: "false"
kind: hardcoded

- name: gcp-region
description: GCP region
help: GCP region to deploy infrastructure into.
Expand Down Expand Up @@ -100,12 +96,6 @@
value: default
kind: optional

- name: enable-psps
description: Enable PodSecurityPolicy generation
value: "false"
kind: optional
help: PSPs were removed from K8s >=1.25. Enabling PSP generation on newer K8s versions will fail the deployment.

- name: gcp-region
description: GCP region
help: GCP region to deploy infrastructure into.
Expand Down
2 changes: 0 additions & 2 deletions chart/infra-server/static/workflow-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
- name: main-image
- name: central-db-image
- name: k8s-version
- name: enable-psps
- name: gcp-region
- name: gcp-zone

Expand Down Expand Up @@ -133,7 +132,6 @@ spec:
- --dns-gcp-project=acs-team-temp-dev
- --creation-source=infra
- --k8s-version={{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}
- --enable-psps={{ "{{" }}workflow.parameters.enable-psps{{ "}}" }}
- --gcp-region={{ "{{" }}workflow.parameters.gcp-region{{ "}}" }}
- --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
volumeMounts:
Expand Down
3 changes: 0 additions & 3 deletions chart/infra-server/static/workflow-qa-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ spec:
value: ""
- name: k8s-version
value: ""
- name: enable-psps
value: ""
- name: gcp-region
value: ""
- name: gcp-zone
Expand Down Expand Up @@ -141,7 +139,6 @@ spec:
- --dns-gcp-project=acs-team-temp-dev
- --creation-source=infra
- --k8s-version={{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}
- --enable-psps={{ "{{" }}workflow.parameters.enable-psps{{ "}}" }}
- --gcp-region={{ "{{" }}workflow.parameters.gcp-region{{ "}}" }}
- --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
volumeMounts:
Expand Down
Loading