diff --git a/chart/infra-server/Chart.yaml b/chart/infra-server/Chart.yaml index ee8630f95..4d060b2fe 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: 5.0.0 - automationFlavorsVersion: 0.17.3 + automationFlavorsVersion: 0.18.0 ocpCredentialsMode: Passthrough dependencies: - name: argo-workflows diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index e759687bc..c0b57895b 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -333,6 +333,23 @@ Defines a list of capabilities to explicitly enable. These capabilities are enabled in addition to the capabilities specified in the baseline capability set. Example: `["DeploymentConfig", "ImageRegistry"]` + - name: feature-gates + description: OpenShift feature gates + value: "" + kind: optional + help: | + YAML flow list of feature gate settings, e.g., `["TLSGroupPreferences=true", "TLSAdherence=true"]`. + Setting this selects `CustomNoUpgrade`, which prevents cluster upgrades. + + - name: extra-manifest + description: Extra installation manifest + value: "" + kind: optional + fromFile: true + help: | + Upload a single YAML manifest to include during installation. + For the CLI, pass the file contents with `--arg "extra-manifest=$(cat manifest.yaml)"`. + - name: vm-os description: Guest OS list for optional VMs (empty skips virt) value: "" @@ -730,6 +747,14 @@ Defines a list of capabilities to explicitly enable. These capabilities are enabled in addition to the capabilities specified in the baseline capability set. Example: `["DeploymentConfig", "ImageRegistry"]` + - name: feature-gates + value: "" + kind: hardcoded + + - name: extra-manifest + value: "" + kind: hardcoded + - name: vm-os description: Guest OS list for optional VMs (empty skips virt) value: "" diff --git a/chart/infra-server/static/janitor-delete-openshift-4.yaml b/chart/infra-server/static/janitor-delete-openshift-4.yaml index c0cc3370d..899445ad3 100644 --- a/chart/infra-server/static/janitor-delete-openshift-4.yaml +++ b/chart/infra-server/static/janitor-delete-openshift-4.yaml @@ -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 diff --git a/chart/infra-server/static/workflow-openshift-4-demo.yaml b/chart/infra-server/static/workflow-openshift-4-demo.yaml index 1a658809a..1551171eb 100644 --- a/chart/infra-server/static/workflow-openshift-4-demo.yaml +++ b/chart/infra-server/static/workflow-openshift-4-demo.yaml @@ -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 @@ -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 diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index 74866f881..2544fef7a 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -34,6 +34,10 @@ spec: value: "vCurrent" - name: additional-enabled-capabilities value: "" + - name: feature-gates + value: "" + - name: extra-manifest + value: "" - name: vm-os value: "" volumeClaimTemplates: @@ -102,7 +106,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 @@ -167,6 +171,10 @@ spec: value: '{{ "{{" }}workflow.parameters.baseline-capability-set{{ "}}" }}' - name: ADDITIONAL_ENABLED_CAPABILITIES value: '{{ "{{" }}workflow.parameters.additional-enabled-capabilities{{ "}}" }}' + - name: FEATURE_GATES + value: '{{ "{{" }}workflow.parameters.feature-gates{{ "}}" }}' + - name: EXTRA_MANIFEST + value: '{{ "{{" }}workflow.parameters.extra-manifest{{ "}}" }}' - name: VM_OS value: '{{ "{{" }}workflow.parameters.vm-os{{ "}}" }}' volumeMounts: @@ -209,7 +217,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