chore: Remove legacy NODE_NAME CLI arg/env var

Author: sbernauer

CHANGELOG.md

@@ -39,7 +39,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 ([#619]).
   - 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/secret-operator/templates/daemonset.yaml

@@ -36,24 +36,21 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: /csi/csi.sock
-            - name: NODE_NAME
-              valueFrom:
-                fieldRef:
-                  apiVersion: v1
-                  fieldPath: spec.nodeName
             - name: PRIVILEGED
               value: {{ .Values.securityContext.privileged | quote }}
-            {{- 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

docs/modules/secret-operator/pages/troubleshooting.adoc

@@ -16,7 +16,7 @@
 .. Is the StorageClass configured to use the provisioner named `secrets.stackable.tech`?
 . Does the PersistentVolume have any relevant events? (`kubectl describe pv/$PV_NAME`)
 . Is the CSIDriver object named `secrets.stackable.tech` configured correctly?
-. Is the CSI driver registered on the relevant CSINode objects? (`kubectl get csinode/$NODE_NAME -o yaml` should contain the driver `secrets.stackable.tech`)
+. Is the CSI driver registered on the relevant CSINode objects? (`kubectl get csinode/$KUBERNETES_NODE_NAME -o yaml` should contain the driver `secrets.stackable.tech`)
 .. If not, please check if your Kubernetes distribution uses a non-default kubelet dir.
    The distributions known to be using a non-default kubelet dir are listed in the xref:installation.adoc[installation guide].
    Please follow the special installation guide there.

rust/operator-binary/src/main.rs

@@ -39,9 +39,6 @@ struct SecretOperatorRun {
     #[clap(long, env)]
     csi_endpoint: PathBuf,
 
-    #[clap(long, env)]
-    node_name: String,
-
     /// Unprivileged mode disables any features that require running secret-operator in a privileged container.
     ///
     /// Currently, this means that:
@@ -69,7 +66,6 @@ async fn main() -> anyhow::Result<()> {
         }
         stackable_operator::cli::Command::Run(SecretOperatorRun {
             csi_endpoint,
-            node_name,
             privileged,
             common:
                 ProductOperatorRun {
@@ -122,7 +118,7 @@ async fn main() -> anyhow::Result<()> {
                     }))
                     .add_service(NodeServer::new(SecretProvisionerNode {
                         client: client.clone(),
-                        node_name,
+                        node_name: cluster_info_opts.kubernetes_node_name.to_owned(),
                         privileged,
                     }))
                     .serve_with_incoming_shutdown(

tests/templates/kuttl/kerberos-ad/kinit-client.yaml.j2

@@ -21,7 +21,7 @@ spec:
               echo listing keytab contents
               klist -k /stackable/krb/keytab -teKC
               echo kiniting node
-              kinit -kt /stackable/krb/keytab -p HTTP/$NODE_NAME
+              kinit -kt /stackable/krb/keytab -p HTTP/$KUBERNETES_NODE_NAME
               echo kiniting service
               kinit -kt /stackable/krb/keytab -p HTTP/krb5-client.$NAMESPACE.svc.cluster.local
               echo kiniting pod
@@ -33,7 +33,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.name
-            - name: NODE_NAME
+            - name: KUBERNETES_NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName

tests/templates/kuttl/kerberos/kinit-client.yaml.j2

@@ -20,7 +20,7 @@ spec:
               echo listing keytab contents
               klist -k /stackable/krb/keytab -teKC
               echo kiniting node
-              kinit -kt /stackable/krb/keytab -p HTTP/$NODE_NAME
+              kinit -kt /stackable/krb/keytab -p HTTP/$KUBERNETES_NODE_NAME
               echo kiniting node ip
               NODE_IP="$(cat /stackable/listener/nodeport-ip/default-address/address)"
               echo node ip is "$NODE_IP"
@@ -36,7 +36,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.name
-            - name: NODE_NAME
+            - name: KUBERNETES_NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName