updates

Signed-off-by: Andreas Grabner <[email protected]>

files/dynatrace/oneagent_values.yaml

@@ -6,7 +6,7 @@ oneagent:
   apiUrl: "https://DT_TENANT/api"
   image: ""
   args:
-  - --set-host-group=keptn_on_k3s
+  - --set-host-group=DT_HOST_GROUP
   - --set-host-tag=KeptnOnK3s
   env: {}
   nodeSelector: {}

install-keptn-on-k3s.sh

@@ -4,6 +4,7 @@ set -eu
 
 # Keptn Version Information
 KEPTNVERSION="0.8.0"
+KEPTN_TYPE="controlplane"
 KEPTN_DELIVERYPLANE=false
 KEPTN_EXECUTIONPLANE=false
 KEPTN_CONTROLPLANE=true
@@ -251,6 +252,7 @@ function get_oneagent {
   sed -e 's~DT_TENANT~'"$DT_TENANT"'~' \
     -e 's~DT_API_TOKEN~'"$DT_API_TOKEN"'~' \
     -e 's~DT_PAAS_TOKEN~'"$DT_PAAS_TOKEN"'~' \
+    -e 's~DT_HOST_GROUP~'"$KEPTN_TYPE"'~' \
     ./files/dynatrace/oneagent_values.yaml > oneagent_values.yaml
 
   export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
@@ -693,7 +695,6 @@ function install_demo_dynatrace {
     gitea_createKeptnRepo "${KEPTN_DELIVERY_PROJECT}"
     gitea_createKeptnRepo "${KEPTN_ADV_PERFORMANCE_PROJECT}"
   fi
-
 }
 
 function install_demo {
@@ -857,20 +858,23 @@ function main {
         ;;
     --controlplane)
         echo "Installing Keptn Control Plane"
+        KEPTN_TYPE="controlplane"
         KEPTN_DELIVERYPLANE="false"
         KEPTN_EXECUTIONPLANE="false"
         KEPTN_CONTROLPLANE="true"
         shift
         ;;
     --deliveryplane)
         echo "Installing Keptn Delivery Plane"
+        KEPTN_TYPE="deliveryplane"
         KEPTN_DELIVERYPLANE="true"
         KEPTN_EXECUTIONPLANE="false"
         KEPTN_CONTROLPLANE="false"
         shift
         ;;
     --executionplane)
         echo "Installing Keptn Execution Plane"
+        KEPTN_TYPE="executionplane"
         KEPTN_DELIVERYPLANE="false"
         KEPTN_EXECUTIONPLANE="true"
         KEPTN_CONTROLPLANE="false"

keptn_project_templates/delivery-simplenode/shipyard.yaml

@@ -2,9 +2,11 @@ apiVersion: spec.keptn.sh/0.2.0
 kind: Shipyard
 metadata:
   name: "shipyard-delivery-simplenode"
+  description: "3 stages delivery with an option for a hotfix deployment into staging and production"
 spec:
   stages:
   - name: dev
+    description: "Represents Dev Stage where all new artifacts will be deployed first."
     sequences:
     - name: delivery
       tasks:
@@ -15,17 +17,18 @@ spec:
         properties:
           teststrategy: functional
       - name: evaluation
-      - name: approval
-        properties:
-          pass: automatic
-          warning: automatic
       - name: release
   - name: staging
+    description: "Represents Staging where good artifacts from dev will be promoted to. One exception is the hotfix sequence which allows direct deploy to staging!"
     sequences:
     - name: delivery
       triggeredOn:
       - event: dev.delivery.finished
       tasks:
+      - name: approval
+        properties:
+          pass: automatic
+          warning: automatic
       - name: monaco
       - name: deployment
         properties:
@@ -34,27 +37,68 @@ spec:
         properties:
           teststrategy: performance
       - name: evaluation
-      - name: approval
+      - name: release
+    - name: rollback
+      triggeredOn:
+        - event: "staging.delivery.finished"
+          selector:
+            match:
+              result: "fail"
+      tasks:
+        - name: rollback
+    - name: delivery-hotfix
+      tasks:
+      - name: monaco
+      - name: deployment
         properties:
-          pass: automatic
-          warning: manual
+          deploymentstrategy: direct
+      - name: test
+        properties:
+          teststrategy: performance
+      - name: evaluation
       - name: release
   - name: production
+    description: "Represents Production. All staging artifacts need manual approval except hotfixes. Hotfixes are auto-approved if passed!"
     sequences:
     - name: delivery
       triggeredOn:
       - event: staging.delivery.finished
       tasks:
+      - name: approval
+        properties:
+          pass: manual
+          warning: manual
       - name: monaco
       - name: deployment
         properties:
           deploymentstrategy: blue_green_service
       - name: test
         properties:
-          teststrategy: "real-user"
+          teststrategy: performance
       - name: evaluation
+      - name: release
+    - name: rollback
+      triggeredOn:
+        - event: "production.delivery.finished"
+          selector:
+            match:
+              result: "fail"
+      tasks:
+        - name: rollback
+    - name: delivery-hotfix
+      triggeredOn:
+      - event: staging.delivery-hotfix.finished
+      tasks:
       - name: approval
         properties:
           pass: automatic
           warning: manual
+      - name: monaco
+      - name: deployment
+        properties:
+          deploymentstrategy: blue_green_service
+      - name: test
+        properties:
+          teststrategy: performance
+      - name: evaluation
       - name: release

keptn_project_templates/delivery-simplenode/shipyard_small.yaml

@@ -0,0 +1,76 @@
+apiVersion: spec.keptn.sh/0.2.0
+kind: Shipyard
+metadata:
+  name: "shipyard-delivery-simplenode"
+  description: "3 stages delivery"
+spec:
+  stages:
+  - name: dev
+    description: "Represents Dev Stage where all new artifacts will be deployed first."
+    sequences:
+    - name: delivery
+      tasks:
+      - name: deployment
+        properties:
+          deploymentstrategy: direct
+      - name: test
+        properties:
+          teststrategy: functional
+      - name: evaluation
+      - name: release
+  - name: staging
+    description: "Represents Staging where good artifacts from dev will be promoted to"
+    sequences:
+    - name: delivery
+      triggeredOn:
+      - event: dev.delivery.finished
+      tasks:
+      - name: approval
+        properties:
+          pass: automatic
+          warning: automatic
+      - name: monaco
+      - name: deployment
+        properties:
+          deploymentstrategy: direct
+      - name: test
+        properties:
+          teststrategy: performance
+      - name: evaluation
+      - name: release
+    - name: rollback
+      triggeredOn:
+        - event: "staging.delivery.finished"
+          selector:
+            match:
+              result: "fail"
+      tasks:
+        - name: rollback
+  - name: production
+    description: "Represents Production. All staging artifacts need manual approval"
+    sequences:
+    - name: delivery
+      triggeredOn:
+      - event: staging.delivery.finished
+      tasks:
+      - name: approval
+        properties:
+          pass: manual
+          warning: manual
+      - name: monaco
+      - name: deployment
+        properties:
+          deploymentstrategy: blue_green_service
+      - name: test
+        properties:
+          teststrategy: performance
+      - name: evaluation
+      - name: release
+    - name: rollback
+      triggeredOn:
+        - event: "production.delivery.finished"
+          selector:
+            match:
+              result: "fail"
+      tasks:
+        - name: rollback