Skip to content

Commit

Permalink
openstack: keepalived to pass cluster-config.yml to runtimecfg
Browse files Browse the repository at this point in the history
This pulls in fix
openshift#1043 for
openstack.

A recent installer change started using a loopback address in
kubeconfig as the default on the bootstrap node. baremetal-runtimecfg
will begin using cluster-config.yml if it exists first, in order to get
the domain and name of the cluster.

This patch adds a flag for this to the keepalived bootstrap pod in
order to utilize it. This should only affect the bootstrap pods.
  • Loading branch information
mandre committed Aug 8, 2019
1 parent 1e4a8c1 commit 0f45006
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
7 changes: 7 additions & 0 deletions manifests/openstack/keepalived.yaml
Expand Up @@ -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 }}
Expand All @@ -34,6 +37,8 @@ spec:
- "/config"
- "--out-dir"
- "/etc/keepalived"
- "--cluster-config"
- "/opt/openshift/manifests/cluster-config.yaml"
resources: {}
volumeMounts:
- name: resource-dir
Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions pkg/operator/assets/bindata.go
Expand Up @@ -1822,6 +1822,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 }}
Expand All @@ -1838,6 +1841,8 @@ spec:
- "/config"
- "--out-dir"
- "/etc/keepalived"
- "--cluster-config"
- "/opt/openshift/manifests/cluster-config.yaml"
resources: {}
volumeMounts:
- name: resource-dir
Expand All @@ -1846,6 +1851,8 @@ spec:
mountPath: "/etc/kubernetes/kubeconfig"
- name: conf-dir
mountPath: "/etc/keepalived"
- name: manifests
mountPath: "/opt/openshift/manifests"
imagePullPolicy: IfNotPresent
containers:
- name: keepalived
Expand Down

0 comments on commit 0f45006

Please sign in to comment.