diff --git a/chart/infra-server/Chart.yaml b/chart/infra-server/Chart.yaml index b97d79d16..a21c1af9e 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 + automationFlavorsVersion: 0.15.3 ocpCredentialsMode: Passthrough dependencies: - name: argo-workflows diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index ccc5cc341..644f65f3b 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -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. @@ -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. diff --git a/chart/infra-server/static/workflow-demo.yaml b/chart/infra-server/static/workflow-demo.yaml index 4c25b31b7..9b098e5e3 100644 --- a/chart/infra-server/static/workflow-demo.yaml +++ b/chart/infra-server/static/workflow-demo.yaml @@ -17,7 +17,6 @@ spec: - name: main-image - name: central-db-image - name: k8s-version - - name: enable-psps - name: gcp-region - name: gcp-zone @@ -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: diff --git a/chart/infra-server/static/workflow-qa-demo.yaml b/chart/infra-server/static/workflow-qa-demo.yaml index d765421ff..4a5681bb8 100644 --- a/chart/infra-server/static/workflow-qa-demo.yaml +++ b/chart/infra-server/static/workflow-qa-demo.yaml @@ -23,8 +23,6 @@ spec: value: "" - name: k8s-version value: "" - - name: enable-psps - value: "" - name: gcp-region value: "" - name: gcp-zone @@ -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: