ROX-35433: Replace Helm install with roxie in openshift-4-demo

chart/infra-server/Chart.yaml

@@ -8,7 +8,7 @@ sources:
   - https://github.com/stackrox/infra
 annotations:
   acsDemoVersion: 4.11.2
-  automationFlavorsVersion: 0.15.5
+  automationFlavorsVersion: 0.16.0-2-g65a204651e-snapshot
   ocpCredentialsMode: Passthrough
 dependencies:
   - name: argo-workflows

chart/infra-server/static/flavors.yaml

@@ -379,18 +379,16 @@
       value: example1
 
     - name: central-services-helm-chart-version
-      description: Central Services Helm chart version
+      description: Central Services version
       value: {{ .Chart.Annotations.acsDemoVersion }}
-      kind: optional
       help: |
-        Version string of the roxctl version to use to generate Central Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
+        ACS version to deploy for Central Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
 
     - name: secured-cluster-services-helm-chart-version
-      description: Secured Cluster Services Helm chart version
+      description: Secured Cluster Services version
       value: {{ .Chart.Annotations.acsDemoVersion }}
-      kind: optional
       help: |
-        Version string of the roxctl version to use to generate Secured Cluster Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
+        ACS version to deploy for Secured Cluster Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
 
     - name: openshift-version
       description: openshift release from OCP, OCP dev preview, or OKD
@@ -421,45 +419,79 @@
       value: ""
       kind: optional
       help: |
-        URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Default will be
-        derived from the Helm chart. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
+        URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Defaults to
+        quay.io/stackrox-io. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
         quay.io/rhacs-eng and all publicly accessible images.
 
     - name: main-image-tag
       description: Main container image tag
       value: ""
       kind: optional
       help: |
-        Version string of the main container image tag. Default will be derived from the Helm chart.
+        Version string of the main container image tag.
 
     - name: scanner-image-tag
       description: Scanner container image tag
       value: ""
       kind: optional
       help: |
-        Version string of the scanner container image tag to use. Default will be derived from the Helm chart.
+        Version string of the scanner container image tag.
 
     - name: scanner-db-image-tag
       description: Scanner DB container image tag
       value: ""
       kind: optional
       help: |
-        Version string of the scanner-db container image tag to use. Default will be derived from the Helm chart.
+        Version string of the scanner-db container image tag.
+
+    - name: scanner-slim-image-tag
+      description: Scanner Slim container image tag
+      value: ""
+      kind: optional
+      help: |
+        Version string of the scanner-slim container image tag.
 
-    - name: collector-slim-image-tag
-      description: Collector Slim container image tag
+    - name: scanner-db-slim-image-tag
+      description: Scanner DB Slim container image tag
       value: ""
       kind: optional
       help: |
-        Version string of the collector-slim container image tag to use. Default will be derived from the Helm chart.
+        Version string of the scanner-db-slim container image tag.
+
+    - name: collector-image-tag
+      description: Collector container image tag
+      value: ""
+      kind: optional
+      help: |
+        Version string of the collector container image tag.
 
     - name: central-db-image-tag
       description: Central DB container image tag
       value: ""
       kind: optional
       help: |
-        Version string of the central-db container image tag to use. Setting this value will enable central-db.
-        Default will be derived from the Helm chart.
+        Version string of the central-db container image tag.
+
+    - name: scanner-v4-image-tag
+      description: Scanner V4 container image tag
+      value: ""
+      kind: optional
+      help: |
+        Version string of the scanner-v4 container image tag.
+
+    - name: scanner-v4-db-image-tag
+      description: Scanner V4 DB container image tag
+      value: ""
+      kind: optional
+      help: |
+        Version string of the scanner-v4-db container image tag.
+
+    - name: fact-image-tag
+      description: Fact container image tag
+      value: ""
+      kind: optional
+      help: |
+        Version string of the fact container image tag.
 
     - name: trusted-certs-enabled
       description: Should trusted certificates be created

chart/infra-server/static/workflow-openshift-4-demo.yaml

@@ -14,8 +14,13 @@ spec:
       - name: main-image-tag
       - name: scanner-image-tag
       - name: scanner-db-image-tag
-      - name: collector-slim-image-tag
+      - name: scanner-slim-image-tag
+      - name: scanner-db-slim-image-tag
+      - name: collector-image-tag
       - name: central-db-image-tag
+      - name: scanner-v4-image-tag
+      - name: scanner-v4-db-image-tag
+      - name: fact-image-tag
       - name: central-services-helm-chart-version
       - name: secured-cluster-services-helm-chart-version
       - name: trusted-certs-enabled
@@ -53,27 +58,14 @@ spec:
         - - name: pre-install
             template: pre-install
 
-        - - name: roxctl-central
-            template: roxctl-central
-
-        - - name: roxctl-secured-cluster-services
-            template: roxctl-secured-cluster-services
-
         - - name: run-ansible-demo
             template: run-ansible-demo
             continueOn:
               failed: true
             arguments:
               parameters:
-              - name: admin-password
-                value: '{{ "{{" }}steps.pre-install.outputs.parameters.admin-password{{ "}}" }}'
               - name: kubeconfig-base64
                 value: '{{ "{{" }}steps.pre-install.outputs.parameters.kubeconfig-base64{{ "}}" }}'
-              artifacts:
-                - name: roxctl-central
-                  from: '{{ "{{" }}steps.roxctl-central.outputs.artifacts.roxctl-central{{ "}}" }}'
-                - name: roxctl-secured-cluster-services
-                  from: '{{ "{{" }}steps.roxctl-secured-cluster-services.outputs.artifacts.roxctl-secured-cluster-services{{ "}}" }}'
 
         - - name: gather
             template: gather
@@ -88,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-4-0.15.5
         imagePullPolicy: Always
         volumeMounts:
           - name: data
@@ -147,30 +139,20 @@ spec:
             mountPath: /data
         command: [sh]
         source: |
-          openssl rand -base64 32 | tr "+/" "_#"  | cut -c 1-20 > /data/admin_password
           base64 /data/auth/kubeconfig | tr -d "\n" > /data/auth/kubeconfig_base64
           subdomain=apps.{{ "{{" }}workflow.parameters.name{{ "}}" }}.ocp.infra.rox.systems
           echo "https://console-openshift-console.${subdomain}" > /data/url-openshift
           echo "https://central-stackrox.${subdomain}" > /data/url-stackrox
       outputs:
         parameters:
-          - name: admin-password
-            valueFrom:
-              path: /data/admin_password
           - name: kubeconfig-base64
             valueFrom:
               path: /data/auth/kubeconfig_base64
 
     - name: run-ansible-demo
       inputs:
         parameters:
-          - name: admin-password
           - name: kubeconfig-base64
-        artifacts:
-          - name: roxctl-central
-            path: /usr/bin/roxctl-central
-          - name: roxctl-secured-cluster-services
-            path: /usr/bin/roxctl-secured-cluster-services
       container:
         image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
         imagePullPolicy: Always
@@ -195,10 +177,6 @@ spec:
                 key: google-credentials.json
           - name: CENTRAL_PORT
             value: "443"
-          - name: ORCHESTRATOR
-            value: openshift
-          - name: ADMIN_PASSWORD
-            value: '{{ "{{" }}inputs.parameters.admin-password{{ "}}" }}'
           - name: KUBECONFIG_BASE64
             value: '{{ "{{" }}inputs.parameters.kubeconfig-base64{{ "}}" }}'
           - name: IMAGE_REGISTRY
@@ -209,10 +187,24 @@ spec:
             value: '{{ "{{" }}workflow.parameters.scanner-image-tag{{ "}}" }}'
           - name: SCANNER_DB_IMAGE_TAG
             value: '{{ "{{" }}workflow.parameters.scanner-db-image-tag{{ "}}" }}'
-          - name: COLLECTOR_SLIM_IMAGE_TAG
-            value: '{{ "{{" }}workflow.parameters.collector-slim-image-tag{{ "}}" }}'
+          - name: SCANNER_SLIM_IMAGE_TAG
+            value: '{{ "{{" }}workflow.parameters.scanner-slim-image-tag{{ "}}" }}'
+          - name: SCANNER_DB_SLIM_IMAGE_TAG
+            value: '{{ "{{" }}workflow.parameters.scanner-db-slim-image-tag{{ "}}" }}'
+          - name: COLLECTOR_IMAGE_TAG
+            value: '{{ "{{" }}workflow.parameters.collector-image-tag{{ "}}" }}'
           - name: CENTRAL_DB_IMAGE_TAG
             value: '{{ "{{" }}workflow.parameters.central-db-image-tag{{ "}}" }}'
+          - name: SCANNER_V4_IMAGE_TAG
+            value: '{{ "{{" }}workflow.parameters.scanner-v4-image-tag{{ "}}" }}'
+          - name: SCANNER_V4_DB_IMAGE_TAG
+            value: '{{ "{{" }}workflow.parameters.scanner-v4-db-image-tag{{ "}}" }}'
+          - name: FACT_IMAGE_TAG
+            value: '{{ "{{" }}workflow.parameters.fact-image-tag{{ "}}" }}'
+          - name: CENTRAL_SERVICES_VERSION
+            value: '{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
+          - name: SECURED_CLUSTER_SERVICES_VERSION
+            value: '{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
           - name: ANSIBLE_STDOUT_CALLBACK
             value: debug
         volumeMounts:
@@ -236,6 +228,7 @@ spec:
         artifacts:
           - name: admin-password
             path: /data/admin_password
+            optional: true
             archive:
               none: {}
           - name: kubeconfig
@@ -280,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-4-0.15.5
         imagePullPolicy: Always
         command:
           - entrypoint.sh
@@ -299,36 +292,3 @@ spec:
           - name: data
             mountPath: /data
 
-    - name: roxctl-central
-      activeDeadlineSeconds: 600
-      outputs:
-        artifacts:
-          - name: roxctl-central
-            path: /tmp/roxctl-central
-      container:
-        image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
-        imagePullPolicy: Always
-        command:
-          - cp
-        args:
-          - --dereference
-          - -v
-          - /stackrox/roxctl
-          - /tmp/roxctl-central
-
-    - name: roxctl-secured-cluster-services
-      activeDeadlineSeconds: 600
-      outputs:
-        artifacts:
-          - name: roxctl-secured-cluster-services
-            path: /tmp/roxctl-secured-cluster-services
-      container:
-        image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
-        imagePullPolicy: Always
-        command:
-          - cp
-        args:
-          - --dereference
-          - -v
-          - /stackrox/roxctl
-          - /tmp/roxctl-secured-cluster-services