From b4241eed70bd414581df0610d010d15002dfa870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Mon, 1 Jun 2026 14:46:28 +0200 Subject: [PATCH] feat: support ocp capabilities --- chart/infra-server/Chart.yaml | 2 +- chart/infra-server/static/flavors.yaml | 45 +++++++++++++++++++ .../static/workflow-openshift-4-demo.yaml | 8 ++++ .../static/workflow-openshift-4.yaml | 8 ++++ 4 files changed, 62 insertions(+), 1 deletion(-) diff --git a/chart/infra-server/Chart.yaml b/chart/infra-server/Chart.yaml index 7d8297394..9769b01d0 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.10.2 - automationFlavorsVersion: 0.13.0 + automationFlavorsVersion: 0.13.0-1-g117d03a38b-snapshot ocpCredentialsMode: Passthrough dependencies: - name: argo-workflows diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index f05661e96..84db1829f 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -314,6 +314,21 @@ value: true kind: optional + - name: baseline-capability-set + description: Baseline capability set + value: "vCurrent" + kind: optional + help: | + Defines a baseline set of capabilities to install. Valid values are `None`, `vCurrent` and `v4.x`. If you select `None`, all optional capabilities are disabled. The default value is `vCurrent`, which enables all optional capabilities. + + - name: additional-enabled-capabilities + description: Additional capabilities to enable + value: "" + kind: optional + help: | + 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"]` + artifacts: - name: kubeconfig description: Kube config for connecting to this cluster @@ -465,6 +480,21 @@ value: true kind: optional + - name: baseline-capability-set + description: Baseline capability set + value: "vCurrent" + kind: optional + help: | + Defines a baseline set of capabilities to install. Valid values are `None`, `vCurrent` and `v4.x`. If you select `None`, all optional capabilities are disabled. The default value is `vCurrent`, which enables all optional capabilities. + + - name: additional-enabled-capabilities + description: Additional capabilities to enable + value: "" + kind: optional + help: | + 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"]` + artifacts: - name: admin-password description: Admin password for StackRox console @@ -606,6 +636,21 @@ value: true kind: optional + - name: baseline-capability-set + description: Baseline capability set + value: "vCurrent" + kind: optional + help: | + Defines a baseline set of capabilities to install. Valid values are `None`, `vCurrent` and `v4.x`. If you select `None`, all optional capabilities are disabled. The default value is `vCurrent`, which enables all optional capabilities. + + - name: additional-enabled-capabilities + description: Additional capabilities to enable + value: "" + kind: optional + help: | + 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"]` + artifacts: - name: kubeconfig description: Kube config for connecting to this cluster diff --git a/chart/infra-server/static/workflow-openshift-4-demo.yaml b/chart/infra-server/static/workflow-openshift-4-demo.yaml index 76181b3f2..12af5a752 100644 --- a/chart/infra-server/static/workflow-openshift-4-demo.yaml +++ b/chart/infra-server/static/workflow-openshift-4-demo.yaml @@ -22,6 +22,10 @@ spec: - name: credentials-mode - name: region - name: ssd-storage-class + - name: baseline-capability-set + value: "vCurrent" + - name: additional-enabled-capabilities + value: "" volumeClaimTemplates: - metadata: name: data @@ -124,6 +128,10 @@ spec: value: '{{ "{{" }}workflow.parameters.credentials-mode{{ "}}" }}' - name: SSD_STORAGE_CLASS value: '{{ "{{" }}workflow.parameters.ssd-storage-class{{ "}}" }}' + - name: BASELINE_CAPABILITY_SET + value: '{{ "{{" }}workflow.parameters.baseline-capability-set{{ "}}" }}' + - name: ADDITIONAL_ENABLED_CAPABILITIES + value: '{{ "{{" }}workflow.parameters.additional-enabled-capabilities{{ "}}" }}' - name: pre-install script: diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index 94e1594cd..5290c3d85 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -28,6 +28,10 @@ spec: - name: credentials-mode - name: keep-failed-cluster - name: ssd-storage-class + - name: baseline-capability-set + value: "vCurrent" + - name: additional-enabled-capabilities + value: "" volumeClaimTemplates: - metadata: name: data @@ -143,6 +147,10 @@ spec: value: '{{ "{{" }}workflow.parameters.keep-failed-cluster{{ "}}" }}' - name: SSD_STORAGE_CLASS value: '{{ "{{" }}workflow.parameters.ssd-storage-class{{ "}}" }}' + - name: BASELINE_CAPABILITY_SET + value: '{{ "{{" }}workflow.parameters.baseline-capability-set{{ "}}" }}' + - name: ADDITIONAL_ENABLED_CAPABILITIES + value: '{{ "{{" }}workflow.parameters.additional-enabled-capabilities{{ "}}" }}' volumeMounts: - name: data mountPath: /data