github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Make sshproxy use a hostmount on master PD (don't spam sshKeys on upgrade/reboot).

Browse Source 
Add comment describing what SSHTunnelList.Close() does.
Simplify util.FileExists.
This commit is contained in:
CJ Cullen
2015-06-05 14:49:26 -07:00
parent cb317604ab
commit 04cd9b3c75
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View File

@@ -25,7 +25,7 @@
{% set proxy_ssh_options = "" -%}
{% if grains.proxy_ssh_user is defined -%}
{% set proxy_ssh_options = "--ssh-user=" + grains.proxy_ssh_user + " --ssh-keyfile=/sshproxy/.sshkeyfile" -%}
{% set proxy_ssh_options = "--ssh-user=" + grains.proxy_ssh_user + " --ssh-keyfile=/srv/sshproxy/.sshkeyfile" -%}
{% endif -%}
{% set address = "--address=127.0.0.1" -%}
@@ -143,8 +143,8 @@
{ "name": "etcpkitls",
"mountPath": "/etc/pki/tls",
"readOnly": true},
{ "name": "sshproxy",
"mountPath": "/sshproxy",
{ "name": "srvsshproxy",
"mountPath": "/srv/sshproxy",
"readOnly": false}
]
}
@@ -191,8 +191,9 @@
"hostPath": {
"path": "/etc/pki/tls"}
},
{ "name": "sshproxy",
"emptyDir": {}
{ "name": "srvsshproxy",
"hostPath": {
"path": "/srv/sshproxy"}
}
]
}}