Support for custom host mount for contrail-node-init

Init container 'contrail-node-init' currently mounts /usr/bin folder. However, some systems such as Fedora Atomic do not allow writing on this directory. This change provides support for setting a custom hostMount path. This way, users can provide a different path that is writable in other systems, like Atomic. Change-Id: If123ffa4a88fdad19356c421a4572b2751c05b51 Closes-Bug: #1781605 (cherry picked from commit be3ce16)
Juniper · Aug 2, 2018 · 35dd187 · 35dd187
1 parent e98d4a6
commit 35dd187
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 10 deletions.
diff --git a/contrail-analytics/templates/daemonset-analytics.yaml b/contrail-analytics/templates/daemonset-analytics.yaml
@@ -177,7 +177,7 @@ spec:
           path: /var/crashes
       - name: host-usr-bin
         hostPath:
-          path: /usr/bin
+          path: {{ .Values.volumeMounts.host_usr_bin.hostPath }}
       - name: ssl-dir
         hostPath:
           path: /etc/contrail/ssl

diff --git a/contrail-analytics/values.yaml b/contrail-analytics/values.yaml
@@ -97,6 +97,11 @@ service:
 ingress:
   analytics_api_host: "contrail-analytics-api"
 
+# VolumeMounts related inputs are defined here
+volumeMounts:
+  host_usr_bin:
+    hostPath: '/usr/bin'
+
 manifests:
   configmap_analytics_env: true
   configmap_analytics_keystone: true

diff --git a/contrail-controller/templates/daemonset-config.yaml b/contrail-controller/templates/daemonset-config.yaml
@@ -155,7 +155,7 @@ spec:
           path: /var/crashes
       - name: host-usr-bin
         hostPath:
-          path: /usr/bin
+          path: {{ .Values.volumeMounts.host_usr_bin.hostPath }}
       - name: ssl-dir
         hostPath:
           path: /etc/contrail/ssl

diff --git a/contrail-controller/templates/daemonset-control-only.yaml b/contrail-controller/templates/daemonset-control-only.yaml
@@ -75,7 +75,7 @@ spec:
           path: /var/crashes
       - name: host-usr-bin
         hostPath:
-          path: /usr/bin
+          path: {{ .Values.volumeMounts.host_usr_bin.hostPath }}
       - name: ssl-dir
         hostPath:
           path: /etc/contrail/ssl

diff --git a/contrail-controller/templates/daemonset-control.yaml b/contrail-controller/templates/daemonset-control.yaml
@@ -140,7 +140,7 @@ spec:
           path: /var/crashes
       - name: host-usr-bin
         hostPath:
-          path: /usr/bin
+          path: {{ .Values.volumeMounts.host_usr_bin.hostPath }}
       - name: ssl-dir
         hostPath:
           path: /etc/contrail/ssl

diff --git a/contrail-controller/templates/daemonset-webui.yaml b/contrail-controller/templates/daemonset-webui.yaml
@@ -103,7 +103,7 @@ spec:
           path: /var/crashes/contrail/webui
       - name: host-usr-bin
         hostPath:
-          path: /usr/bin
+          path: {{ .Values.volumeMounts.host_usr_bin.hostPath }}
       - name: ssl-dir
         hostPath:
           path: /etc/contrail/ssl

diff --git a/contrail-controller/values.yaml b/contrail-controller/values.yaml
@@ -208,6 +208,11 @@ ingress:
   config_api_host: "contrail-config-api"
   webui_host: "contrail-webui"
 
+# VolumeMounts related inputs are defined here
+volumeMounts:
+  host_usr_bin:
+    hostPath: '/usr/bin'
+
 manifests:
   configmap_controller_env: true
   configmap_controller_keystone: true

diff --git a/contrail-thirdparty/templates/daemonset-analyticsdb-nodemgr.yaml b/contrail-thirdparty/templates/daemonset-analyticsdb-nodemgr.yaml
@@ -88,7 +88,7 @@ spec:
           path: /var/crashes
       - name: host-usr-bin
         hostPath:
-          path: /usr/bin
+          path: {{ .Values.volumeMounts.host_usr_bin.hostPath }}
       - name: ssl-dir
         hostPath:
           path: /etc/contrail/ssl

diff --git a/contrail-thirdparty/templates/daemonset-configdb-nodemgr.yaml b/contrail-thirdparty/templates/daemonset-configdb-nodemgr.yaml
@@ -88,7 +88,7 @@ spec:
           path: /var/crashes
       - name: host-usr-bin
         hostPath:
-          path: /usr/bin
+          path: {{ .Values.volumeMounts.host_usr_bin.hostPath }}
       - name: ssl-dir
         hostPath:
           path: /etc/contrail/ssl

diff --git a/contrail-thirdparty/values.yaml b/contrail-thirdparty/values.yaml
@@ -128,6 +128,11 @@ pod:
           min_ready_seconds: 0
           max_unavailable: 1
 
+# VolumeMounts related inputs are defined here
+volumeMounts:
+  host_usr_bin:
+    hostPath: '/usr/bin'
+
 manifests:
   configmap_analytics_zookeeper: true
   configmap_config_zookeeper: true

diff --git a/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml b/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml
@@ -199,7 +199,7 @@ spec:
           path: /bin
       - name: host-usr-bin
         hostPath:
-          path: /usr/bin
+          path: {{ .Values.volumeMounts.host_usr_bin.hostPath }}
       - name: host-dev
         hostPath:
           path: /dev

diff --git a/contrail-vrouter/templates/daemonset-vrouter-agent-kernel.yaml b/contrail-vrouter/templates/daemonset-vrouter-agent-kernel.yaml
@@ -185,7 +185,7 @@ spec:
           path: /var/run/libvirt
       - name: host-usr-bin
         hostPath:
-          path: /usr/bin
+          path: {{ .Values.volumeMounts.host_usr_bin.hostPath }}
       - name: host-dev-log
         hostPath:
           path: /dev/log

diff --git a/contrail-vrouter/templates/daemonset-vrouter-agent-sriov.yaml b/contrail-vrouter/templates/daemonset-vrouter-agent-sriov.yaml
@@ -255,7 +255,7 @@ spec:
           path: /var/run/libvirt
       - name: host-usr-bin
         hostPath:
-          path: /usr/bin
+          path: {{ .Values.volumeMounts.host_usr_bin.hostPath }}
       - name: host-dev-log
         hostPath:
           path: /dev/log

diff --git a/contrail-vrouter/values.yaml b/contrail-vrouter/values.yaml
@@ -119,6 +119,11 @@ pod:
           min_ready_seconds: 0
           max_unavailable: 1
 
+# VolumeMounts related inputs are defined here
+volumeMounts:
+  host_usr_bin:
+    hostPath: '/usr/bin'
+
 manifests:
   configmap_vrouter_kernel: true
   configmap_vrouter_keystone: true