Validate new mixer CRDs (istio#12918)

* Validate new mixer CRDs * Add templates and adapters * Test cases for new mixer CRDs
chloe899 · Apr 1, 2019 · 400c608 · 400c608
1 parent e312677
commit 400c608
Show file tree

Hide file tree

Showing 11 changed files with 111 additions and 0 deletions.
diff --git a/...all/kubernetes/helm/istio/charts/galley/templates/validatingwebhookconfiguration.yaml.tpl b/...all/kubernetes/helm/istio/charts/galley/templates/validatingwebhookconfiguration.yaml.tpl
@@ -110,6 +110,11 @@ webhooks:
         - quotas
         - reportnothings
         - tracespans
+        - adapters
+        - handlers
+        - instances
+        - templates
+        - zipkins
     failurePolicy: Fail
     sideEffects: None
 {{- end }}

diff --git a/tests/e2e/tests/galley/testdata/config-v1alpha2-adapter-invalid.yaml b/tests/e2e/tests/galley/testdata/config-v1alpha2-adapter-invalid.yaml
@@ -0,0 +1,12 @@
+apiVersion: "config.istio.io/v1alpha2"
+kind: adapter
+metadata:
+  name: keyval
+  namespace: istio-system
+spec:
+  description: 0
+  session_based: false
+  templates:
+  - keyval
+  config: CsgCCh5taXhlci90ZXN0L2tleXZhbC9jb25maWcucHJvdG8SBmtleXZhbCJzCgZQYXJhbXMSLwoFdGFibGUYASADKAsyGS5rZXl2YWwuUGFyYW1zLlRhYmxlRW50cnlSBXRhYmxlGjgKClRhYmxlRW50cnkSEAoDa2V5GAEgASgJUgNrZXkSFAoFdmFsdWUYAiABKAlSBXZhbHVlOgI4AUqgAQoGEgQAAAgBCggKAQwSAwAAEgoICgECEgMCCA4KIAoCBAASBAUACAEaFCBBZGFwdGVyIHBhcmFtZXRlcnMKCgoKAwQAARIDBQgOChsKBAQAAgASAwcCIBoOIExvb2t1cCB0YWJsZQoKDQoFBAACAAQSBAcCBRAKDAoFBAACAAYSAwcCFQoMCgUEAAIAARIDBxYbCgwKBQQAAgADEgMHHh9iBnByb3RvMw==
+---
diff --git a/tests/e2e/tests/galley/testdata/config-v1alpha2-adapter-valid.yaml b/tests/e2e/tests/galley/testdata/config-v1alpha2-adapter-valid.yaml
@@ -0,0 +1,12 @@
+apiVersion: "config.istio.io/v1alpha2"
+kind: adapter
+metadata:
+  name: keyval
+  namespace: istio-system
+spec:
+  description: 
+  session_based: false
+  templates:
+  - keyval
+  config: CsgCCh5taXhlci90ZXN0L2tleXZhbC9jb25maWcucHJvdG8SBmtleXZhbCJzCgZQYXJhbXMSLwoFdGFibGUYASADKAsyGS5rZXl2YWwuUGFyYW1zLlRhYmxlRW50cnlSBXRhYmxlGjgKClRhYmxlRW50cnkSEAoDa2V5GAEgASgJUgNrZXkSFAoFdmFsdWUYAiABKAlSBXZhbHVlOgI4AUqgAQoGEgQAAAgBCggKAQwSAwAAEgoICgECEgMCCA4KIAoCBAASBAUACAEaFCBBZGFwdGVyIHBhcmFtZXRlcnMKCgoKAwQAARIDBQgOChsKBAQAAgASAwcCIBoOIExvb2t1cCB0YWJsZQoKDQoFBAACAAQSBAcCBRAKDAoFBAACAAYSAwcCFQoMCgUEAAIAARIDBxYbCgwKBQQAAgADEgMHHh9iBnByb3RvMw==
+---
diff --git a/tests/e2e/tests/galley/testdata/config-v1alpha2-handler-invalid.yaml b/tests/e2e/tests/galley/testdata/config-v1alpha2-handler-invalid.yaml
@@ -0,0 +1,17 @@
+apiVersion: "config.istio.io/v1alpha2"
+kind: handler
+metadata:
+  name: prometheusdouble
+  namespace: istio-system
+spec:
+  compiledAdapter: 0
+  params:
+    metrics:
+    - name: double_request_count # Prometheus metric name
+      instance_name: doublerequestcount.metric.istio-system # Mixer instance name (fully-qualified)
+      kind: COUNTER
+      label_names:
+      - reporter
+      - source
+      - destination
+      - message
diff --git a/tests/e2e/tests/galley/testdata/config-v1alpha2-handler-valid.yaml b/tests/e2e/tests/galley/testdata/config-v1alpha2-handler-valid.yaml
@@ -0,0 +1,17 @@
+apiVersion: "config.istio.io/v1alpha2"
+kind: handler
+metadata:
+  name: prometheusdouble
+  namespace: istio-system
+spec:
+  compiledAdapter: prometheus
+  params:
+    metrics:
+    - name: double_request_count # Prometheus metric name
+      instance_name: doublerequestcount.metric.istio-system # Mixer instance name (fully-qualified)
+      kind: COUNTER
+      label_names:
+      - reporter
+      - source
+      - destination
+      - message
diff --git a/tests/e2e/tests/galley/testdata/config-v1alpha2-instance-invalid.yaml b/tests/e2e/tests/galley/testdata/config-v1alpha2-instance-invalid.yaml
@@ -0,0 +1,9 @@
+apiVersion: "config.istio.io/v1alpha2"
+kind: instance
+metadata:
+  name: source-info
+  namespace: istio-system
+spec:
+  template: listentry
+  zarams:
+    value: source.name | "unknown"
diff --git a/tests/e2e/tests/galley/testdata/config-v1alpha2-instance-valid.yaml b/tests/e2e/tests/galley/testdata/config-v1alpha2-instance-valid.yaml
@@ -0,0 +1,9 @@
+apiVersion: "config.istio.io/v1alpha2"
+kind: instance
+metadata:
+  name: source-info
+  namespace: istio-system
+spec:
+  template: listentry
+  params:
+    value: source.name | "unknown"
diff --git a/tests/e2e/tests/galley/testdata/config-v1alpha2-template-invalid.yaml b/tests/e2e/tests/galley/testdata/config-v1alpha2-template-invalid.yaml
@@ -0,0 +1,7 @@
+apiVersion: "config.istio.io/v1alpha2"
+kind: template
+metadata:
+  name: keyval
+  namespace: istio-system
+spec:
+  prescriptor: 0
diff --git a/tests/e2e/tests/galley/testdata/config-v1alpha2-template-valid.yaml b/tests/e2e/tests/galley/testdata/config-v1alpha2-template-valid.yaml
diff --git a/tests/e2e/tests/galley/testdata/config-v1alpha2-zipkin-invalid.yaml b/tests/e2e/tests/galley/testdata/config-v1alpha2-zipkin-invalid.yaml
@@ -0,0 +1,8 @@
+apiVersion: "config.istio.io/v1alpha2"
+kind: zipkin
+metadata:
+  name: zipkin
+  namespace: istio-system
+spec:
+  url: localhost/zipkin
+  sampleProbability: banana
diff --git a/tests/e2e/tests/galley/testdata/config-v1alpha2-zipkin-valid.yaml b/tests/e2e/tests/galley/testdata/config-v1alpha2-zipkin-valid.yaml
@@ -0,0 +1,8 @@
+apiVersion: "config.istio.io/v1alpha2"
+kind: zipkin
+metadata:
+  name: zipkin
+  namespace: istio-system
+spec:
+  url: localhost/zipkin
+  sampleProbability: 20