Merge pull request #1043 from bcrochet/cluster-config-keepalived

baremetal: keepalived to pass cluster-config.yml to runtimecfg
openshift · Aug 7, 2019 · 675367a · 675367a
2 parents 30cd06a + ccded05
commit 675367a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/manifests/baremetal/keepalived.yaml b/manifests/baremetal/keepalived.yaml
@@ -18,6 +18,9 @@ spec:
       path: "/etc/kubernetes/kubeconfig"
   - name: conf-dir
     empty-dir: {}
+  - name: manifests
+    hostPath:
+      path: "/opt/openshift/manifests"
   initContainers:
   - name: render-config
     image: {{ .Images.BaremetalRuntimeCfgBootstrap }}
@@ -34,6 +37,8 @@ spec:
     - "/config"
     - "--out-dir"
     - "/etc/keepalived"
+    - "--cluster-config"
+    - "/opt/openshift/manifests/cluster-config.yaml"
     resources: {}
     volumeMounts:
     - name: resource-dir
@@ -42,6 +47,8 @@ spec:
       mountPath: "/etc/kubernetes/kubeconfig"
     - name: conf-dir
       mountPath: "/etc/keepalived"
+    - name: manifests
+      mountPath: "/opt/openshift/manifests"
     imagePullPolicy: IfNotPresent
   containers:
   - name: keepalived

diff --git a/pkg/operator/assets/bindata.go b/pkg/operator/assets/bindata.go
@@ -299,6 +299,9 @@ spec:
       path: "/etc/kubernetes/kubeconfig"
   - name: conf-dir
     empty-dir: {}
+  - name: manifests
+    hostPath:
+      path: "/opt/openshift/manifests"
   initContainers:
   - name: render-config
     image: {{ .Images.BaremetalRuntimeCfgBootstrap }}
@@ -315,6 +318,8 @@ spec:
     - "/config"
     - "--out-dir"
     - "/etc/keepalived"
+    - "--cluster-config"
+    - "/opt/openshift/manifests/cluster-config.yaml"
     resources: {}
     volumeMounts:
     - name: resource-dir
@@ -323,6 +328,8 @@ spec:
       mountPath: "/etc/kubernetes/kubeconfig"
     - name: conf-dir
       mountPath: "/etc/keepalived"
+    - name: manifests
+      mountPath: "/opt/openshift/manifests"
     imagePullPolicy: IfNotPresent
   containers:
   - name: keepalived