Skip to content

Commit d92a110

Browse files
authored
Merge pull request #123 from stackhpc/upstream/yoga-2023-04-03
Synchronise yoga with upstream
2 parents 9b77eaf + 01b0ce0 commit d92a110

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
187187
--pid host \\
188188
--network host \\
189189
--entrypoint /hyperkube \\
190-
--volume /:/rootfs:ro \\
190+
--volume /:/rootfs:rslave,ro \\
191191
--volume /etc/cni/net.d:/etc/cni/net.d:ro,z \\
192192
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
193193
--volume /usr/lib/os-release:/usr/lib/os-release:ro \\

magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
8585
--pid host \\
8686
--network host \\
8787
--entrypoint /hyperkube \\
88-
--volume /:/rootfs:ro \\
88+
--volume /:/rootfs:rslave,ro \\
8989
--volume /etc/cni/net.d:/etc/cni/net.d:ro,z \\
9090
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
9191
--volume /usr/lib/os-release:/usr/lib/os-release:ro \\

magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,8 @@ data:
7474
Corefile: |
7575
.:53 {
7676
errors
77-
log stdout
78-
health {
79-
lameduck 5s
80-
}
81-
ready
77+
log
78+
health
8279
kubernetes ${DNS_CLUSTER_DOMAIN} ${PORTAL_NETWORK_CIDR} ${PODS_NETWORK_CIDR} {
8380
pods verified
8481
fallthrough in-addr.arpa ip6.arpa

magnum/drivers/k8s_coreos_v1/templates/fragments/enable-coredns.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ write_files:
4848
Corefile: |
4949
.:53 {
5050
errors
51-
log stdout
51+
log
5252
health
5353
kubernetes ${DNS_CLUSTER_DOMAIN} {
5454
cidrs ${PORTAL_NETWORK_CIDR}

0 commit comments

Comments
 (0)