[release/v1.1] Remove duplicate file resource from flatcar OSP (#314) (…

…#320) Signed-off-by: Waleed Malik <[email protected]> Co-authored-by: Waleed Malik <[email protected]>
kubermatic · Oct 12, 2023 · b804722 · b804722
1 parent 991f123
commit b804722
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 57 deletions.
diff --git a/deploy/osps/default/osp-flatcar.yaml b/deploy/osps/default/osp-flatcar.yaml
@@ -574,25 +574,6 @@ spec:
             data: |
               {{ .KubernetesCACert }}
 
-      - path: /etc/systemd/system/setup.service
-        permissions: 644
-        content:
-          inline:
-            encoding: b64
-            data: |
-              [Install]
-              WantedBy=multi-user.target
-
-              [Unit]
-              Requires=network-online.target
-              After=network-online.target
-
-              [Service]
-              Type=oneshot
-              RemainAfterExit=true
-              EnvironmentFile=-/etc/environment
-              ExecStart=/opt/bin/supervise.sh /opt/bin/setup
-
       - path: /etc/systemd/system/kubelet.service
         content:
           inline:

diff --git a/pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml b/pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
@@ -389,24 +389,6 @@ spec:
             -----END CERTIFICATE-----
       path: /etc/kubernetes/pki/ca.crt
       permissions: 644
-    - content:
-        inline:
-          data: |
-            [Install]
-            WantedBy=multi-user.target
-
-            [Unit]
-            Requires=network-online.target
-            After=network-online.target
-
-            [Service]
-            Type=oneshot
-            RemainAfterExit=true
-            EnvironmentFile=-/etc/environment
-            ExecStart=/opt/bin/supervise.sh /opt/bin/setup
-          encoding: b64
-      path: /etc/systemd/system/setup.service
-      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
@@ -389,24 +389,6 @@ spec:
             -----END CERTIFICATE-----
       path: /etc/kubernetes/pki/ca.crt
       permissions: 644
-    - content:
-        inline:
-          data: |
-            [Install]
-            WantedBy=multi-user.target
-
-            [Unit]
-            Requires=network-online.target
-            After=network-online.target
-
-            [Service]
-            Type=oneshot
-            RemainAfterExit=true
-            EnvironmentFile=-/etc/environment
-            ExecStart=/opt/bin/supervise.sh /opt/bin/setup
-          encoding: b64
-      path: /etc/systemd/system/setup.service
-      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