reverting observability

charts/karavi-observability/templates/karavi-metrics-powerflex.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: karavi-metrics-powerflex
     app.kubernetes.io/instance: {{ .Release.Name }}
   name: karavi-metrics-powerflex
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 spec:
   type: {{ .Values.karaviMetricsPowerflex.service.type }}
   ports:
@@ -24,7 +24,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: karavi-metrics-powerflex
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
   labels:
     app.kubernetes.io/name: karavi-metrics-powerflex
     app.kubernetes.io/instance: {{ .Release.Name }}

charts/karavi-observability/templates/karavi-metrics-powermax-service-account.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Release.Name }}-metrics-powermax-controller
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 
 ---
 
@@ -35,7 +35,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: {{ .Release.Name }}-metrics-powermax-controller
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "custom.namespace" . }}
 roleRef:
   kind: ClusterRole
   name: {{ .Release.Name }}-metrics-powermax-controller

charts/karavi-observability/templates/karavi-metrics-powermax.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: karavi-metrics-powermax
     app.kubernetes.io/instance: {{ .Release.Name }}
   name: karavi-metrics-powermax
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 spec:
   type: {{ .Values.karaviMetricsPowermax.service.type }}
   ports:
@@ -24,7 +24,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: karavi-metrics-powermax
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
   labels:
     app.kubernetes.io/name: karavi-metrics-powermax
     app.kubernetes.io/instance: {{ .Release.Name }}

charts/karavi-observability/templates/karavi-metrics-powerscale.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: karavi-metrics-powerscale
     app.kubernetes.io/instance: {{ .Release.Name }}
   name: karavi-metrics-powerscale
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 spec:
   type: {{ .Values.karaviMetricsPowerscale.service.type }}
   ports:
@@ -24,7 +24,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: karavi-metrics-powerscale
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
   labels:
     app.kubernetes.io/name: karavi-metrics-powerscale
     app.kubernetes.io/instance: {{ .Release.Name }}

charts/karavi-observability/templates/karavi-metrics-powerstore.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: karavi-metrics-powerstore
     app.kubernetes.io/instance: {{ .Release.Name }}
   name: karavi-metrics-powerstore
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 spec:
   type: {{ .Values.karaviMetricsPowerstore.service.type }}
   ports:
@@ -24,7 +24,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: karavi-metrics-powerstore
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
   labels:
     app.kubernetes.io/name: karavi-metrics-powerstore
     app.kubernetes.io/instance: {{ .Release.Name }}

charts/karavi-observability/templates/karavi-observability-configmap.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ConfigMap 
 metadata:
   name: karavi-metrics-powerflex-configmap
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 data:
   karavi-metrics-powerflex.yaml : |
     COLLECTOR_ADDR: {{ .Values.karaviMetricsPowerflex.collectorAddr }}
@@ -29,7 +29,7 @@ apiVersion: v1
 kind: ConfigMap 
 metadata:
   name: karavi-topology-configmap
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 data:
   karavi-topology.yaml: |
     PROVISIONER_NAMES: {{ .Values.karaviTopology.provisionerNames }}
@@ -49,7 +49,7 @@ apiVersion: v1
 kind: ConfigMap 
 metadata:
   name: karavi-metrics-powerstore-configmap
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 data:
   karavi-metrics-powerstore.yaml : |
     COLLECTOR_ADDR: {{ .Values.karaviMetricsPowerstore.collectorAddr }}
@@ -76,7 +76,7 @@ apiVersion: v1
 kind: ConfigMap 
 metadata:
   name: karavi-metrics-powerscale-configmap
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 data:
   karavi-metrics-powerscale.yaml : |
     COLLECTOR_ADDR: {{ .Values.karaviMetricsPowerscale.collectorAddr }}
@@ -103,7 +103,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: karavi-metrics-powermax-configmap
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 data:
   karavi-metrics-powermax.yaml : |
     COLLECTOR_ADDR: {{ .Values.karaviMetricsPowermax.collectorAddr }}

charts/karavi-observability/templates/karavi-topology.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: karavi-topology
     app.kubernetes.io/instance: {{ .Release.Name }}
   name: karavi-topology
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 spec:
   type: {{ .Values.karaviTopology.service.type }}
   ports:
@@ -24,7 +24,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: karavi-topology
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
   labels:
     app.kubernetes.io/name: karavi-topology
     app.kubernetes.io/instance: {{ .Release.Name }}

charts/karavi-observability/templates/otel-collector.yaml

@@ -5,7 +5,7 @@ data:
 kind: ConfigMap
 metadata:
   name: otel-collector-config
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 
 ---
 
@@ -16,15 +16,15 @@ data:
 kind: ConfigMap
 metadata:
   name: nginx-config
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
 
 ---
 
 apiVersion: v1
 kind: Service
 metadata:
   name: otel-collector
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
   labels:
     app.kubernetes.io/name: otel-collector
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -47,7 +47,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: otel-collector
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "custom.namespace" . }}
   labels:
     app.kubernetes.io/name: otel-collector
     app.kubernetes.io/instance: {{ .Release.Name }}

charts/karavi-observability/values.yaml

@@ -40,8 +40,8 @@ karaviMetricsPowerflex:
   authorization:
     enabled: false
     # sidecarProxyImage: the container image used for the csm-authorization-sidecar.
-    # Default value: dellemc/csm-authorization-sidecar:v1.7.0
-    sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.7.0
+    # Default value: dellemc/csm-authorization-sidecar:v1.6.0
+    sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
     # proxyHost: hostname of the csm-authorization server
     # Default value: None
     proxyHost:
@@ -116,8 +116,8 @@ karaviMetricsPowerscale:
   authorization:
     enabled: false
     # sidecarProxyImage: the container image used for the csm-authorization-sidecar.
-    # Default value: dellemc/csm-authorization-sidecar:v1.7.0
-    sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.7.0
+    # Default value: dellemc/csm-authorization-sidecar:v1.6.0
+    sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
     # proxyHost: hostname of the csm-authorization server
     # Default value: None
     proxyHost:
@@ -153,8 +153,8 @@ karaviMetricsPowermax:
   authorization:
     enabled: false
     # sidecarProxyImage: the container image used for the csm-authorization-sidecar.
-    # Default value: dellemc/csm-authorization-sidecar:v1.7.0
-    sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.7.0
+    # Default value: dellemc/csm-authorization-sidecar:v1.6.0
+    sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
     # proxyHost: hostname of the csm-authorization server
     # Default value: None
     proxyHost:
@@ -178,3 +178,5 @@ cert-manager:
     enabled: false
     serviceAccount:
       create: false
+# Optionally, uncomment and specify the name of the pre-created namespace to install the module in it
+# namespace: