NDEV-21780 feat: added option to include cluster labels in kube-controller

charts/nirmata-kube-controller/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.7-rc2
+version: 0.1.7-rc3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/nirmata-kube-controller/templates/nirmata-kube-controller.yaml

@@ -394,6 +394,10 @@ spec:
         - -api-token
         - {{ .Values.apiToken }}
         {{- end }}
+        {{ range $key, $value := .Values.cluster.labels }}
+        - "-cluster-labels"
+        - "{{ $key }}:{{ $value }}"
+        {{ end }}
         {{- if .Values.apiTokenSecret }}
         - -api-token-secret
         - {{ .Values.apiTokenSecret }}
@@ -411,7 +415,7 @@ spec:
         - name: NO_PROXY
           value: {{ .Values.proxy.noProxy }}
         {{- end }}
-        image: "{{ .Values.imageRegistry }}:{{ .Chart.AppVersion | default .Values.imageTag}}"
+        image: "{{ default .Values.global.imageRegistry .Values.kubeController.imageRegistry}}/{{  default .Values.global.imageRepository .Values.kubeController.imageRepository }}/nirmata-kube-controller:{{ .Chart.AppVersion | default .Values.kubeController.imageTag }}"
         imagePullPolicy: Always
         livenessProbe:
           exec:
@@ -513,7 +517,7 @@ spec:
         command:
         - /otelcol
         - --config=/etc/otel/config.yaml
-        image: ghcr.io/nirmata/opentelemetry-collector:0.92.0
+        image: "{{ default .Values.global.imageRegistry .Values.otelAgent.imageRegistry}}/{{  default .Values.global.imageRepository .Values.otelAgent.imageRepository }}/opentelemetry-collector:{{ .Values.otelAgent.imageTag }}"
         resources:
           limits:
             memory: 512Mi

charts/nirmata-kube-controller/values.yaml

@@ -3,11 +3,25 @@
 # # Declare variables to be passed into your templates.
 
 nirmataURL: "wss://nirmata.io/tunnels"
-
+global:
+  imageRegistry: ghcr.io
+  imageRepository: nirmata
+
+kubeController:
+  imageRegistry:
+  imageRepository:
+  imageTag:
+
+otelAgent:
+  imageRegistry:
+  imageRepository:
+  imageTag: "0.92.0"
 # cluster name is required
 cluster:
   name: ""
-  type: "default-policy-manager-type"
+  type: default-policy-manager-type
+  labels:
+    # key: value
 
 # Use either apiToken or apiTokenSecret to specify the api token in NPM
 
@@ -37,6 +51,3 @@ proxy:
   httpProxy: ""
   httpsProxy: ""
   noProxy: ""
-
-imageRegistry: "ghcr.io/nirmata/nirmata-kube-controller"
-imageTag: "v3.10.7"