Code Review
/
infra
/
stack
/
kubernetes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update rook-ceph kubernetes deployment
[infra/stack/kubernetes.git]
/
apps
/
ceph
/
kubespray
/
playbooks
/
roles
/
install
/
templates
/
toolbox.yaml.j2
diff --git
a/apps/ceph/kubespray/playbooks/roles/install/templates/toolbox.yaml.j2
b/apps/ceph/kubespray/playbooks/roles/install/templates/toolbox.yaml.j2
index 0dd3c0f92dc32b1701d3e49d55960983121ea953..7e1abf82ab6f9ba5ff7f0d12c001efb29f922385 100644
(file)
--- a/
apps/ceph/kubespray/playbooks/roles/install/templates/toolbox.yaml.j2
+++ b/
apps/ceph/kubespray/playbooks/roles/install/templates/toolbox.yaml.j2
@@
-23,14
+23,21
@@
spec:
args: ["-g", "--", "/usr/local/bin/toolbox.sh"]
imagePullPolicy: IfNotPresent
env:
args: ["-g", "--", "/usr/local/bin/toolbox.sh"]
imagePullPolicy: IfNotPresent
env:
- - name: ROOK_
ADMIN_SECRET
+ - name: ROOK_
CEPH_USERNAME
valueFrom:
secretKeyRef:
name: rook-ceph-mon
valueFrom:
secretKeyRef:
name: rook-ceph-mon
- key: admin-secret
+ key: ceph-username
+ - name: ROOK_CEPH_SECRET
+ valueFrom:
+ secretKeyRef:
+ name: rook-ceph-mon
+ key: ceph-secret
securityContext:
privileged: true
volumeMounts:
securityContext:
privileged: true
volumeMounts:
+ - mountPath: /etc/ceph
+ name: ceph-config
- mountPath: /dev
name: dev
- mountPath: /sys/bus
- mountPath: /dev
name: dev
- mountPath: /sys/bus
@@
-57,3
+64,10
@@
spec:
items:
- key: data
path: mon-endpoints
items:
- key: data
path: mon-endpoints
+ - name: ceph-config
+ emptyDir: {}
+ tolerations:
+ - key: "node.kubernetes.io/unreachable"
+ operator: "Exists"
+ effect: "NoExecute"
+ tolerationSeconds: 5