From 3543aa22cee88d501d277c0b281836bae613ab36 Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Arango Gutierrez Date: Tue, 3 Oct 2023 07:32:52 +0200 Subject: [PATCH] Helm - Move remaining gPRC related flags to conditional Signed-off-by: Carlos Eduardo Arango Gutierrez --- deployment/helm/node-feature-discovery/templates/master.yaml | 2 +- deployment/helm/node-feature-discovery/templates/worker.yaml | 2 +- deployment/helm/node-feature-discovery/values.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deployment/helm/node-feature-discovery/templates/master.yaml b/deployment/helm/node-feature-discovery/templates/master.yaml index 26f81270e7..7e7cdcce67 100644 --- a/deployment/helm/node-feature-discovery/templates/master.yaml +++ b/deployment/helm/node-feature-discovery/templates/master.yaml @@ -69,8 +69,8 @@ spec: {{- if .Values.master.instance | empty | not }} - "-instance={{ .Values.master.instance }}" {{- end }} - - "-port={{ .Values.master.port | default "8080" }}" {{- if not .Values.enableNodeFeatureApi }} + - "-port={{ .Values.master.port | default "8080" }}" - "-enable-nodefeature-api=false" {{- else if gt (int .Values.master.replicaCount) 1 }} - "-enable-leader-election" diff --git a/deployment/helm/node-feature-discovery/templates/worker.yaml b/deployment/helm/node-feature-discovery/templates/worker.yaml index 0e56eb5d1d..ac9f9b2db8 100644 --- a/deployment/helm/node-feature-discovery/templates/worker.yaml +++ b/deployment/helm/node-feature-discovery/templates/worker.yaml @@ -49,8 +49,8 @@ spec: command: - "nfd-worker" args: - - "-server={{ include "node-feature-discovery.fullname" . }}-master:{{ .Values.master.service.port }}" {{- if not .Values.enableNodeFeatureApi }} + - "-server={{ include "node-feature-discovery.fullname" . }}-master:{{ .Values.master.service.port }}" - "-enable-nodefeature-api=false" {{- end }} {{- if .Values.tls.enable }} diff --git a/deployment/helm/node-feature-discovery/values.yaml b/deployment/helm/node-feature-discovery/values.yaml index 98b39ac420..d735b9100c 100644 --- a/deployment/helm/node-feature-discovery/values.yaml +++ b/deployment/helm/node-feature-discovery/values.yaml @@ -45,6 +45,8 @@ master: # nfdApiParallelism: 10 ### # The TCP port that nfd-master listens for incoming requests. Default: 8080 + # Deprecated this parameter is related to the deprecated gRPC API and will + # be removed with it in a future release port: 8080 metricsPort: 8081 instance: