d7cb8617 by Adam Heath

Still trying to figure out the ssh permissions.

1 parent e5be6c98
...@@ -43,6 +43,22 @@ spec: ...@@ -43,6 +43,22 @@ spec:
43 key: node-role.kubernetes.io/master 43 key: node-role.kubernetes.io/master
44 44
45 volumes: 45 volumes:
46 - name: k8s-bootstrap-ssh-config
47 configMap:
48 name: k8s-bootstrap-config
49 defaultMode: 0600
50 items:
51 - name: SSH_CONFIG
52 path: config
53
54 - name: k8s-bootstrap-ssh-auth
55 secret:
56 secretName: cluster-ssh
57 defaultMode: 0600
58 items:
59 - name: ssh-private-key
60 path: id
61
46 - name: k8s-bootstrap-scripts 62 - name: k8s-bootstrap-scripts
47 configMap: 63 configMap:
48 name: k8s-bootstrap-scripts 64 name: k8s-bootstrap-scripts
...@@ -51,10 +67,6 @@ spec: ...@@ -51,10 +67,6 @@ spec:
51 emptyDir: {} 67 emptyDir: {}
52 - name: git-storage 68 - name: git-storage
53 emptyDir: {} 69 emptyDir: {}
54 - name: cluster-ssh
55 secret:
56 secretName: cluster-ssh
57 defaultMode: 0600
58 70
59 initContainers: 71 initContainers:
60 - name: clone-k8s-start-of-day 72 - name: clone-k8s-start-of-day
...@@ -67,13 +79,12 @@ spec: ...@@ -67,13 +79,12 @@ spec:
67 mountPath: /tmp/k8s-bootstrap-scripts 79 mountPath: /tmp/k8s-bootstrap-scripts
68 - name: cluster-home 80 - name: cluster-home
69 mountPath: /tmp/cluster-home 81 mountPath: /tmp/cluster-home
70 - name: cluster-ssh 82 - name: k8s-bootstrap-ssh-auth
71 mountPath: /tmp/cluster-home/.ssh/id 83 mountPath: /tmp/cluster-home/.ssh/id
72 subPath: ssh-private-key 84 subPath: id
73 - name: cluster-ssh 85 - name: k8s-bootstrap-ssh-config
74 mountPath: /tmp/cluster-home/.ssh/config 86 mountPath: /tmp/cluster-home/.ssh/config
75 subPath: SSH_CONFIG 87 subPath: config
76 mode: 600
77 - name: git-storage 88 - name: git-storage
78 mountPath: /tmp/git-storage 89 mountPath: /tmp/git-storage
79 command: ["/tmp/k8s-bootstrap-scripts/clone-start-of-day"] 90 command: ["/tmp/k8s-bootstrap-scripts/clone-start-of-day"]
......