Merge pull request #2365 from darkmuggle/pr/different-templates

Bug 1920027: use separate dropin files for kubelet
openshift · Jan 30, 2021 · 3837e38 · 3837e38
2 parents aa24386 + 11d4534
commit 3837e38
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/templates/common/_base/units/kubelet.service-proxy.yaml b/templates/common/_base/units/kubelet.service-proxy.yaml
@@ -0,0 +1,8 @@
+name: kubelet.service
+dropins:
+  - name: 10-mco-default-env.conf
+    contents: |
+      {{if .Proxy -}}
+      [Service]
+      EnvironmentFile=/etc/mco/proxy.env
+      {{end -}}
diff --git a/templates/common/_base/units/kubelet.service.yaml b/templates/common/_base/units/kubelet.service.yaml
@@ -1,11 +1,5 @@
 name: kubelet.service
 dropins:
-  - name: 10-mco-default-env.conf
-    contents: |
-      {{if .Proxy -}}
-      [Service]
-      EnvironmentFile=/etc/mco/proxy.env
-      {{end -}}
   - name: 10-mco-default-madv.conf
     contents: |
       [Service]