Restart ccd service only on bootstrap

.github/pull_request_template.md

@@ -33,9 +33,9 @@ Write your release note:
 
 Format of block header: <category> <target_group>
 Possible values:
-- category:       improvement|noteworthy|action
-- target_group:   user|operator|developer
+- category:       breaking|feature|bugfix|doc|other
+- target_group:   user|operator|developer|dependency
 -->
-```improvement operator
+```other operator
 
 ```

Dockerfile

@@ -1,12 +1,12 @@
 ############# builder
-FROM eu.gcr.io/gardener-project/3rd/golang:1.15.5 AS builder
+FROM eu.gcr.io/gardener-project/3rd/golang:1.15.7 AS builder
 
 WORKDIR /go/src/github.com/gardener/gardener-extension-os-ubuntu
 COPY . .
 RUN make install-requirements && make generate && make install
 
 ############# gardener-extension-os-ubuntu
-FROM eu.gcr.io/gardener-project/3rd/alpine:3.12.1 AS gardener-extension-os-ubuntu
+FROM eu.gcr.io/gardener-project/3rd/alpine:3.12.3 AS gardener-extension-os-ubuntu
 
 COPY --from=builder /go/bin/gardener-extension-os-ubuntu /gardener-extension-os-ubuntu
 ENTRYPOINT ["/gardener-extension-os-ubuntu"]

go.mod

@@ -3,7 +3,7 @@ module github.com/gardener/gardener-extension-os-ubuntu
 go 1.15
 
 require (
-	github.com/gardener/gardener v1.13.1
+	github.com/gardener/gardener v1.15.5
 	github.com/gobuffalo/packr v1.30.1
 	github.com/gobuffalo/packr/v2 v2.8.0
 	github.com/google/go-cmp v0.4.1 // indirect

pkg/generator/generator_test.go

@@ -53,6 +53,12 @@ var _ = Describe("Ubuntu OS Generator Test", func() {
 			Expect(err).NotTo(HaveOccurred())
 			expected := string(expectedCloudInit)
 
+			osc.Units = []*commongen.Unit{
+				{
+					Name: "cloud-config-downloader.service",
+				},
+			}
+
 			cloudInit, _, err := g.Generate(osc)
 
 			Expect(err).NotTo(HaveOccurred())
@@ -105,6 +111,9 @@ ExecStartPre=/opt/bin/init-containerd`)
 					Name:    "other.service",
 					Content: content,
 				},
+				{
+					Name: "cloud-config-downloader.service",
+				},
 			}
 
 			cloudInit, _, err := g.Generate(osc)

pkg/generator/templates/cloud-init-ubuntu.template

@@ -54,5 +54,7 @@ runcmd:
 {{ end }}
 {{ end -}}
 {{ range $_, $unit := .Units -}}
+{{- if or (ne $unit.Name "cloud-config-downloader.service") ($.Bootstrap) }}
 - systemctl enable '{{ $unit.Name }}' && systemctl restart '{{ $unit.Name }}'
 {{ end -}}
+{{ end -}}

pkg/generator/testfiles/cloud-init

@@ -28,4 +28,5 @@ runcmd:
 - ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
 - systemctl restart docker
 
+
 - systemctl enable 'docker.service' && systemctl restart 'docker.service'

pkg/generator/testfiles/cloud-init-containerd-provision

@@ -18,3 +18,5 @@ runcmd:
 - systemctl daemon-reload
 
 - systemctl enable containerd && systemctl restart containerd
+
+- systemctl enable 'cloud-config-downloader.service' && systemctl restart 'cloud-config-downloader.service'

pkg/generator/testfiles/cloud-init-with-drop-in

@@ -22,6 +22,9 @@ write_files:
 runcmd:
 - until apt-get update -qq && apt-get install --no-upgrade -qqy docker.io socat nfs-common logrotate jq policykit-1; do sleep 1; done
 - systemctl daemon-reload
+
 - systemctl enable 'abc.service' && systemctl restart 'abc.service'
+
 - systemctl enable 'mtu-customizer.service' && systemctl restart 'mtu-customizer.service'
+
 - systemctl enable 'other.service' && systemctl restart 'other.service'