fix(kumactl) install control-plane tests (#858)

kumahq · Jun 27, 2020 · 7ed1830 · 7ed1830
1 parent aecb8aa
commit 7ed1830
Show file tree

Hide file tree

Showing 6 changed files with 318 additions and 344 deletions.
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
@@ -4436,14 +4436,6 @@ rules:
       - update
       - patch
       - delete
-  - apiGroups:
-      - kuma.io
-    resources:
-      - healthchecks
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - kuma.io
     resources:
@@ -4468,50 +4460,16 @@ rules:
       - kuma.io
     resources:
       - trafficpermissions
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - kuma.io
-    resources:
       - trafficlogs
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - kuma.io
-    resources:
       - trafficroutes
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - kuma.io
-    resources:
       - traffictraces
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - kuma.io
-    resources:
       - faultinjections
+      - circuitbreakers
+      - healthchecks
     verbs:
       - get
       - list
       - watch
-  - apiGroups:
-    - kuma.io
-    resources:
-    - circuitbreakers
-    verbs:
-    - get
-    - list
-    - watch
   - apiGroups:
       - ""
     resources:
@@ -4523,7 +4481,7 @@ rules:
     resources:
       - meshes/finalizers
     verbs:
-      - "*"
+      - '*'
   - apiGroups:
       - kuma.io
     resources:
@@ -4539,7 +4497,6 @@ rules:
       - list
       - watch
       - create
-  # validate k8s token before issueing mTLS cert
   - apiGroups:
       - authentication.k8s.io
     resources:
@@ -4780,20 +4737,20 @@ spec:
               value: "5677"
             - name: KUMA_XDS_SERVER_GRPC_PORT
               value: "5678"
-            - name: KUMA_API_SERVER_PORT
-              value: "5681"
             - name: KUMA_BOOTSTRAP_SERVER_PORT
               value: "5682"
             - name: KUMA_SDS_SERVER_TLS_CERT_FILE
               value: /var/run/secrets/kuma.io/kuma-sds/tls-cert/tls.crt
             - name: KUMA_SDS_SERVER_TLS_KEY_FILE
               value: /var/run/secrets/kuma.io/kuma-sds/tls-cert/tls.key
+            - name: KUMA_API_SERVER_PORT
+              value: "5681"
+            - name: KUMA_API_SERVER_READ_ONLY
+              value: "true"
             - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_PORT
               value: "5443"
             - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_CERT_DIR
               value: /var/run/secrets/kuma.io/kuma-admission-server/tls-cert
-            - name: KUMA_API_SERVER_READ_ONLY
-              value: "true"
             - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CNI_ENABLED
               value: "true"
             - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_SIDECAR_CONTAINER_IMAGE

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
@@ -4405,14 +4405,6 @@ rules:
       - update
       - patch
       - delete
-  - apiGroups:
-      - kuma.io
-    resources:
-      - healthchecks
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - kuma.io
     resources:
@@ -4437,46 +4429,12 @@ rules:
       - kuma.io
     resources:
       - trafficpermissions
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - kuma.io
-    resources:
       - trafficlogs
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - kuma.io
-    resources:
       - trafficroutes
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - kuma.io
-    resources:
       - traffictraces
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - kuma.io
-    resources:
       - faultinjections
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - kuma.io
-    resources:
       - circuitbreakers
+      - healthchecks
     verbs:
       - get
       - list
@@ -4492,7 +4450,7 @@ rules:
     resources:
       - meshes/finalizers
     verbs:
-      - "*"
+      - '*'
   - apiGroups:
       - kuma.io
     resources:
@@ -4634,20 +4592,20 @@ spec:
               value: "5677"
             - name: KUMA_XDS_SERVER_GRPC_PORT
               value: "5678"
-            - name: KUMA_API_SERVER_PORT
-              value: "5681"
             - name: KUMA_BOOTSTRAP_SERVER_PORT
               value: "5682"
             - name: KUMA_SDS_SERVER_TLS_CERT_FILE
               value: /var/run/secrets/kuma.io/kuma-sds/tls-cert/tls.crt
             - name: KUMA_SDS_SERVER_TLS_KEY_FILE
               value: /var/run/secrets/kuma.io/kuma-sds/tls-cert/tls.key
+            - name: KUMA_API_SERVER_PORT
+              value: "5681"
+            - name: KUMA_API_SERVER_READ_ONLY
+              value: "true"
             - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_PORT
               value: "5443"
             - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_CERT_DIR
               value: /var/run/secrets/kuma.io/kuma-admission-server/tls-cert
-            - name: KUMA_API_SERVER_READ_ONLY
-              value: "true"
             - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CNI_ENABLED
               value: "false"
             - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_SIDECAR_CONTAINER_IMAGE