fix(kumactl): define namespace only once in install obs (#4411)

This was causing problems as prometheus doesn't get the sidecar fix #4410 Signed-off-by: Charly Molter <charly.molter@konghq.com>
kumahq · Jun 2, 2022 · 92c8b0c · 92c8b0c
1 parent 15e9f1f
commit 92c8b0c
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 140 deletions.
diff --git a/app/kumactl/cmd/install/testdata/install-observability.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-observability.defaults.golden.yaml
@@ -5,7 +5,7 @@ kind: Namespace
 metadata:
   name: mesh-observability
   labels:
-    kuma.io/sidecar-injection: enabled
+    kuma.io/sidecar-injection: disabled
   annotations:
     kuma.io/mesh: default
 ---
@@ -11195,6 +11195,7 @@ spec:
     metadata:
       labels:
         app: grafana
+        kuma.io/sidecar-injection: enabled
       annotations:
         checksum/config: 4fbce6ca7985bb33289922e68acc9af246f301cf9650f061fbcd0155925665df
         checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
@@ -11339,6 +11340,7 @@ spec:
       labels:
         component: "server"
         app: prometheus
+        kuma.io/sidecar-injection: enabled
       annotations:
         kuma.io/direct-access-services: "*"
     spec:
@@ -11389,16 +11391,6 @@ spec:
           persistentVolumeClaim:
             claimName: prometheus-server
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
@@ -11843,30 +11835,30 @@ roleRef:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: loki-promtail
+  name: loki
   namespace: mesh-observability
   labels:
-    app: promtail
+    app: loki
     release: loki
 rules:
   - apiGroups:      ['extensions']
     resources:      ['podsecuritypolicies']
     verbs:          ['use']
-    resourceNames:  [loki-promtail]
+    resourceNames:  [loki]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: loki
+  name: loki-promtail
   namespace: mesh-observability
   labels:
-    app: loki
+    app: promtail
     release: loki
 rules:
   - apiGroups:      ['extensions']
     resources:      ['podsecuritypolicies']
     verbs:          ['use']
-    resourceNames:  [loki]
+    resourceNames:  [loki-promtail]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -12115,11 +12107,6 @@ spec:
         - name: storage
           emptyDir: {}
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
 # Based on https://github.com/jaegertracing/jaeger-kubernetes/blob/master/all-in-one/jaeger-all-in-one-template.yml
 
 #

diff --git a/app/kumactl/cmd/install/testdata/install-observability.no-grafana.golden.yaml b/app/kumactl/cmd/install/testdata/install-observability.no-grafana.golden.yaml
@@ -5,7 +5,7 @@ kind: Namespace
 metadata:
   name: mesh-observability
   labels:
-    kuma.io/sidecar-injection: enabled
+    kuma.io/sidecar-injection: disabled
   annotations:
     kuma.io/mesh: default
 ---
@@ -590,6 +590,7 @@ spec:
       labels:
         component: "server"
         app: prometheus
+        kuma.io/sidecar-injection: enabled
       annotations:
         kuma.io/direct-access-services: "*"
     spec:
@@ -675,16 +676,6 @@ spec:
       securityContext:
         runAsUser: 65534
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
@@ -1129,30 +1120,30 @@ roleRef:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: loki-promtail
+  name: loki
   namespace: mesh-observability
   labels:
-    app: promtail
+    app: loki
     release: loki
 rules:
   - apiGroups:      ['extensions']
     resources:      ['podsecuritypolicies']
     verbs:          ['use']
-    resourceNames:  [loki-promtail]
+    resourceNames:  [loki]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: loki
+  name: loki-promtail
   namespace: mesh-observability
   labels:
-    app: loki
+    app: promtail
     release: loki
 rules:
   - apiGroups:      ['extensions']
     resources:      ['podsecuritypolicies']
     verbs:          ['use']
-    resourceNames:  [loki]
+    resourceNames:  [loki-promtail]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -1401,11 +1392,6 @@ spec:
         - name: storage
           emptyDir: {}
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
 # Based on https://github.com/jaegertracing/jaeger-kubernetes/blob/master/all-in-one/jaeger-all-in-one-template.yml
 
 #

diff --git a/app/kumactl/cmd/install/testdata/install-observability.no-jaeger.golden.yaml b/app/kumactl/cmd/install/testdata/install-observability.no-jaeger.golden.yaml
@@ -5,7 +5,7 @@ kind: Namespace
 metadata:
   name: mesh-observability
   labels:
-    kuma.io/sidecar-injection: enabled
+    kuma.io/sidecar-injection: disabled
   annotations:
     kuma.io/mesh: default
 ---
@@ -11195,6 +11195,7 @@ spec:
     metadata:
       labels:
         app: grafana
+        kuma.io/sidecar-injection: enabled
       annotations:
         checksum/config: 4fbce6ca7985bb33289922e68acc9af246f301cf9650f061fbcd0155925665df
         checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
@@ -11339,6 +11340,7 @@ spec:
       labels:
         component: "server"
         app: prometheus
+        kuma.io/sidecar-injection: enabled
       annotations:
         kuma.io/direct-access-services: "*"
     spec:
@@ -11389,16 +11391,6 @@ spec:
           persistentVolumeClaim:
             claimName: prometheus-server
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
@@ -11843,30 +11835,30 @@ roleRef:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: loki-promtail
+  name: loki
   namespace: mesh-observability
   labels:
-    app: promtail
+    app: loki
     release: loki
 rules:
   - apiGroups:      ['extensions']
     resources:      ['podsecuritypolicies']
     verbs:          ['use']
-    resourceNames:  [loki-promtail]
+    resourceNames:  [loki]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: loki
+  name: loki-promtail
   namespace: mesh-observability
   labels:
-    app: loki
+    app: promtail
     release: loki
 rules:
   - apiGroups:      ['extensions']
     resources:      ['podsecuritypolicies']
     verbs:          ['use']
-    resourceNames:  [loki]
+    resourceNames:  [loki-promtail]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -12114,8 +12106,3 @@ spec:
             secretName: loki
         - name: storage
           emptyDir: {}
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
diff --git a/app/kumactl/cmd/install/testdata/install-observability.no-loki.golden.yaml b/app/kumactl/cmd/install/testdata/install-observability.no-loki.golden.yaml
@@ -5,7 +5,7 @@ kind: Namespace
 metadata:
   name: mesh-observability
   labels:
-    kuma.io/sidecar-injection: enabled
+    kuma.io/sidecar-injection: disabled
   annotations:
     kuma.io/mesh: default
 ---
@@ -11195,6 +11195,7 @@ spec:
     metadata:
       labels:
         app: grafana
+        kuma.io/sidecar-injection: enabled
       annotations:
         checksum/config: 4fbce6ca7985bb33289922e68acc9af246f301cf9650f061fbcd0155925665df
         checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
@@ -11339,6 +11340,7 @@ spec:
       labels:
         component: "server"
         app: prometheus
+        kuma.io/sidecar-injection: enabled
       annotations:
         kuma.io/direct-access-services: "*"
     spec:
@@ -11389,16 +11391,6 @@ spec:
           persistentVolumeClaim:
             claimName: prometheus-server
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
 # Based on https://github.com/jaegertracing/jaeger-kubernetes/blob/master/all-in-one/jaeger-all-in-one-template.yml
 
 #

diff --git a/app/kumactl/cmd/install/testdata/install-observability.no-prometheus.golden.yaml b/app/kumactl/cmd/install/testdata/install-observability.no-prometheus.golden.yaml
@@ -5,7 +5,7 @@ kind: Namespace
 metadata:
   name: mesh-observability
   labels:
-    kuma.io/sidecar-injection: enabled
+    kuma.io/sidecar-injection: disabled
   annotations:
     kuma.io/mesh: default
 ---
@@ -10633,6 +10633,7 @@ spec:
     metadata:
       labels:
         app: grafana
+        kuma.io/sidecar-injection: enabled
       annotations:
         checksum/config: 4fbce6ca7985bb33289922e68acc9af246f301cf9650f061fbcd0155925665df
         checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
@@ -10723,16 +10724,6 @@ spec:
         - name: plugins-volume
           emptyDir: {}
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
@@ -11177,30 +11168,30 @@ roleRef:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: loki-promtail
+  name: loki
   namespace: mesh-observability
   labels:
-    app: promtail
+    app: loki
     release: loki
 rules:
   - apiGroups:      ['extensions']
     resources:      ['podsecuritypolicies']
     verbs:          ['use']
-    resourceNames:  [loki-promtail]
+    resourceNames:  [loki]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: loki
+  name: loki-promtail
   namespace: mesh-observability
   labels:
-    app: loki
+    app: promtail
     release: loki
 rules:
   - apiGroups:      ['extensions']
     resources:      ['podsecuritypolicies']
     verbs:          ['use']
-    resourceNames:  [loki]
+    resourceNames:  [loki-promtail]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -11449,11 +11440,6 @@ spec:
         - name: storage
           emptyDir: {}
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mesh-observability
----
 # Based on https://github.com/jaegertracing/jaeger-kubernetes/blob/master/all-in-one/jaeger-all-in-one-template.yml
 
 #