From 75aec879b87140db1cd57cb253b74301022870fa Mon Sep 17 00:00:00 2001 From: VedRatan Date: Fri, 28 Feb 2025 20:07:49 +0530 Subject: [PATCH 1/5] NDEV-21780 feat: added option to include cluster labels in kube-controller Signed-off-by: VedRatan --- .../templates/nirmata-kube-controller.yaml | 4 ++++ charts/nirmata-kube-controller/values.yaml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/charts/nirmata-kube-controller/templates/nirmata-kube-controller.yaml b/charts/nirmata-kube-controller/templates/nirmata-kube-controller.yaml index c615db1e..930e2fc2 100644 --- a/charts/nirmata-kube-controller/templates/nirmata-kube-controller.yaml +++ b/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 }} diff --git a/charts/nirmata-kube-controller/values.yaml b/charts/nirmata-kube-controller/values.yaml index 45689358..b9ae5180 100644 --- a/charts/nirmata-kube-controller/values.yaml +++ b/charts/nirmata-kube-controller/values.yaml @@ -8,6 +8,9 @@ nirmataURL: "wss://nirmata.io/tunnels" cluster: name: "" type: "default-policy-manager-type" + labels: + app: nirmata-kube-controller + app1: ksfdksafka # Use either apiToken or apiTokenSecret to specify the api token in NPM From a40694cc72780ffe7642ee1e5ffb90008454d6c2 Mon Sep 17 00:00:00 2001 From: VedRatan Date: Fri, 28 Feb 2025 20:10:12 +0530 Subject: [PATCH 2/5] chore: bump chart version Signed-off-by: VedRatan --- charts/nirmata-kube-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nirmata-kube-controller/Chart.yaml b/charts/nirmata-kube-controller/Chart.yaml index 43f66bd7..9499bcb2 100644 --- a/charts/nirmata-kube-controller/Chart.yaml +++ b/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 From 48a5ec25a6cde0320ac47c5bd428e389608718b7 Mon Sep 17 00:00:00 2001 From: VedRatan Date: Fri, 28 Feb 2025 21:15:32 +0530 Subject: [PATCH 3/5] chore: added support for custom image registry for otel and kubecontroller Signed-off-by: VedRatan --- .../templates/nirmata-kube-controller.yaml | 4 ++-- charts/nirmata-kube-controller/values.yaml | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/charts/nirmata-kube-controller/templates/nirmata-kube-controller.yaml b/charts/nirmata-kube-controller/templates/nirmata-kube-controller.yaml index 930e2fc2..5512d8e5 100644 --- a/charts/nirmata-kube-controller/templates/nirmata-kube-controller.yaml +++ b/charts/nirmata-kube-controller/templates/nirmata-kube-controller.yaml @@ -415,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: @@ -517,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 diff --git a/charts/nirmata-kube-controller/values.yaml b/charts/nirmata-kube-controller/values.yaml index b9ae5180..17cbb7bf 100644 --- a/charts/nirmata-kube-controller/values.yaml +++ b/charts/nirmata-kube-controller/values.yaml @@ -3,11 +3,23 @@ # # 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: app: nirmata-kube-controller app1: ksfdksafka @@ -41,5 +53,4 @@ proxy: httpsProxy: "" noProxy: "" -imageRegistry: "ghcr.io/nirmata/nirmata-kube-controller" -imageTag: "v3.10.7" + From ec94c823c10a7715aac7cecdce643229eff8117e Mon Sep 17 00:00:00 2001 From: VedRatan Date: Fri, 28 Feb 2025 21:17:16 +0530 Subject: [PATCH 4/5] chore: remove redundant code Signed-off-by: VedRatan --- charts/nirmata-kube-controller/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/nirmata-kube-controller/values.yaml b/charts/nirmata-kube-controller/values.yaml index 17cbb7bf..23aea177 100644 --- a/charts/nirmata-kube-controller/values.yaml +++ b/charts/nirmata-kube-controller/values.yaml @@ -21,8 +21,8 @@ cluster: name: "" type: default-policy-manager-type labels: - app: nirmata-kube-controller - app1: ksfdksafka + # key: value + # Use either apiToken or apiTokenSecret to specify the api token in NPM From c012ff218fc27a5298d52c1a629f332553a23ba7 Mon Sep 17 00:00:00 2001 From: VedRatan Date: Fri, 28 Feb 2025 21:28:46 +0530 Subject: [PATCH 5/5] fix: lint Signed-off-by: VedRatan --- charts/nirmata-kube-controller/values.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/charts/nirmata-kube-controller/values.yaml b/charts/nirmata-kube-controller/values.yaml index 23aea177..3c1e2774 100644 --- a/charts/nirmata-kube-controller/values.yaml +++ b/charts/nirmata-kube-controller/values.yaml @@ -22,7 +22,6 @@ cluster: type: default-policy-manager-type labels: # key: value - # Use either apiToken or apiTokenSecret to specify the api token in NPM @@ -52,5 +51,3 @@ proxy: httpProxy: "" httpsProxy: "" noProxy: "" - -