chore: Remove legacy NODE_NAME CLI arg/env var

Author: sbernauer

CHANGELOG.md

@@ -32,7 +32,9 @@ All notable changes to this project will be documented in this file.
 - BREAKING: Bump stackable-operator to 0.94.0 and update other dependencies ([#320]).
   - The default Kubernetes cluster domain name is now fetched from the kubelet API unless explicitly configured.
   - This requires operators to have the RBAC permission to get nodes/proxy in the apiGroup "". The helm-chart takes care of this.
-  - The CLI argument `--kubernetes-node-name` or env variable `KUBERNETES_NODE_NAME` needs to be set. The helm-chart takes care of this.
+  - The CLI argument `--kubernetes-node-name` or env variable `KUBERNETES_NODE_NAME` needs to be set.
+    It supersedes the old argument/env variable `NODE_NAME`.
+    The helm-chart takes care of this.
 
 ### Fixed
 

deploy/helm/listener-operator/templates/controller-deployment.yaml

@@ -42,17 +42,19 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: /csi/csi.sock
-            {{- if .Values.kubernetesClusterDomain }}
-            - name: KUBERNETES_CLUSTER_DOMAIN
-              value: {{ .Values.kubernetesClusterDomain | quote }}
-            {{- end }}
-            {{- include "telemetry.envVars" . | nindent 12 }}
+
             # Operators need to know the node name they are running on, to e.g. discover the
             # Kubernetes domain name from the kubelet API.
             - name: KUBERNETES_NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+
+            {{- if .Values.kubernetesClusterDomain }}
+            - name: KUBERNETES_CLUSTER_DOMAIN
+              value: {{ .Values.kubernetesClusterDomain | quote }}
+            {{- end }}
+            {{- include "telemetry.envVars" . | nindent 12 }}
           volumeMounts:
             - name: csi
               mountPath: /csi

deploy/helm/listener-operator/templates/node-daemonset.yaml

@@ -41,22 +41,19 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: /csi/csi.sock
-            - name: NODE_NAME
+
+            # Operators need to know the node name they are running on, to e.g. discover the
+            # Kubernetes domain name from the kubelet API.
+            - name: KUBERNETES_NODE_NAME
               valueFrom:
                 fieldRef:
-                  apiVersion: v1
                   fieldPath: spec.nodeName
+
             {{- if .Values.kubernetesClusterDomain }}
             - name: KUBERNETES_CLUSTER_DOMAIN
               value: {{ .Values.kubernetesClusterDomain | quote }}
             {{- end }}
             {{- include "telemetry.envVars" . | nindent 12 }}
-            # Operators need to know the node name they are running on, to e.g. discover the
-            # Kubernetes domain name from the kubelet API.
-            - name: KUBERNETES_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
           volumeMounts:
             - name: csi
               mountPath: /csi

rust/operator-binary/src/main.rs

@@ -59,10 +59,7 @@ struct ListenerOperatorRun {
 #[derive(Debug, clap::Parser, strum::AsRefStr, strum::Display)]
 enum RunMode {
     Controller,
-    Node {
-        #[clap(long, env)]
-        node_name: String,
-    },
+    Node,
 }
 
 mod built_info {
@@ -143,11 +140,12 @@ async fn main() -> anyhow::Result<()> {
                         .await
                         .map_err(|err| err.factor_first().0)?;
                 }
-                RunMode::Node { node_name } => {
+                RunMode::Node => {
+                    let node_name = &cluster_info_opts.kubernetes_node_name;
                     csi_server
                         .add_service(NodeServer::new(ListenerOperatorNode {
                             client: client.clone(),
-                            node_name,
+                            node_name: node_name.to_owned(),
                         }))
                         .serve_with_incoming_shutdown(csi_listener, sigterm.recv().map(|_| ()))
                         .await?;