Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
e420e0fc
Commit
e420e0fc
authored
Jan 19, 2018
by
Mike Danese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cluster: remove unused kubelet token
parent
4a222b25
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
6 deletions
+0
-6
common.sh
cluster/common.sh
+0
-2
upgrade.sh
cluster/gce/upgrade.sh
+0
-3
util.sh
cluster/gce/util.sh
+0
-1
No files found.
cluster/common.sh
View file @
e420e0fc
...
@@ -524,7 +524,6 @@ CLUSTER_REGISTRY_DISK_SIZE: $(yaml-quote ${CLUSTER_REGISTRY_DISK_SIZE:-})
...
@@ -524,7 +524,6 @@ CLUSTER_REGISTRY_DISK_SIZE: $(yaml-quote ${CLUSTER_REGISTRY_DISK_SIZE:-})
DNS_SERVER_IP:
$(
yaml-quote
${
DNS_SERVER_IP
:-})
DNS_SERVER_IP:
$(
yaml-quote
${
DNS_SERVER_IP
:-})
DNS_DOMAIN:
$(
yaml-quote
${
DNS_DOMAIN
:-})
DNS_DOMAIN:
$(
yaml-quote
${
DNS_DOMAIN
:-})
ENABLE_DNS_HORIZONTAL_AUTOSCALER:
$(
yaml-quote
${
ENABLE_DNS_HORIZONTAL_AUTOSCALER
:-
false
})
ENABLE_DNS_HORIZONTAL_AUTOSCALER:
$(
yaml-quote
${
ENABLE_DNS_HORIZONTAL_AUTOSCALER
:-
false
})
KUBELET_TOKEN:
$(
yaml-quote
${
KUBELET_TOKEN
:-})
KUBE_PROXY_DAEMONSET:
$(
yaml-quote
${
KUBE_PROXY_DAEMONSET
:-
false
})
KUBE_PROXY_DAEMONSET:
$(
yaml-quote
${
KUBE_PROXY_DAEMONSET
:-
false
})
KUBE_PROXY_TOKEN:
$(
yaml-quote
${
KUBE_PROXY_TOKEN
:-})
KUBE_PROXY_TOKEN:
$(
yaml-quote
${
KUBE_PROXY_TOKEN
:-})
NODE_PROBLEM_DETECTOR_TOKEN:
$(
yaml-quote
${
NODE_PROBLEM_DETECTOR_TOKEN
:-})
NODE_PROBLEM_DETECTOR_TOKEN:
$(
yaml-quote
${
NODE_PROBLEM_DETECTOR_TOKEN
:-})
...
@@ -1232,7 +1231,6 @@ function get-env-val() {
...
@@ -1232,7 +1231,6 @@ function get-env-val() {
function
parse-master-env
()
{
function
parse-master-env
()
{
# Get required master env vars
# Get required master env vars
local
master_env
=
$(
get-master-env
)
local
master_env
=
$(
get-master-env
)
KUBELET_TOKEN
=
$(
get-env-val
"
${
master_env
}
"
"KUBELET_TOKEN"
)
KUBE_PROXY_TOKEN
=
$(
get-env-val
"
${
master_env
}
"
"KUBE_PROXY_TOKEN"
)
KUBE_PROXY_TOKEN
=
$(
get-env-val
"
${
master_env
}
"
"KUBE_PROXY_TOKEN"
)
NODE_PROBLEM_DETECTOR_TOKEN
=
$(
get-env-val
"
${
master_env
}
"
"NODE_PROBLEM_DETECTOR_TOKEN"
)
NODE_PROBLEM_DETECTOR_TOKEN
=
$(
get-env-val
"
${
master_env
}
"
"NODE_PROBLEM_DETECTOR_TOKEN"
)
CA_CERT_BASE64
=
$(
get-env-val
"
${
master_env
}
"
"CA_CERT"
)
CA_CERT_BASE64
=
$(
get-env-val
"
${
master_env
}
"
"CA_CERT"
)
...
...
cluster/gce/upgrade.sh
View file @
e420e0fc
...
@@ -190,7 +190,6 @@ function get-node-os() {
...
@@ -190,7 +190,6 @@ function get-node-os() {
# ZONE
# ZONE
#
#
# Vars set:
# Vars set:
# KUBELET_TOKEN
# KUBE_PROXY_TOKEN
# KUBE_PROXY_TOKEN
# NODE_PROBLEM_DETECTOR_TOKEN
# NODE_PROBLEM_DETECTOR_TOKEN
# CA_CERT_BASE64
# CA_CERT_BASE64
...
@@ -230,7 +229,6 @@ function setup-base-image() {
...
@@ -230,7 +229,6 @@ function setup-base-image() {
# Vars set:
# Vars set:
# SANITIZED_VERSION
# SANITIZED_VERSION
# INSTANCE_GROUPS
# INSTANCE_GROUPS
# KUBELET_TOKEN
# KUBE_PROXY_TOKEN
# KUBE_PROXY_TOKEN
# NODE_PROBLEM_DETECTOR_TOKEN
# NODE_PROBLEM_DETECTOR_TOKEN
# CA_CERT_BASE64
# CA_CERT_BASE64
...
@@ -253,7 +251,6 @@ function prepare-node-upgrade() {
...
@@ -253,7 +251,6 @@ function prepare-node-upgrade() {
# Get required node env vars from exiting template.
# Get required node env vars from exiting template.
local
node_env
=
$(
get-node-env
)
local
node_env
=
$(
get-node-env
)
KUBELET_TOKEN
=
$(
get-env-val
"
${
node_env
}
"
"KUBELET_TOKEN"
)
KUBE_PROXY_TOKEN
=
$(
get-env-val
"
${
node_env
}
"
"KUBE_PROXY_TOKEN"
)
KUBE_PROXY_TOKEN
=
$(
get-env-val
"
${
node_env
}
"
"KUBE_PROXY_TOKEN"
)
NODE_PROBLEM_DETECTOR_TOKEN
=
$(
get-env-val
"
${
node_env
}
"
"NODE_PROBLEM_DETECTOR_TOKEN"
)
NODE_PROBLEM_DETECTOR_TOKEN
=
$(
get-env-val
"
${
node_env
}
"
"NODE_PROBLEM_DETECTOR_TOKEN"
)
CA_CERT_BASE64
=
$(
get-env-val
"
${
node_env
}
"
"CA_CERT"
)
CA_CERT_BASE64
=
$(
get-env-val
"
${
node_env
}
"
"CA_CERT"
)
...
...
cluster/gce/util.sh
View file @
e420e0fc
...
@@ -1037,7 +1037,6 @@ function create-master() {
...
@@ -1037,7 +1037,6 @@ function create-master() {
# from the other cluster variables so that the client (this
# from the other cluster variables so that the client (this
# computer) can forget it later. This should disappear with
# computer) can forget it later. This should disappear with
# http://issue.k8s.io/3168
# http://issue.k8s.io/3168
KUBELET_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
KUBE_PROXY_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
KUBE_PROXY_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
if
[[
"
${
ENABLE_NODE_PROBLEM_DETECTOR
:-}
"
==
"standalone"
]]
;
then
if
[[
"
${
ENABLE_NODE_PROBLEM_DETECTOR
:-}
"
==
"standalone"
]]
;
then
NODE_PROBLEM_DETECTOR_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
NODE_PROBLEM_DETECTOR_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment