Merge pull request #1135 from k8s-infra-cherrypick-robot/cherry-pick-…

…1044-to-release-0.12 [release-0.12] helm: make master port configurable
kubernetes-sigs · Apr 14, 2023 · 83484b2 · 83484b2
2 parents 221359a + 4a29e93
commit 83484b2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/deployment/helm/node-feature-discovery/templates/master.yaml b/deployment/helm/node-feature-discovery/templates/master.yaml
@@ -39,7 +39,7 @@ spec:
             exec:
               command:
               - "/usr/bin/grpc_health_probe"
-              - "-addr=:8080"
+              - "-addr=:{{ .Values.master.port | default "8080" }}"
               {{- if .Values.tls.enable }}
               - "-tls"
               - "-tls-ca-cert=/etc/kubernetes/node-feature-discovery/certs/ca.crt"
@@ -52,7 +52,7 @@ spec:
             exec:
               command:
               - "/usr/bin/grpc_health_probe"
-              - "-addr=:8080"
+              - "-addr=:{{ .Values.master.port | default "8080" }}"
               {{- if .Values.tls.enable }}
               - "-tls"
               - "-tls-ca-cert=/etc/kubernetes/node-feature-discovery/certs/ca.crt"
@@ -63,7 +63,7 @@ spec:
             periodSeconds: 10
             failureThreshold: 10
           ports:
-          - containerPort: 8080
+          - containerPort: {{ .Values.master.port | default "8080" }}
             name: grpc
           env:
           - name: NODE_NAME
@@ -78,6 +78,7 @@ spec:
             {{- if .Values.master.instance | empty | not }}
             - "--instance={{ .Values.master.instance }}"
             {{- end }}
+            - "-port={{ .Values.master.port | default "8080" }}"
             {{- if .Values.enableNodeFeatureApi }}
             - "-enable-nodefeature-api"
             {{- end }}

diff --git a/deployment/helm/node-feature-discovery/templates/service.yaml b/deployment/helm/node-feature-discovery/templates/service.yaml
@@ -9,7 +9,7 @@ metadata:
 spec:
   type: {{ .Values.master.service.type }}
   ports:
-    - port: {{ .Values.master.service.port }}
+    - port: {{ .Values.master.service.port | default "8080" }}
       targetPort: grpc
       protocol: TCP
       name: grpc

diff --git a/deployment/helm/node-feature-discovery/values.yaml b/deployment/helm/node-feature-discovery/values.yaml
@@ -13,6 +13,8 @@ namespaceOverride: ""
 enableNodeFeatureApi: false
 
 master:
+  # The TCP port that nfd-master listens for incoming requests. Default: 8080
+  port: 8080
   instance:
   featureApi:
   extraLabelNs: []

diff --git a/docs/deployment/helm.md b/docs/deployment/helm.md
@@ -108,6 +108,7 @@ We have introduced the following Chart parameters.
 | Name                        | Type    | Default                                 | description                                                                                                                              |
 |-----------------------------|---------|-----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------|
 | `master.*`                  | dict    |                                         | NFD master deployment configuration                                                                                                      |
+| `master.port`               | integer |                                         | Specifies the TCP port that nfd-master listens for incoming requests.                                                      |
 | `master.instance`           | string  |                                         | Instance name. Used to separate annotation namespaces for multiple parallel deployments                                                  |
 | `master.extraLabelNs`       | array   | []                                      | List of allowed extra label namespaces                                                                                                   |
 | `master.resourceLabels`     | array   | []                                      | List of labels to be registered as extended resources                                                                                          |