Merge branch 'main' into feat/1880/improve_logging_controller_lifecycle

keptn · Oct 11, 2023 · cdd42a7 · cdd42a7
2 parents cec7f65 + c1166ff
commit cdd42a7
Show file tree

Hide file tree

Showing 75 changed files with 6,615 additions and 1,734 deletions.
diff --git a/.github/actions/deploy-klt-on-cluster/action.yml b/.github/actions/deploy-klt-on-cluster/action.yml
@@ -21,11 +21,15 @@ inputs:
   helm-install:
     required: false
     description: "Install Keptn via helm instead of manifest if true"
-    default: "true"
+    default: "helm_on"
   scheduling-gates:
     required: false
     description: "Use scheduling gates instead of scheduler"
-    default: "false"
+    default: "gates_off"
+  allowed-namespaces:
+    required: false
+    description: "Decides whether to allow only certain namespaces"
+    default: "allowed_ns_off"
 runs:
   using: "composite"
   steps:
@@ -61,7 +65,7 @@ runs:
         done
 
     - name: Install lifecycle-toolkit with manifests
-      if: inputs.helm-install == 'false' && inputs.scheduling-gates == 'false'
+      if: ${{  inputs.helm-install == 'helm_off' }}
       shell: bash
       run: |
         echo "Installing Keptn using manifests"
@@ -87,7 +91,7 @@ runs:
         kubectl rollout status deployment lifecycle-operator -n keptn-lifecycle-toolkit-system -w
 
     - name: Install lifecycle-toolkit with helm
-      if: inputs.helm-install == 'true'
+      if: ${{ inputs.helm-install == 'helm_on' }}
       env:
         RELEASE_REGISTRY: "localhost:5000/keptn"
       shell: bash
@@ -99,8 +103,21 @@ runs:
         helm dependency update
         helm dependency build
 
+        touch tmp-values.yaml
+        if [ "${{ inputs.allowed-namespaces }}" == "allowed_ns_on" ]; then
+          echo "lifecycleOperator:" >> tmp-values.yaml
+          echo "  allowedNamespaces: [allowed-ns-test]" >> tmp-values.yaml
+        fi
+
+        if [ "${{ inputs.scheduling-gates }}" == "gates_on" ]; then
+          if [ "${{ inputs.allowed-namespaces }}" == "allowed_ns_off" ]; then
+            echo "lifecycleOperator:" >> tmp-values.yaml
+          fi
+          echo "  schedulingGatesEnabled: true" >> tmp-values.yaml
+        fi
+
         helm install -n keptn-lifecycle-toolkit-system --create-namespace keptn ./ \
-          --set lifecycleOperator.schedulingGatesEnabled=${{ inputs.scheduling-gates }} \
+          --values tmp-values.yaml \
           --set lifecycleOperator.scheduler.imagePullPolicy=Never \
           --set lifecycleOperator.scheduler.image.tag=${{ inputs.runtime_tag }} \
           --set lifecycleOperator.scheduler.image.repository="localhost:5000/keptn/scheduler" \