Skip to content

Commit

Permalink
feat: add SSD StorageClass parameter to os-4 (#1184)
Browse files Browse the repository at this point in the history
Co-authored-by: Tom Martensen <tmartens@redhat.com>
  • Loading branch information
BradLugo and tommartensen authored Mar 6, 2024
1 parent c04c85d commit c864623
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 7 deletions.
15 changes: 15 additions & 0 deletions chart/infra-server/static/flavors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,11 @@
Consult OCP documentation for details. {{ .Chart.Annotations.ocpCredentialsMode }} is the value used by
stackrox CI.
- name: ssd-storage-class
description: Ensure an SSD StorageClass is the default StorageClass for the cluster
value: false
kind: optional

artifacts:
- name: kubeconfig
description: Kube config for connecting to this cluster
Expand Down Expand Up @@ -507,6 +512,11 @@
value: us-east1
kind: optional

- name: ssd-storage-class
description: Ensure an SSD StorageClass is the default StorageClass for the cluster
value: false
kind: optional

artifacts:
- name: admin-password
description: Admin password for StackRox console
Expand Down Expand Up @@ -631,6 +641,11 @@
Consult OCP documentation for details. {{ .Chart.Annotations.ocpCredentialsMode }} is the value used by
stackrox CI.
- name: ssd-storage-class
description: Ensure an SSD StorageClass is the default StorageClass for the cluster
value: false
kind: optional

artifacts:
- name: kubeconfig
description: Kube config for connecting to this cluster
Expand Down
9 changes: 6 additions & 3 deletions chart/infra-server/static/workflow-openshift-4-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ spec:
- name: trusted-certs-enabled
- name: credentials-mode
- name: region
- name: ssd-storage-class
volumeClaimTemplates:
- metadata:
name: data
Expand Down Expand Up @@ -78,7 +79,7 @@ spec:

- name: create
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.7
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0
imagePullPolicy: Always
volumeMounts:
- name: data
Expand Down Expand Up @@ -118,6 +119,8 @@ spec:
value: "{{workflow.parameters.trusted-certs-enabled}}"
- name: CREDENTIALS_MODE
value: "{{workflow.parameters.credentials-mode}}"
- name: SSD_STORAGE_CLASS
value: "{{workflow.parameters.ssd-storage-class}}"

- name: pre-install
script:
Expand Down Expand Up @@ -152,7 +155,7 @@ spec:
- name: roxctl-secured-cluster-services
path: /usr/bin/roxctl-secured-cluster-services
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-0.9.13
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-0.10.0
imagePullPolicy: Always
command:
- ansible-playbook
Expand Down Expand Up @@ -260,7 +263,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.7
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0
imagePullPolicy: Always
command:
- entrypoint.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spec:
- name: fips-enabled
- name: trusted-certs-enabled
- name: credentials-mode
- name: ssd-storage-class
volumeClaimTemplates:
- metadata:
name: data
Expand Down Expand Up @@ -80,7 +81,7 @@ spec:
archive:
tar: {}
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.7
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0
imagePullPolicy: Always
command:
- entrypoint.sh
Expand Down Expand Up @@ -121,6 +122,8 @@ spec:
value: "{{workflow.parameters.trusted-certs-enabled}}"
- name: CREDENTIALS_MODE
value: "{{workflow.parameters.credentials-mode}}"
- name: SSD_STORAGE_CLASS
value: "{{workflow.parameters.ssd-storage-class}}"
volumeMounts:
- name: data
mountPath: /data
Expand Down Expand Up @@ -158,7 +161,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.7
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0
imagePullPolicy: Always
command:
- entrypoint.sh
Expand Down
7 changes: 5 additions & 2 deletions chart/infra-server/static/workflow-openshift-4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spec:
- name: fips-enabled
- name: trusted-certs-enabled
- name: credentials-mode
- name: ssd-storage-class
volumeClaimTemplates:
- metadata:
name: data
Expand Down Expand Up @@ -80,7 +81,7 @@ spec:
archive:
tar: {}
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.9.19
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0
imagePullPolicy: Always
command:
- entrypoint.sh
Expand Down Expand Up @@ -121,6 +122,8 @@ spec:
value: "{{workflow.parameters.trusted-certs-enabled}}"
- name: CREDENTIALS_MODE
value: "{{workflow.parameters.credentials-mode}}"
- name: SSD_STORAGE_CLASS
value: "{{workflow.parameters.ssd-storage-class}}"
volumeMounts:
- name: data
mountPath: /data
Expand Down Expand Up @@ -158,7 +161,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.9.19
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0
imagePullPolicy: Always
command:
- entrypoint.sh
Expand Down

0 comments on commit c864623

Please sign in to comment.