Skip to content

Use /etc/openstack to mount the config and secrets #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Jul 6, 2021
Merged

Use /etc/openstack to mount the config and secrets #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08e7484
Use /etc/openstack to mount the config and secrets
Fedosin Jul 5, 2021
95318db
Fix openstack CCM binary path
Fedosin Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/cloud/openstack/assets/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ data:
cloud.conf: |
[Global]
use-clouds = true
clouds-file = /etc/kubernetes/secret/clouds.yaml
clouds-file = /etc/openstack/secret/clouds.yaml
cloud = openstack
kind: ConfigMap
metadata:
Expand Down
8 changes: 4 additions & 4 deletions pkg/cloud/openstack/assets/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
imagePullPolicy: "IfNotPresent"
env:
- name: CLOUD_CONFIG
value: /etc/kubernetes/config/cloud.conf
value: /etc/openstack/config/cloud.conf
args:
- --v=1
- --cloud-config=$(CLOUD_CONFIG)
Expand All @@ -68,7 +68,7 @@ spec:
else
URL_ONLY_KUBECONFIG=/etc/kubernetes/kubeconfig
fi
exec /bin/openstack-cloud-controller-manager
exec /usr/bin/openstack-cloud-controller-manager
resources:
requests:
cpu: 200m
Expand All @@ -78,10 +78,10 @@ spec:
name: host-etc-kube
readOnly: true
- name: secret-occm
mountPath: /etc/kubernetes/secret
mountPath: /etc/openstack/secret
readOnly: true
- name: config-occm
mountPath: /etc/kubernetes/config
mountPath: /etc/openstack/config
readOnly: true
volumes:
- name: host-etc-kube
Expand Down