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
857690ba
Commit
857690ba
authored
Feb 22, 2018
by
Mike Danese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gce: add support for enabling TokenRequest feature
parent
6546b699
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
0 deletions
+23
-0
config-default.sh
cluster/gce/config-default.sh
+6
-0
config-test.sh
cluster/gce/config-test.sh
+6
-0
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+5
-0
util.sh
cluster/gce/util.sh
+6
-0
No files found.
cluster/gce/config-default.sh
View file @
857690ba
...
@@ -399,3 +399,9 @@ ROTATE_CERTIFICATES="${ROTATE_CERTIFICATES:-}"
...
@@ -399,3 +399,9 @@ ROTATE_CERTIFICATES="${ROTATE_CERTIFICATES:-}"
# The number of services that are allowed to sync concurrently. Will be passed
# The number of services that are allowed to sync concurrently. Will be passed
# into kube-controller-manager via `--concurrent-service-syncs`
# into kube-controller-manager via `--concurrent-service-syncs`
CONCURRENT_SERVICE_SYNCS
=
"
${
CONCURRENT_SERVICE_SYNCS
:-}
"
CONCURRENT_SERVICE_SYNCS
=
"
${
CONCURRENT_SERVICE_SYNCS
:-}
"
if
[[
"
${
ENABLE_TOKENREQUEST
:-}
"
==
"true"
]]
;
then
FEATURE_GATES
=
"
${
FEATURE_GATES
}
,TokenRequest=true"
SERVICEACCOUNT_ISSUER
=
"https://kubernetes.io/
${
CLUSTER_NAME
}
"
SERVICEACCOUNT_API_AUDIENCES
=
"https://kubernetes.default.svc"
fi
cluster/gce/config-test.sh
View file @
857690ba
...
@@ -442,3 +442,9 @@ ROTATE_CERTIFICATES="${ROTATE_CERTIFICATES:-}"
...
@@ -442,3 +442,9 @@ ROTATE_CERTIFICATES="${ROTATE_CERTIFICATES:-}"
# The number of services that are allowed to sync concurrently. Will be passed
# The number of services that are allowed to sync concurrently. Will be passed
# into kube-controller-manager via `--concurrent-service-syncs`
# into kube-controller-manager via `--concurrent-service-syncs`
CONCURRENT_SERVICE_SYNCS
=
"
${
CONCURRENT_SERVICE_SYNCS
:-}
"
CONCURRENT_SERVICE_SYNCS
=
"
${
CONCURRENT_SERVICE_SYNCS
:-}
"
if
[[
"
${
ENABLE_TOKENREQUEST
:-}
"
==
"true"
]]
;
then
FEATURE_GATES
=
"
${
FEATURE_GATES
}
,TokenRequest=true"
SERVICEACCOUNT_ISSUER
=
"https://kubernetes.io/
${
CLUSTER_NAME
}
"
SERVICEACCOUNT_API_AUDIENCES
=
"https://kubernetes.default.svc"
fi
cluster/gce/gci/configure-helper.sh
View file @
857690ba
...
@@ -1466,6 +1466,11 @@ function start-kube-apiserver {
...
@@ -1466,6 +1466,11 @@ function start-kube-apiserver {
if
[[
-n
"
${
ETCD_QUORUM_READ
:-}
"
]]
;
then
if
[[
-n
"
${
ETCD_QUORUM_READ
:-}
"
]]
;
then
params+
=
" --etcd-quorum-read=
${
ETCD_QUORUM_READ
}
"
params+
=
" --etcd-quorum-read=
${
ETCD_QUORUM_READ
}
"
fi
fi
if
[[
-n
"
${
SERVICEACCOUNT_ISSUER
:-}
"
]]
;
then
params+
=
" --service-account-issuer=
${
SERVICEACCOUNT_ISSUER
}
"
params+
=
" --service-account-signing-key-file=
${
SERVICEACCOUNT_KEY_PATH
}
"
params+
=
" --service-account-api-audiences=
${
SERVICEACCOUNT_API_AUDIENCES
}
"
fi
local
audit_policy_config_mount
=
""
local
audit_policy_config_mount
=
""
local
audit_policy_config_volume
=
""
local
audit_policy_config_volume
=
""
...
...
cluster/gce/util.sh
View file @
857690ba
...
@@ -819,6 +819,12 @@ ETCD_CA_CERT: $(yaml-quote ${ETCD_CA_CERT_BASE64:-})
...
@@ -819,6 +819,12 @@ ETCD_CA_CERT: $(yaml-quote ${ETCD_CA_CERT_BASE64:-})
ETCD_PEER_KEY:
$(
yaml-quote
${
ETCD_PEER_KEY_BASE64
:-})
ETCD_PEER_KEY:
$(
yaml-quote
${
ETCD_PEER_KEY_BASE64
:-})
ETCD_PEER_CERT:
$(
yaml-quote
${
ETCD_PEER_CERT_BASE64
:-})
ETCD_PEER_CERT:
$(
yaml-quote
${
ETCD_PEER_CERT_BASE64
:-})
EOF
EOF
if
[[
"
${
ENABLE_TOKENREQUEST
:-}
"
==
"true"
]]
;
then
cat
>>
$file
<<
EOF
SERVICEACCOUNT_ISSUER:
$(
yaml-quote
${
SERVICEACCOUNT_ISSUER
:-})
SERVICEACCOUNT_API_AUDIENCES:
$(
yaml-quote
${
SERVICEACCOUNT_API_AUDIENCES
:-})
EOF
fi
# KUBE_APISERVER_REQUEST_TIMEOUT_SEC (if set) controls the --request-timeout
# KUBE_APISERVER_REQUEST_TIMEOUT_SEC (if set) controls the --request-timeout
# flag
# flag
if
[
-n
"
${
KUBE_APISERVER_REQUEST_TIMEOUT_SEC
:-}
"
]
;
then
if
[
-n
"
${
KUBE_APISERVER_REQUEST_TIMEOUT_SEC
:-}
"
]
;
then
...
...
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