spike: implement workflowtemplate

chart/infra-server/argo-values.yaml

@@ -3,6 +3,9 @@ argo-workflows:
   server:
     authModes:
       - server
+  # We do this separately, because they cannot be installed from the dependant chart.
+  crds:
+    install: false
 
   controller:
     # Default values that will apply to all Workflows from this controller, unless overridden on the Workflow-level

chart/infra-server/static/flavors.yaml

@@ -494,7 +494,7 @@
   name: OpenShift 4.x Perf&Scale
   description: OpenShift 4.x Perf&Scale
   availability: stable
-  workflow: configuration/workflow-openshift-4-perf-scale.yaml
+  workflow: configuration/workflow-openshift-4.yaml
   aliases:
     - ocp-4-perf-scale
   parameters:
@@ -579,6 +579,13 @@
         Consult OCP documentation for details. {{ .Chart.Annotations.ocpCredentialsMode }} is the value used by
         stackrox CI.
 
+    - name: keep-failed-cluster
+      description: Keep failed cluster
+      value: false
+      kind: optional
+      help: |
+          *Only for debugging infra issues.* If in doubt, please keep to false.
+
     - name: ssd-storage-class
       description: Ensure an SSD StorageClass is the default StorageClass for the cluster
       value: false

chart/infra-server/static/test-simulate.yaml

@@ -4,57 +4,46 @@ metadata:
   generateName: simulate-
 spec:
   entrypoint: start
+  onExit: stop
   arguments:
     parameters:
       - name: name
       - name: create-delay-seconds
-        value: ""
       - name: create-outcome
-        value: ""
       - name: destroy-delay-seconds
-        value: ""
       - name: destroy-outcome
-        value: ""
 
   templates:
     - name: start
-      steps:
-        - - name: create
-            template: simulate
+      dag:
+        tasks:
+          - name: create
+            templateRef:
+              name: test-simulate
+              template: simulate
             arguments:
               parameters:
               - name: delay-seconds
                 value: '{{ "{{" }}workflow.parameters.create-delay-seconds{{ "}}" }}'
               - name: outcome
                 value: '{{ "{{" }}workflow.parameters.create-outcome{{ "}}" }}'
-        - - name: wait
-            template: wait
-        - - name: destroy
-            template: simulate
+
+          - name: wait
+            dependencies: [create]
+            templateRef:
+              name: common
+              template: wait
+
+    - name: stop
+      dag:
+        tasks:
+          - name: destroy
+            templateRef:
+              name: test-simulate
+              template: simulate
             arguments:
               parameters:
               - name: delay-seconds
                 value: '{{ "{{" }}workflow.parameters.destroy-delay-seconds{{ "}}" }}'
               - name: outcome
                 value: '{{ "{{" }}workflow.parameters.destroy-outcome{{ "}}" }}'
-
-    - name: simulate
-      inputs:
-        parameters:
-        - name: delay-seconds
-        - name: outcome
-      script:
-        image: debian:9.4
-        command: [bash]
-        source: |
-          set -x
-          start=0
-          while sleep 1; do
-            if [[ $((start++)) -ge {{ "{{" }}inputs.parameters.delay-seconds{{ "}}" }} ]]; then
-              break
-            fi
-          done
-          [[ "{{ "{{" }}inputs.parameters.outcome{{ "}}" }}" == "success" ]] || exit 1
-
-    - name: wait
-      suspend: {}

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

@@ -24,7 +24,7 @@ spec:
       - name: fips-enabled
       - name: trusted-certs-enabled
       - name: credentials-mode
-      - name: keep-failed-cluster
+      - name: keep-failed-cluster # this not present in openshift-4-perf-scale
       - name: ssd-storage-class
   volumeClaimTemplates:
     - metadata:

chart/infra-server/templates/secrets.yaml

@@ -46,9 +46,6 @@ data:
   workflow-openshift-4-demo.yaml: |-
     {{- tpl (.Files.Get "static/workflow-openshift-4-demo.yaml" ) . | b64enc | nindent 4 }}
 
-  workflow-openshift-4-perf-scale.yaml: |-
-    {{- tpl (.Files.Get "static/workflow-openshift-4-perf-scale.yaml" ) . | b64enc | nindent 4 }}
-
   workflow-eks.yaml: |-
     {{- tpl (.Files.Get "static/workflow-eks.yaml" ) . | b64enc | nindent 4 }}
 

chart/infra-server/templates/workflowtemplates/common.yaml

@@ -0,0 +1,10 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: WorkflowTemplate
+metadata:
+  name: common
+  namespace: default
+spec:
+  templates:
+    - name: wait
+      suspend: {}

chart/infra-server/templates/workflowtemplates/test-simulate.yaml

@@ -0,0 +1,25 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: WorkflowTemplate
+metadata:
+  name: test-simulate
+  namespace: default
+spec:
+  templates:
+    - name: simulate
+      inputs:
+        parameters:
+        - name: delay-seconds
+        - name: outcome
+      script:
+        image: debian:9.4
+        command: [bash]
+        source: |
+          set -x
+          start=0
+          while sleep 1; do
+            if [[ $((start++)) -ge {{ "{{" }}inputs.parameters.delay-seconds{{ "}}" }} ]]; then
+              break
+            fi
+          done
+          [[ "{{ "{{" }}inputs.parameters.outcome{{ "}}" }}" == "success" ]] || exit 1

scripts/deploy/helm.sh

@@ -14,6 +14,7 @@ TEST_MODE="${TEST_MODE:-false}"
 SECRETS_PROJECT="acs-team-automation"
 RELEASE_NAMESPACE="infra"
 RELEASE_NAME="infra-server"
+ARGO_WORKFLOWS_APP_VERSION="v3.6.5"
 
 check_not_empty() {
     for V in "$@"; do
@@ -25,6 +26,11 @@ check_not_empty() {
     done
 }
 
+install_crds() {
+    kubectl apply --kustomize \
+        "https://github.com/argoproj/argo-workflows/manifests/base/crds/minimal?ref=${ARGO_WORKFLOWS_APP_VERSION}"
+}
+
 template() {
     # Need to use helm upgrade --dry-run to have .Capabilities context available
     helm upgrade \
@@ -102,4 +108,5 @@ diff() {
 }
 
 check_not_empty TASK TAG ENVIRONMENT
+install_crds
 eval "$TASK"