fix(metrics-operator): add missing AnalysisDefinition validation webh…

…ook to helm templates (#2173) Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
keptn · Sep 27, 2023 · 98097e6 · 98097e6
1 parent 27a9b80
commit 98097e6
Show file tree

Hide file tree

Showing 24 changed files with 96 additions and 1 deletion.
diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml
@@ -8341,3 +8341,23 @@ webhooks:
     resources:
     - keptnmetrics
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: 'metrics-webhook-service'
+      namespace: 'helmtests'
+      path: /validate-metrics-keptn-sh-v1alpha3-analysisdefinition
+  failurePolicy: Fail
+  name: vanalysisdefinition.kb.io
+  rules:
+  - apiGroups:
+    - metrics.keptn.sh
+    apiVersions:
+    - v1alpha3
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - analysisdefinitions
+  sideEffects: None
diff --git a/Makefile b/Makefile
@@ -26,12 +26,14 @@ KUSTOMIZE ?= $(LOCALBIN)/kustomize
 integration-test:	# to run a single test by name use --test eg. --test=expose-keptn-metric
 	kubectl kuttl test --start-kind=false ./test/integration/ --config=kuttl-test.yaml
 	kubectl kuttl test --start-kind=false ./test/testmetrics/ --config=kuttl-test.yaml
+	kubectl kuttl test --start-kind=false ./test/testanalysis/ --config=kuttl-test.yaml
 	kubectl kuttl test --start-kind=false ./test/testcertificate/ --config=kuttl-test.yaml
 
 .PHONY: integration-test-local #these tests should run on a real cluster!
 integration-test-local: install-prometheus
 	kubectl kuttl test --start-kind=false ./test/integration/ --config=kuttl-test-local.yaml
 	kubectl kuttl test --start-kind=false ./test/testmetrics/ --config=kuttl-test-local.yaml
+	kubectl kuttl test --start-kind=false ./test/testanalysis/ --config=kuttl-test-local.yaml
 	kubectl kuttl test --start-kind=false ./test/testcertificate/ --config=kuttl-test-local.yaml
 
 .PHONY: load-test

diff --git a/helm/chart/templates/metrics-validating-webhook-configuration.yaml b/helm/chart/templates/metrics-validating-webhook-configuration.yaml
@@ -27,4 +27,24 @@ webhooks:
     - UPDATE
     resources:
     - keptnmetrics
-  sideEffects: None
+  sideEffects: None
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: 'metrics-webhook-service'
+      namespace: '{{ .Release.Namespace }}'
+      path: /validate-metrics-keptn-sh-v1alpha3-analysisdefinition
+  failurePolicy: Fail
+  name: vanalysisdefinition.kb.io
+  rules:
+  - apiGroups:
+    - metrics.keptn.sh
+    apiVersions:
+    - v1alpha3
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - analysisdefinitions
+  sideEffects: None
diff --git a/...controller-existing-status/00-assert.yaml → ...controller-existing-status/00-assert.yaml b/...controller-existing-status/00-assert.yaml → ...controller-existing-status/00-assert.yaml
diff --git a/...ontroller-existing-status/00-install.yaml → ...ontroller-existing-status/00-install.yaml b/...ontroller-existing-status/00-install.yaml → ...ontroller-existing-status/00-install.yaml
diff --git a/...controller-existing-status/01-assert.yaml → ...controller-existing-status/01-assert.yaml b/...controller-existing-status/01-assert.yaml → ...controller-existing-status/01-assert.yaml
diff --git a/...ontroller-existing-status/01-install.yaml → ...ontroller-existing-status/01-install.yaml b/...ontroller-existing-status/01-install.yaml → ...ontroller-existing-status/01-install.yaml
diff --git a/...r-existing-status/02-namespacedelete.yaml → ...r-existing-status/02-namespacedelete.yaml b/...r-existing-status/02-namespacedelete.yaml → ...r-existing-status/02-namespacedelete.yaml
diff --git a/...tiple-providers/00-teststep-template.yaml → ...tiple-providers/00-teststep-template.yaml b/...tiple-providers/00-teststep-template.yaml → ...tiple-providers/00-teststep-template.yaml
diff --git a/...troller-multiple-providers/01-assert.yaml → ...troller-multiple-providers/01-assert.yaml b/...troller-multiple-providers/01-assert.yaml → ...troller-multiple-providers/01-assert.yaml
diff --git a/...ontroller-multiple-providers/install.yaml → ...ontroller-multiple-providers/install.yaml b/...ontroller-multiple-providers/install.yaml → ...ontroller-multiple-providers/install.yaml
diff --git a/...oller-multiple-providers/mock-server.yaml → ...oller-multiple-providers/mock-server.yaml b/...oller-multiple-providers/mock-server.yaml → ...oller-multiple-providers/mock-server.yaml
diff --git a/...ysis-controller/00-teststep-template.yaml → ...ysis-controller/00-teststep-template.yaml b/...ysis-controller/00-teststep-template.yaml → ...ysis-controller/00-teststep-template.yaml
diff --git a/...ration/analysis-controller/01-assert.yaml → ...alysis/analysis-controller/01-assert.yaml b/...ration/analysis-controller/01-assert.yaml → ...alysis/analysis-controller/01-assert.yaml
diff --git a/...egration/analysis-controller/install.yaml → ...analysis/analysis-controller/install.yaml b/...egration/analysis-controller/install.yaml → ...analysis/analysis-controller/install.yaml
diff --git a/...tion/analysis-controller/mock-server.yaml → ...ysis/analysis-controller/mock-server.yaml b/...tion/analysis-controller/mock-server.yaml → ...ysis/analysis-controller/mock-server.yaml
diff --git a/...on/analysis-value-template/00-assert.yaml → ...is/analysis-value-template/00-assert.yaml b/...on/analysis-value-template/00-assert.yaml → ...is/analysis-value-template/00-assert.yaml
diff --git a/...n/analysis-value-template/00-install.yaml → ...s/analysis-value-template/00-install.yaml b/...n/analysis-value-template/00-install.yaml → ...s/analysis-value-template/00-install.yaml
diff --git a/test/integration/analysis/00-assert.yaml → test/testanalysis/analysis/00-assert.yaml b/test/integration/analysis/00-assert.yaml → test/testanalysis/analysis/00-assert.yaml
diff --git a/test/integration/analysis/00-install.yaml → test/testanalysis/analysis/00-install.yaml b/test/integration/analysis/00-install.yaml → test/testanalysis/analysis/00-install.yaml
diff --git a/test/testanalysis/analysisdefinition-validate/00-teststep-install.yaml b/test/testanalysis/analysisdefinition-validate/00-teststep-install.yaml
@@ -0,0 +1,7 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+  - goodanalysis.yaml
+commands:
+  - command: kubectl apply -f badanalysis.yaml
+    ignoreFailure: true # we must install ignoring the validating webhook error to proceed with the test
diff --git a/test/testanalysis/analysisdefinition-validate/01-teststep-assert.yaml b/test/testanalysis/analysisdefinition-validate/01-teststep-assert.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+error: # this checks that kubectl get resource fails, AKA bad CRD not added
+  - badanalysis.yaml
+assert: # this checks that kubectl get resource succeeds
+  - goodanalysis.yaml
diff --git a/test/testanalysis/analysisdefinition-validate/badanalysis.yaml b/test/testanalysis/analysisdefinition-validate/badanalysis.yaml
@@ -0,0 +1,20 @@
+apiVersion: metrics.keptn.sh/v1alpha3
+kind: AnalysisDefinition
+metadata:
+  name: ed-my-proj-dev-svc1
+spec:
+  objectives:
+    - analysisValueTemplateRef:
+        name: ready
+      target:
+        failure:
+          lessThan:
+            fixedValue: 2
+        warning:
+          lessThan:
+            fixedValue: 3
+      weight: 1
+      keyObjective: false
+  totalScore:
+    passPercentage: 50
+    warningPercentage: 75
diff --git a/test/testanalysis/analysisdefinition-validate/goodanalysis.yaml b/test/testanalysis/analysisdefinition-validate/goodanalysis.yaml
@@ -0,0 +1,20 @@
+apiVersion: metrics.keptn.sh/v1alpha3
+kind: AnalysisDefinition
+metadata:
+  name: ed-my-proj-dev-svc2
+spec:
+  objectives:
+    - analysisValueTemplateRef:
+        name: ready
+      target:
+        failure:
+          lessThan:
+            fixedValue: 2
+        warning:
+          lessThan:
+            fixedValue: 3
+      weight: 1
+      keyObjective: false
+  totalScore:
+    passPercentage: 90
+    warningPercentage: 75