Skip to content

K
k3s
Commit 824d8307 authored by Derek Carr's avatar Derek Carr
Browse files
Options

Merge pull request #7427 from jsafrane/devel/fix-vagrant2

Fixed name of kube-proxy path in deployment scripts.
parents 56b7325f 6e810492
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cluster/aws/templates/create-dynamic-salt-files.sh
View file @ 824d8307
...@@ -57,7 +57,7 @@ kubelet_auth_file="/srv/salt-overlay/salt/kubelet/kubernetes_auth" ...@@ -57,7 +57,7 @@ kubelet_auth_file="/srv/salt-overlay/salt/kubelet/kubernetes_auth"
(umask u=rw,go= ; echo "{\"BearerToken\": \"$kubelet_token\", \"Insecure\": true }" > $kubelet_auth_file) (umask u=rw,go= ; echo "{\"BearerToken\": \"$kubelet_token\", \"Insecure\": true }" > $kubelet_auth_file)
mkdir -p /srv/salt-overlay/salt/kube-proxy mkdir -p /srv/salt-overlay/salt/kube-proxy
kube_proxy_kubeconfig_file="/srv/salt-overlay/salt/kube_proxy/kubeconfig" kube_proxy_kubeconfig_file="/srv/salt-overlay/salt/kube-proxy/kubeconfig"
cat > "${kube_proxy_kubeconfig_file}" <<EOF cat > "${kube_proxy_kubeconfig_file}" <<EOF
apiVersion: v1 apiVersion: v1
kind: Config kind: Config
......
cluster/vagrant/provision-master.sh
View file @ 824d8307
...@@ -150,7 +150,7 @@ if [[ ! -f "${known_tokens_file}" ]]; then ...@@ -150,7 +150,7 @@ if [[ ! -f "${known_tokens_file}" ]]; then
(umask u=rw,go= ; echo "{\"BearerToken\": \"$kubelet_token\", \"Insecure\": true }" > $kubelet_auth_file) (umask u=rw,go= ; echo "{\"BearerToken\": \"$kubelet_token\", \"Insecure\": true }" > $kubelet_auth_file)
mkdir -p /srv/salt-overlay/salt/kube-proxy mkdir -p /srv/salt-overlay/salt/kube-proxy
kube_proxy_kubeconfig_file="/srv/salt-overlay/salt/kube_proxy/kubeconfig" kube_proxy_kubeconfig_file="/srv/salt-overlay/salt/kube-proxy/kubeconfig"
# Make a kubeconfig file with the token. # Make a kubeconfig file with the token.
# TODO(etune): put apiserver certs into secret too, and reference from authfile, # TODO(etune): put apiserver certs into secret too, and reference from authfile,
# so that "Insecure" is not needed. # so that "Insecure" is not needed.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment