Skip to content

Commit 2628072

Browse files
vigh-mvigh-m
authored
Merge pull request bottlerocket-os#773 from vigh-m/kubelet-dropin
Add multi-user.target drop in for kubelet restarts
2 parents fba567b + bad1861 commit 2628072

File tree

12 files changed

+48
-0
lines changed

12 files changed

+48
-0
lines changed

‎packages/kubernetes-1.29/kubernetes-1.29.spec‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Source12: kubelet-server-key
5555
Source13: etc-kubernetes-pki-private.mount
5656
Source14: credential-provider-config-yaml
5757
Source15: logdog.kubelet.conf
58+
Source16: multi-user-uphold-kubelet.conf
5859

5960
# ExecStartPre drop-ins
6061
Source20: prestart-load-pause-ctr.conf
@@ -195,6 +196,9 @@ install -p -m 0755 ${fips_output}/kube-proxy %{buildroot}%{_cross_fips_bindir}
195196
install -d %{buildroot}%{_cross_unitdir}
196197
install -p -m 0644 %{S:1} %{S:10} %{S:13} %{buildroot}%{_cross_unitdir}
197198

199+
install -d %{buildroot}%{_cross_unitdir}/multi-user.target.d
200+
install -p -m 0644 %{S:16} %{buildroot}%{_cross_unitdir}/multi-user.target.d/10-kubelet-service.conf
201+
198202
install -d %{buildroot}%{_cross_unitdir}/kubelet.service.d
199203
install -p -m 0644 %{S:20} %{S:21} %{S:22} %{buildroot}%{_cross_unitdir}/kubelet.service.d
200204

@@ -240,6 +244,8 @@ install -p -m 0644 %{S:102} %{buildroot}%{_cross_templatedir}/pod-infra-containe
240244
%{_cross_unitdir}/kubelet.service.d/prestart-load-pause-ctr.conf
241245
%{_cross_unitdir}/kubelet.service.d/make-kubelet-dirs.conf
242246
%{_cross_unitdir}/kubelet.service.d/dockershim-symlink.conf
247+
%dir %{_cross_unitdir}/multi-user.target.d
248+
%{_cross_unitdir}/multi-user.target.d/10-kubelet-service.conf
243249
%dir %{_cross_templatedir}
244250
%{_cross_templatedir}/kubelet-env
245251
%{_cross_templatedir}/kubelet-config

‎packages/kubernetes-1.29/multi-user-uphold-kubelet.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[Unit]
2+
Upholds=kubelet.service

‎packages/kubernetes-1.30/kubernetes-1.30.spec‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Source12: kubelet-server-key
5555
Source13: etc-kubernetes-pki-private.mount
5656
Source14: credential-provider-config-yaml
5757
Source15: logdog.kubelet.conf
58+
Source16: multi-user-uphold-kubelet.conf
5859

5960
# ExecStartPre drop-ins
6061
Source20: prestart-load-pause-ctr.conf
@@ -199,6 +200,9 @@ install -p -m 0644 %{S:1} %{S:10} %{S:13} %{buildroot}%{_cross_unitdir}
199200
install -d %{buildroot}%{_cross_unitdir}/kubelet.service.d
200201
install -p -m 0644 %{S:20} %{S:21} %{S:22} %{buildroot}%{_cross_unitdir}/kubelet.service.d
201202

203+
install -d %{buildroot}%{_cross_unitdir}/multi-user.target.d
204+
install -p -m 0644 %{S:16} %{buildroot}%{_cross_unitdir}/multi-user.target.d/10-kubelet-service.conf
205+
202206
mkdir -p %{buildroot}%{_cross_templatedir}
203207
install -m 0644 %{S:2} %{buildroot}%{_cross_templatedir}/kubelet-env
204208
install -m 0644 %{S:3} %{buildroot}%{_cross_templatedir}/kubelet-config
@@ -241,6 +245,8 @@ install -p -m 0644 %{S:102} %{buildroot}%{_cross_templatedir}/pod-infra-containe
241245
%{_cross_unitdir}/kubelet.service.d/prestart-load-pause-ctr.conf
242246
%{_cross_unitdir}/kubelet.service.d/make-kubelet-dirs.conf
243247
%{_cross_unitdir}/kubelet.service.d/dockershim-symlink.conf
248+
%dir %{_cross_unitdir}/multi-user.target.d
249+
%{_cross_unitdir}/multi-user.target.d/10-kubelet-service.conf
244250
%dir %{_cross_templatedir}
245251
%{_cross_templatedir}/kubelet-env
246252
%{_cross_templatedir}/kubelet-config

‎packages/kubernetes-1.30/multi-user-uphold-kubelet.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[Unit]
2+
Upholds=kubelet.service

‎packages/kubernetes-1.31/kubernetes-1.31.spec‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Source12: kubelet-server-key
5555
Source13: etc-kubernetes-pki-private.mount
5656
Source14: credential-provider-config-yaml
5757
Source15: logdog.kubelet.conf
58+
Source16: multi-user-uphold-kubelet.conf
5859

5960
# ExecStartPre drop-ins
6061
Source20: prestart-load-pause-ctr.conf
@@ -199,6 +200,9 @@ install -p -m 0644 %{S:1} %{S:10} %{S:13} %{buildroot}%{_cross_unitdir}
199200
install -d %{buildroot}%{_cross_unitdir}/kubelet.service.d
200201
install -p -m 0644 %{S:20} %{S:21} %{S:22} %{buildroot}%{_cross_unitdir}/kubelet.service.d
201202

203+
install -d %{buildroot}%{_cross_unitdir}/multi-user.target.d
204+
install -p -m 0644 %{S:16} %{buildroot}%{_cross_unitdir}/multi-user.target.d/10-kubelet-service.conf
205+
202206
mkdir -p %{buildroot}%{_cross_templatedir}
203207
install -m 0644 %{S:2} %{buildroot}%{_cross_templatedir}/kubelet-env
204208
install -m 0644 %{S:3} %{buildroot}%{_cross_templatedir}/kubelet-config
@@ -241,6 +245,8 @@ install -p -m 0644 %{S:102} %{buildroot}%{_cross_templatedir}/pod-infra-containe
241245
%{_cross_unitdir}/kubelet.service.d/prestart-load-pause-ctr.conf
242246
%{_cross_unitdir}/kubelet.service.d/make-kubelet-dirs.conf
243247
%{_cross_unitdir}/kubelet.service.d/dockershim-symlink.conf
248+
%dir %{_cross_unitdir}/multi-user.target.d
249+
%{_cross_unitdir}/multi-user.target.d/10-kubelet-service.conf
244250
%dir %{_cross_templatedir}
245251
%{_cross_templatedir}/kubelet-env
246252
%{_cross_templatedir}/kubelet-config

‎packages/kubernetes-1.31/multi-user-uphold-kubelet.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[Unit]
2+
Upholds=kubelet.service

‎packages/kubernetes-1.32/kubernetes-1.32.spec‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ Source12: kubelet-server-key
5454
Source13: etc-kubernetes-pki-private.mount
5555
Source14: credential-provider-config-yaml
5656
Source15: logdog.kubelet.conf
57+
Source16: multi-user-uphold-kubelet.conf
5758

5859
# ExecStartPre drop-ins
5960
Source20: prestart-load-pause-ctr.conf
@@ -198,6 +199,9 @@ install -p -m 0644 %{S:1} %{S:10} %{S:13} %{buildroot}%{_cross_unitdir}
198199
install -d %{buildroot}%{_cross_unitdir}/kubelet.service.d
199200
install -p -m 0644 %{S:20} %{S:21} %{S:22} %{buildroot}%{_cross_unitdir}/kubelet.service.d
200201

202+
install -d %{buildroot}%{_cross_unitdir}/multi-user.target.d
203+
install -p -m 0644 %{S:16} %{buildroot}%{_cross_unitdir}/multi-user.target.d/10-kubelet-service.conf
204+
201205
mkdir -p %{buildroot}%{_cross_templatedir}
202206
install -m 0644 %{S:2} %{buildroot}%{_cross_templatedir}/kubelet-env
203207
install -m 0644 %{S:3} %{buildroot}%{_cross_templatedir}/kubelet-config
@@ -240,6 +244,8 @@ install -p -m 0644 %{S:102} %{buildroot}%{_cross_templatedir}/pod-infra-containe
240244
%{_cross_unitdir}/kubelet.service.d/prestart-load-pause-ctr.conf
241245
%{_cross_unitdir}/kubelet.service.d/make-kubelet-dirs.conf
242246
%{_cross_unitdir}/kubelet.service.d/dockershim-symlink.conf
247+
%dir %{_cross_unitdir}/multi-user.target.d
248+
%{_cross_unitdir}/multi-user.target.d/10-kubelet-service.conf
243249
%dir %{_cross_templatedir}
244250
%{_cross_templatedir}/kubelet-env
245251
%{_cross_templatedir}/kubelet-config

‎packages/kubernetes-1.32/multi-user-uphold-kubelet.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[Unit]
2+
Upholds=kubelet.service

‎packages/kubernetes-1.33/kubernetes-1.33.spec‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ Source12: kubelet-server-key
5454
Source13: etc-kubernetes-pki-private.mount
5555
Source14: credential-provider-config-yaml
5656
Source15: logdog.kubelet.conf
57+
Source16: multi-user-uphold-kubelet.conf
5758

5859
# ExecStartPre drop-ins
5960
Source20: prestart-load-pause-ctr.conf
@@ -200,6 +201,9 @@ install -p -m 0644 %{S:1} %{S:10} %{S:13} %{buildroot}%{_cross_unitdir}
200201
install -d %{buildroot}%{_cross_unitdir}/kubelet.service.d
201202
install -p -m 0644 %{S:20} %{S:21} %{S:22} %{buildroot}%{_cross_unitdir}/kubelet.service.d
202203

204+
install -d %{buildroot}%{_cross_unitdir}/multi-user.target.d
205+
install -p -m 0644 %{S:16} %{buildroot}%{_cross_unitdir}/multi-user.target.d/10-kubelet-service.conf
206+
203207
mkdir -p %{buildroot}%{_cross_templatedir}
204208
install -m 0644 %{S:2} %{buildroot}%{_cross_templatedir}/kubelet-env
205209
install -m 0644 %{S:3} %{buildroot}%{_cross_templatedir}/kubelet-config
@@ -242,6 +246,8 @@ install -p -m 0644 %{S:102} %{buildroot}%{_cross_templatedir}/pod-infra-containe
242246
%{_cross_unitdir}/kubelet.service.d/prestart-load-pause-ctr.conf
243247
%{_cross_unitdir}/kubelet.service.d/make-kubelet-dirs.conf
244248
%{_cross_unitdir}/kubelet.service.d/dockershim-symlink.conf
249+
%dir %{_cross_unitdir}/multi-user.target.d
250+
%{_cross_unitdir}/multi-user.target.d/10-kubelet-service.conf
245251
%dir %{_cross_templatedir}
246252
%{_cross_templatedir}/kubelet-env
247253
%{_cross_templatedir}/kubelet-config

‎packages/kubernetes-1.33/multi-user-uphold-kubelet.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[Unit]
2+
Upholds=kubelet.service

0 commit comments

Comments
 (0)