Improvement: Cleanup of flags, handle --resolv-conf flag deprecation (#…

…329) Signed-off-by: archups <[email protected]>
kubermatic · Nov 21, 2023 · cfc41fb · cfc41fb
1 parent f1e9ab1
commit cfc41fb
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 143 deletions.
diff --git a/deploy/osps/default/osp-amzn2.yaml b/deploy/osps/default/osp-amzn2.yaml
@@ -517,7 +517,7 @@ spec:
               ExecStartPre=/bin/bash /opt/disable-swap.sh
               ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
               ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-              ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+              ExecStart=/opt/bin/kubelet \
                 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
@@ -618,11 +618,8 @@ spec:
               if grep -q coreos /etc/os-release
               then
                 echo "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-              elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-              then
-                echodate "Can't find kubelet service extras directory"
-                exit 1
               else
+                mkdir -p /etc/systemd/system/kubelet.service.d
                 echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
               fi
 

diff --git a/deploy/osps/default/osp-centos.yaml b/deploy/osps/default/osp-centos.yaml
@@ -556,7 +556,7 @@ spec:
               ExecStartPre=/bin/bash /opt/disable-swap.sh
               ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
               ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-              ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+              ExecStart=/opt/bin/kubelet \
                 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
@@ -656,11 +656,8 @@ spec:
               if grep -q coreos /etc/os-release
               then
                 echo "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-              elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-              then
-                echodate "Can't find kubelet service extras directory"
-                exit 1
               else
+                mkdir -p /etc/systemd/system/kubelet.service.d
                 echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
               fi
 

diff --git a/deploy/osps/default/osp-flatcar-cloud-init.yaml b/deploy/osps/default/osp-flatcar-cloud-init.yaml
@@ -488,11 +488,8 @@ spec:
               if grep -q coreos /etc/os-release
               then
                 echo -e "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-              elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-              then
-                echodate "Can't find kubelet service extras directory"
-                exit 1
               else
+                mkdir -p /etc/systemd/system/kubelet.service.d
                 echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
               fi
 
@@ -539,7 +536,7 @@ spec:
 
               ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
               ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-              ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+              ExecStart=/opt/bin/kubelet \
                 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
@@ -574,13 +571,6 @@ spec:
               [Install]
               WantedBy=multi-user.target
 
-      - path: /etc/systemd/system/kubelet.service.d/extras.conf
-        content:
-          inline:
-            data: |
-              [Service]
-              Environment="KUBELET_EXTRA_ARGS=--resolv-conf=/run/systemd/resolve/resolv.conf"
-
       - path: /opt/bin/setup_kernel_for_kubelet.sh
         permissions: 755
         content:
@@ -717,6 +707,7 @@ spec:
               - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
               volumePluginDir: /var/lib/kubelet/volumeplugins
               volumeStatsAggPeriod: 0s
+              resolvConf: /run/systemd/resolve/resolv.conf
 
       - path: /etc/systemd/system/kubelet-healthcheck.service
         permissions: 644

diff --git a/deploy/osps/default/osp-flatcar.yaml b/deploy/osps/default/osp-flatcar.yaml
@@ -478,11 +478,8 @@ spec:
               if grep -q coreos /etc/os-release
               then
                 echo -e "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-              elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-              then
-                echodate "Can't find kubelet service extras directory"
-                exit 1
               else
+                mkdir -p /etc/systemd/system/kubelet.service.d
                 echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
               fi
 
@@ -598,7 +595,7 @@ spec:
 
               ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
               ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-              ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+              ExecStart=/opt/bin/kubelet \
                 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
@@ -633,13 +630,6 @@ spec:
               [Install]
               WantedBy=multi-user.target
 
-      - path: /etc/systemd/system/kubelet.service.d/extras.conf
-        content:
-          inline:
-            data: |
-              [Service]
-              Environment="KUBELET_EXTRA_ARGS=--resolv-conf=/run/systemd/resolve/resolv.conf"
-
       - path: /etc/kubernetes/cloud-config
         permissions: 600
         content:
@@ -759,6 +749,7 @@ spec:
               - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
               volumePluginDir: /var/lib/kubelet/volumeplugins
               volumeStatsAggPeriod: 0s
+              resolvConf: /run/systemd/resolve/resolv.conf
 
       - path: /etc/systemd/system/kubelet-healthcheck.service
         permissions: 644

diff --git a/deploy/osps/default/osp-rhel.yaml b/deploy/osps/default/osp-rhel.yaml
@@ -559,7 +559,7 @@ spec:
               ExecStartPre=/bin/bash /opt/disable-swap.sh
               ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
               ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-              ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+              ExecStart=/opt/bin/kubelet \
                 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
@@ -659,11 +659,8 @@ spec:
               if grep -q coreos /etc/os-release
               then
                 echo "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-              elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-              then
-                echodate "Can't find kubelet service extras directory"
-                exit 1
               else
+                mkdir -p /etc/systemd/system/kubelet.service.d
                 echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
               fi
 

diff --git a/deploy/osps/default/osp-rockylinux.yaml b/deploy/osps/default/osp-rockylinux.yaml
@@ -563,7 +563,7 @@ spec:
               ExecStartPre=/bin/bash /opt/disable-swap.sh
               ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
               ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-              ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+              ExecStart=/opt/bin/kubelet \
                 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
@@ -663,11 +663,8 @@ spec:
               if grep -q coreos /etc/os-release
               then
                 echo "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-              elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-              then
-                echodate "Can't find kubelet service extras directory"
-                exit 1
               else
+                mkdir -p /etc/systemd/system/kubelet.service.d
                 echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
               fi
 

diff --git a/deploy/osps/default/osp-ubuntu.yaml b/deploy/osps/default/osp-ubuntu.yaml
@@ -565,7 +565,7 @@ spec:
               ExecStartPre=/bin/bash /opt/disable-swap.sh
               ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
               ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-              ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+              ExecStart=/opt/bin/kubelet \
                 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
@@ -600,14 +600,6 @@ spec:
               [Install]
               WantedBy=multi-user.target
 
-      - path: /etc/systemd/system/kubelet.service.d/extras.conf
-        content:
-          inline:
-            encoding: b64
-            data: |
-              [Service]
-              Environment="KUBELET_EXTRA_ARGS=--resolv-conf=/run/systemd/resolve/resolv.conf"
-
       - path: /etc/kubernetes/cloud-config
         permissions: 600
         content:
@@ -673,11 +665,8 @@ spec:
               if grep -q coreos /etc/os-release
               then
                 echo "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-              elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-              then
-                echodate "Can't find kubelet service extras directory"
-                exit 1
               else
+                mkdir -p /etc/systemd/system/kubelet.service.d
                 echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
               fi
 
@@ -827,6 +816,7 @@ spec:
               - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
               volumePluginDir: /var/lib/kubelet/volumeplugins
               volumeStatsAggPeriod: 0s
+              resolvConf: /run/systemd/resolve/resolv.conf
 
       - path: /etc/systemd/system/kubelet-healthcheck.service
         permissions: 644

diff --git a/pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml b/pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
@@ -247,11 +247,8 @@ spec:
             if grep -q coreos /etc/os-release
             then
               echo -e "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-            elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-            then
-              echodate "Can't find kubelet service extras directory"
-              exit 1
             else
+              mkdir -p /etc/systemd/system/kubelet.service.d
               echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
             fi
       path: /opt/bin/setup_net_env.sh
@@ -424,7 +421,7 @@ spec:
 
             ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
             ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-            ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+            ExecStart=/opt/bin/kubelet \
               --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
               --kubeconfig=/var/lib/kubelet/kubeconfig \
               --config=/etc/kubernetes/kubelet.conf \
@@ -440,13 +437,6 @@ spec:
             WantedBy=multi-user.target
       path: /etc/systemd/system/kubelet.service
       permissions: 644
-    - content:
-        inline:
-          data: |
-            [Service]
-            Environment="KUBELET_EXTRA_ARGS=--resolv-conf=/run/systemd/resolve/resolv.conf"
-      path: /etc/systemd/system/kubelet.service.d/extras.conf
-      permissions: 644
     - content:
         inline:
           data: |+
@@ -534,6 +524,7 @@ spec:
             - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
             volumePluginDir: /var/lib/kubelet/volumeplugins
             volumeStatsAggPeriod: 0s
+            resolvConf: /run/systemd/resolve/resolv.conf
       path: /etc/kubernetes/kubelet.conf
       permissions: 644
     - content:

diff --git a/pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml b/pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml
@@ -392,7 +392,7 @@ spec:
             ExecStartPre=/bin/bash /opt/disable-swap.sh
             ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
             ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-            ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+            ExecStart=/opt/bin/kubelet \
               --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
               --kubeconfig=/var/lib/kubelet/kubeconfig \
               --config=/etc/kubernetes/kubelet.conf \
@@ -409,14 +409,6 @@ spec:
           encoding: b64
       path: /etc/systemd/system/kubelet.service
       permissions: 644
-    - content:
-        inline:
-          data: |
-            [Service]
-            Environment="KUBELET_EXTRA_ARGS=--resolv-conf=/run/systemd/resolve/resolv.conf"
-          encoding: b64
-      path: /etc/systemd/system/kubelet.service.d/extras.conf
-      permissions: 644
     - content:
         inline:
           data: |+
@@ -457,11 +449,8 @@ spec:
             if grep -q coreos /etc/os-release
             then
               echo "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-            elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-            then
-              echodate "Can't find kubelet service extras directory"
-              exit 1
             else
+              mkdir -p /etc/systemd/system/kubelet.service.d
               echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
             fi
           encoding: b64
@@ -596,6 +585,7 @@ spec:
             - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
             volumePluginDir: /var/lib/kubelet/volumeplugins
             volumeStatsAggPeriod: 0s
+            resolvConf: /run/systemd/resolve/resolv.conf
           encoding: b64
       path: /etc/kubernetes/kubelet.conf
       permissions: 644

diff --git a/pkg/controllers/osc/testdata/osc-rhel-8.x-azure-containerd.yaml b/pkg/controllers/osc/testdata/osc-rhel-8.x-azure-containerd.yaml
@@ -433,7 +433,7 @@ spec:
             ExecStartPre=/bin/bash /opt/disable-swap.sh
             ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
             ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-            ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+            ExecStart=/opt/bin/kubelet \
               --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
               --kubeconfig=/var/lib/kubelet/kubeconfig \
               --config=/etc/kubernetes/kubelet.conf \
@@ -487,11 +487,8 @@ spec:
             if grep -q coreos /etc/os-release
             then
               echo "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-            elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-            then
-              echodate "Can't find kubelet service extras directory"
-              exit 1
             else
+              mkdir -p /etc/systemd/system/kubelet.service.d
               echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
             fi
           encoding: b64

diff --git a/pkg/controllers/osc/testdata/osc-rhel-8.x-cloud-init-modules.yaml b/pkg/controllers/osc/testdata/osc-rhel-8.x-cloud-init-modules.yaml
@@ -404,7 +404,7 @@ spec:
             ExecStartPre=/bin/bash /opt/disable-swap.sh
             ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
             ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-            ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+            ExecStart=/opt/bin/kubelet \
               --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
               --kubeconfig=/var/lib/kubelet/kubeconfig \
               --config=/etc/kubernetes/kubelet.conf \
@@ -464,11 +464,8 @@ spec:
             if grep -q coreos /etc/os-release
             then
               echo "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-            elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-            then
-              echodate "Can't find kubelet service extras directory"
-              exit 1
             else
+              mkdir -p /etc/systemd/system/kubelet.service.d
               echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
             fi
           encoding: b64

diff --git a/pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml b/pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml
@@ -392,7 +392,7 @@ spec:
             ExecStartPre=/bin/bash /opt/disable-swap.sh
             ExecStartPre=/bin/bash /opt/load-kernel-modules.sh
             ExecStartPre=/bin/bash /opt/bin/setup_net_env.sh
-            ExecStart=/opt/bin/kubelet $KUBELET_EXTRA_ARGS \
+            ExecStart=/opt/bin/kubelet \
               --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
               --kubeconfig=/var/lib/kubelet/kubeconfig \
               --config=/etc/kubernetes/kubelet.conf \
@@ -409,14 +409,6 @@ spec:
           encoding: b64
       path: /etc/systemd/system/kubelet.service
       permissions: 644
-    - content:
-        inline:
-          data: |
-            [Service]
-            Environment="KUBELET_EXTRA_ARGS=--resolv-conf=/run/systemd/resolve/resolv.conf"
-          encoding: b64
-      path: /etc/systemd/system/kubelet.service.d/extras.conf
-      permissions: 644
     - content:
         inline:
           data: |+
@@ -457,11 +449,8 @@ spec:
             if grep -q coreos /etc/os-release
             then
               echo "KUBELET_NODE_IP=${DEFAULT_IFC_IP}\nKUBELET_HOSTNAME=${FULL_HOSTNAME}" > /etc/kubernetes/nodeip.conf
-            elif [ ! -d /etc/systemd/system/kubelet.service.d ]
-            then
-              echodate "Can't find kubelet service extras directory"
-              exit 1
             else
+              mkdir -p /etc/systemd/system/kubelet.service.d
               echo -e "[Service]\nEnvironment=\"KUBELET_NODE_IP=${DEFAULT_IFC_IP}\"\nEnvironment=\"KUBELET_HOSTNAME=${FULL_HOSTNAME}\"" > /etc/systemd/system/kubelet.service.d/nodeip.conf
             fi
           encoding: b64
@@ -600,6 +589,7 @@ spec:
             - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
             volumePluginDir: /var/lib/kubelet/volumeplugins
             volumeStatsAggPeriod: 0s
+            resolvConf: /run/systemd/resolve/resolv.conf
           encoding: b64
       path: /etc/kubernetes/kubelet.conf
       permissions: 644