Merge branch 'main' into 1030-metric-guide

Signed-off-by: Meg McRoberts <[email protected]>
keptn · Oct 31, 2023 · ea3021b · ea3021b
2 parents d6bbe82 + 0e39c0e
commit ea3021b
Show file tree

Hide file tree

Showing 59 changed files with 843 additions and 359 deletions.
diff --git a/.github/actions/deploy-klt-on-cluster/action.yml b/.github/actions/deploy-klt-on-cluster/action.yml
@@ -82,36 +82,24 @@ runs:
             cd -  # Return to the previous directory
         done
 
-        cd ./chart
+        cd .github/actions/deploy-klt-on-cluster
 
-        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
+          echo "  allowedNamespaces: [allowed-ns-test]" >> 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
+          echo "  schedulingGatesEnabled: true" >> values.yaml
         fi
+        echo "installing with values.yaml file:"
+        cat values.yaml
 
-        helm install -n keptn-lifecycle-toolkit-system --create-namespace keptn ./ \
-          --values tmp-values.yaml \
-          --set lifecycleOperator.scheduler.imagePullPolicy=Never \
+        helm install -n keptn-lifecycle-toolkit-system --create-namespace keptn ../../../chart \
+          --values ./values.yaml \
           --set lifecycleOperator.scheduler.image.tag=${{ inputs.runtime_tag }} \
-          --set lifecycleOperator.scheduler.image.repository="localhost:5000/keptn/scheduler" \
-          --set lifecycleOperator.lifecycleOperator.imagePullPolicy=Never \
           --set lifecycleOperator.lifecycleOperator.image.tag=${{ inputs.runtime_tag }} \
-          --set lifecycleOperator.lifecycleOperator.image.repository="localhost:5000/keptn/lifecycle-operator" \
           --set lifecycleOperator.lifecycleOperator.env.functionRunnerImage=localhost:5000/keptn/deno-runtime:${{ inputs.runtime_tag }} \
           --set lifecycleOperator.lifecycleOperator.env.pythonRunnerImage=localhost:5000/keptn/python-runtime:${{ inputs.runtime_tag }} \
-          --set certManager.imagePullPolicy=Never \
           --set certManager.image.tag=${{ inputs.runtime_tag }} \
-          --set certManager.image.repository="localhost:5000/keptn/certificate-operator" \
-          --set metricsOperator.imagePullPolicy=Never \
-          --set metricsOperator.env.enableKeptnAnalysis="true" \
           --set metricsOperator.image.tag=${{ inputs.runtime_tag }} \
-          --set metricsOperator.image.repository="localhost:5000/keptn/metrics-operator" \
           --debug --wait --timeout 1m
diff --git a/.github/actions/deploy-klt-on-cluster/values.yaml b/.github/actions/deploy-klt-on-cluster/values.yaml
@@ -0,0 +1,16 @@
+global:
+  imageRegistry: "localhost:5000"
+
+certManager:
+  imagePullPolicy: Never
+
+metricsOperator:
+  imagePullPolicy: Never
+  env:
+    enableKeptnAnalysis: "true"
+
+lifecycleOperator:
+  lifecycleOperator:
+    imagePullPolicy: Never
+  scheduler:
+    imagePullPolicy: Never
diff --git a/.github/scripts/.helm-tests/certificates-only/result.yaml b/.github/scripts/.helm-tests/certificates-only/result.yaml
@@ -234,7 +234,7 @@ spec:
               value: "true"
             - name: KUBERNETES_CLUSTER_DOMAIN
               value: cluster.local
-          image: testreg/ghcr.io/keptn/certificate-operator:v1.2.0
+          image: testreg/keptn/certificate-operator:v0.0.0
           imagePullPolicy: Always
           name: certificate-operator
           resources:

diff --git a/.github/scripts/.helm-tests/certificates-only/values.yaml b/.github/scripts/.helm-tests/certificates-only/values.yaml
@@ -1,5 +1,7 @@
 certManager:
   enabled: true
+  image:
+    tag: v0.0.0
 lifecycleOperator:
   enabled: false
 metricsOperator:
@@ -13,4 +15,3 @@ global:
   commonLabels:
     mamma : "test"
     app.kubernetes.io/version: vmyversion
-