Add resolv-conf flag to flatcar (#195)

Signed-off-by: Artiom Diomin <[email protected]>
kubermatic · Jul 29, 2022 · 10f171a · 10f171a
1 parent 952f1cd
commit 10f171a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/deploy/osps/default/osp-flatcar.yaml b/deploy/osps/default/osp-flatcar.yaml
@@ -654,6 +654,13 @@ 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: 400
         content:

diff --git a/pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml b/pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
@@ -466,6 +466,13 @@ 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: |+

diff --git a/pkg/controllers/osc/testdata/osc-flatcar-aws-docker.yaml b/pkg/controllers/osc/testdata/osc-flatcar-aws-docker.yaml
@@ -466,6 +466,13 @@ 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: |+

diff --git a/pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml b/pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
diff --git a/pkg/controllers/osc/testdata/secret-flatcar-aws-docker-provisioning.yaml b/pkg/controllers/osc/testdata/secret-flatcar-aws-docker-provisioning.yaml