From 946a28dc76a4af48ef2049fd8e5d073bcae85551 Mon Sep 17 00:00:00 2001 From: Phil Sphicas Date: Thu, 7 Jan 2021 18:03:58 +0000 Subject: [PATCH] Use HostToContainer mountPropagation For any host mounts that include /var/lib/kubelet, use HostToContainer mountPropagation, which avoids creating extra references to mounts in other containers. Affects the following resources: * haproxy-anchor daemonset * kubernetes-apiserver-anchor daemonset * kubernetes-controller-manager-anchor daemonset * kubernetes-scheduler-anchor daemonset Change-Id: Ib7fb018c4c1916d00311a73f64f77a99b682d4c8 --- charts/apiserver/Chart.yaml | 2 +- charts/apiserver/templates/daemonset.yaml | 1 + charts/controller_manager/Chart.yaml | 2 +- charts/controller_manager/templates/daemonset.yaml | 1 + charts/haproxy/Chart.yaml | 2 +- charts/haproxy/templates/daemonset.yaml | 2 ++ charts/scheduler/Chart.yaml | 2 +- charts/scheduler/templates/sched-anchor.yaml | 1 + 8 files changed, 9 insertions(+), 4 deletions(-) diff --git a/charts/apiserver/Chart.yaml b/charts/apiserver/Chart.yaml index 6e608309..d7905fd4 100644 --- a/charts/apiserver/Chart.yaml +++ b/charts/apiserver/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: A chart for Kubernetes API server name: apiserver -version: 0.1.0 +version: 0.1.1 diff --git a/charts/apiserver/templates/daemonset.yaml b/charts/apiserver/templates/daemonset.yaml index 041ca246..ae3ba777 100644 --- a/charts/apiserver/templates/daemonset.yaml +++ b/charts/apiserver/templates/daemonset.yaml @@ -96,6 +96,7 @@ spec: mountPath: /certs - name: host mountPath: /host + mountPropagation: HostToContainer - name: {{ .Values.service.name }}-keys mountPath: /keys - name: {{ .Values.service.name }}-bin diff --git a/charts/controller_manager/Chart.yaml b/charts/controller_manager/Chart.yaml index f42c7ef1..ae00f1ce 100644 --- a/charts/controller_manager/Chart.yaml +++ b/charts/controller_manager/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: A chart for Kubernetes controller-manager name: controller_manager -version: 0.1.0 +version: 0.1.1 diff --git a/charts/controller_manager/templates/daemonset.yaml b/charts/controller_manager/templates/daemonset.yaml index 397b6187..5e67b4e3 100644 --- a/charts/controller_manager/templates/daemonset.yaml +++ b/charts/controller_manager/templates/daemonset.yaml @@ -90,6 +90,7 @@ spec: mountPath: /configmap - name: host mountPath: /host + mountPropagation: HostToContainer - name: secret mountPath: /secret - name: pod-tmp diff --git a/charts/haproxy/Chart.yaml b/charts/haproxy/Chart.yaml index d2702589..592e4953 100644 --- a/charts/haproxy/Chart.yaml +++ b/charts/haproxy/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v1 description: A chart for using HAProxy for Kubernetes API server discovery name: haproxy -version: 0.1.0 +version: 0.1.1 diff --git a/charts/haproxy/templates/daemonset.yaml b/charts/haproxy/templates/daemonset.yaml index ca44ce73..afe8ffac 100644 --- a/charts/haproxy/templates/daemonset.yaml +++ b/charts/haproxy/templates/daemonset.yaml @@ -64,6 +64,7 @@ spec: readOnly: false - name: host mountPath: /host + mountPropagation: HostToContainer containers: - name: anchor image: {{ .Values.images.tags.anchor }} @@ -101,6 +102,7 @@ spec: mountPath: /tmp/etc - name: host mountPath: /host + mountPropagation: HostToContainer - name: pod-tmp mountPath: /tmp volumes: diff --git a/charts/scheduler/Chart.yaml b/charts/scheduler/Chart.yaml index f850d8a4..c470c897 100644 --- a/charts/scheduler/Chart.yaml +++ b/charts/scheduler/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v1 description: A chart for Kubernetes scheduler. name: scheduler -version: 0.1.0 +version: 0.1.1 diff --git a/charts/scheduler/templates/sched-anchor.yaml b/charts/scheduler/templates/sched-anchor.yaml index 4b90c56f..ba4d62d1 100644 --- a/charts/scheduler/templates/sched-anchor.yaml +++ b/charts/scheduler/templates/sched-anchor.yaml @@ -82,6 +82,7 @@ spec: mountPath: /configmap - name: host mountPath: /host + mountPropagation: HostToContainer - name: secret mountPath: /secret - name: pod-tmp