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
3e483932
Commit
3e483932
authored
May 29, 2018
by
Karol Gołąb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create cluster-autoscaler role and introduce it to CA start-up script
parent
e0740b11
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
112 additions
and
2 deletions
+112
-2
cluster-autoscaler-rbac.yaml
...dons/rbac/cluster-autoscaler/cluster-autoscaler-rbac.yaml
+68
-0
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+32
-1
cluster-autoscaler.manifest
cluster/gce/manifests/cluster-autoscaler.manifest
+12
-1
No files found.
cluster/addons/rbac/cluster-autoscaler/cluster-autoscaler-rbac.yaml
0 → 100644
View file @
3e483932
kind
:
ClusterRole
apiVersion
:
rbac.authorization.k8s.io/v1
metadata
:
name
:
cluster-autoscaler
labels
:
addonmanager.kubernetes.io/mode
:
Reconcile
rules
:
# leader election
-
apiGroups
:
[
"
"
]
resources
:
[
"
endpoints"
]
verbs
:
[
"
create"
]
-
apiGroups
:
[
"
"
]
resources
:
[
"
endpoints"
]
resourceNames
:
[
"
cluster-autoscaler"
]
verbs
:
[
"
get"
,
"
update"
,
"
patch"
,
"
delete"
]
# accessing & modifying cluster state (nodes & pods)
-
apiGroups
:
[
"
"
]
resources
:
[
"
nodes"
]
verbs
:
[
"
get"
,
"
list"
,
"
watch"
,
"
update"
,
"
patch"
]
-
apiGroups
:
[
"
"
]
resources
:
[
"
pods"
]
verbs
:
[
"
get"
,
"
list"
,
"
watch"
]
-
apiGroups
:
[
"
"
]
resources
:
[
"
pods/eviction"
]
verbs
:
[
"
create"
]
# read-only access to cluster state
-
apiGroups
:
[
"
"
]
resources
:
[
"
services"
,
"
replicationcontrollers"
,
"
persistentvolumes"
,
"
persistentvolumeclaims"
]
verbs
:
[
"
get"
,
"
list"
,
"
watch"
]
-
apiGroups
:
[
"
apps"
,
"
extensions"
]
resources
:
[
"
daemonsets"
,
"
replicasets"
]
verbs
:
[
"
get"
,
"
list"
,
"
watch"
]
-
apiGroups
:
[
"
apps"
]
resources
:
[
"
statefulsets"
]
verbs
:
[
"
get"
,
"
list"
,
"
watch"
]
-
apiGroups
:
[
"
policy"
]
resources
:
[
"
poddisruptionbudgets"
]
verbs
:
[
"
get"
,
"
list"
,
"
watch"
]
-
apiGroups
:
[
"
storage.k8s.io"
]
resources
:
[
"
storageclasses"
]
verbs
:
[
"
get"
,
"
list"
,
"
watch"
]
# misc access
-
apiGroups
:
[
"
"
]
resources
:
[
"
events"
]
verbs
:
[
"
create"
,
"
update"
,
"
patch"
]
-
apiGroups
:
[
"
"
]
resources
:
[
"
configmaps"
]
verbs
:
[
"
create"
]
-
apiGroups
:
[
"
"
]
resources
:
[
"
configmaps"
]
resourceNames
:
[
"
cluster-autoscaler-status"
]
verbs
:
[
"
get"
,
"
update"
,
"
patch"
,
"
delete"
]
---
kind
:
ClusterRoleBinding
apiVersion
:
rbac.authorization.k8s.io/v1
metadata
:
name
:
cluster-autoscaler
labels
:
addonmanager.kubernetes.io/mode
:
Reconcile
subjects
:
-
kind
:
User
name
:
cluster-autoscaler
namespace
:
kube-system
roleRef
:
kind
:
ClusterRole
name
:
cluster-autoscaler
apiGroup
:
rbac.authorization.k8s.io
cluster/gce/gci/configure-helper.sh
View file @
3e483932
...
@@ -543,6 +543,9 @@ function create-master-auth {
...
@@ -543,6 +543,9 @@ function create-master-auth {
if
[[
-n
"
${
KUBE_SCHEDULER_TOKEN
:-}
"
]]
;
then
if
[[
-n
"
${
KUBE_SCHEDULER_TOKEN
:-}
"
]]
;
then
append_or_replace_prefixed_line
"
${
known_tokens_csv
}
"
"
${
KUBE_SCHEDULER_TOKEN
}
,"
"system:kube-scheduler,uid:system:kube-scheduler"
append_or_replace_prefixed_line
"
${
known_tokens_csv
}
"
"
${
KUBE_SCHEDULER_TOKEN
}
,"
"system:kube-scheduler,uid:system:kube-scheduler"
fi
fi
if
[[
-n
"
${
KUBE_CLUSTER_AUTOSCALER_TOKEN
:-}
"
]]
;
then
append_or_replace_prefixed_line
"
${
known_tokens_csv
}
"
"
${
KUBE_CLUSTER_AUTOSCALER_TOKEN
}
,"
"cluster-autoscaler,uid:cluster-autoscaler"
fi
if
[[
-n
"
${
KUBE_PROXY_TOKEN
:-}
"
]]
;
then
if
[[
-n
"
${
KUBE_PROXY_TOKEN
:-}
"
]]
;
then
append_or_replace_prefixed_line
"
${
known_tokens_csv
}
"
"
${
KUBE_PROXY_TOKEN
}
,"
"system:kube-proxy,uid:kube_proxy"
append_or_replace_prefixed_line
"
${
known_tokens_csv
}
"
"
${
KUBE_PROXY_TOKEN
}
,"
"system:kube-proxy,uid:kube_proxy"
fi
fi
...
@@ -996,6 +999,30 @@ current-context: kube-scheduler
...
@@ -996,6 +999,30 @@ current-context: kube-scheduler
EOF
EOF
}
}
function
create-clusterautoscaler-kubeconfig
{
echo
"Creating cluster-autoscaler kubeconfig file"
mkdir
-p
/etc/srv/kubernetes/cluster-autoscaler
cat
<<
EOF
>/etc/srv/kubernetes/cluster-autoscaler/kubeconfig
apiVersion: v1
kind: Config
users:
- name: cluster-autoscaler
user:
token:
${
KUBE_CLUSTER_AUTOSCALER_TOKEN
}
clusters:
- name: local
cluster:
insecure-skip-tls-verify: true
server: https://localhost:443
contexts:
- context:
cluster: local
user: cluster-autoscaler
name: cluster-autoscaler
current-context: cluster-autoscaler
EOF
}
function
create-kubescheduler-policy-config
{
function
create-kubescheduler-policy-config
{
echo
"Creating kube-scheduler policy config file"
echo
"Creating kube-scheduler policy config file"
mkdir
-p
/etc/srv/kubernetes/kube-scheduler
mkdir
-p
/etc/srv/kubernetes/kube-scheduler
...
@@ -1953,12 +1980,15 @@ function start-kube-scheduler {
...
@@ -1953,12 +1980,15 @@ function start-kube-scheduler {
function
start-cluster-autoscaler
{
function
start-cluster-autoscaler
{
if
[[
"
${
ENABLE_CLUSTER_AUTOSCALER
:-}
"
==
"true"
]]
;
then
if
[[
"
${
ENABLE_CLUSTER_AUTOSCALER
:-}
"
==
"true"
]]
;
then
echo
"Start kubernetes cluster autoscaler"
echo
"Start kubernetes cluster autoscaler"
setup-addon-manifests
"addons"
"rbac/cluster-autoscaler"
create-clusterautoscaler-kubeconfig
prepare-log-file /var/log/cluster-autoscaler.log
prepare-log-file /var/log/cluster-autoscaler.log
# Remove salt comments and replace variables with values
# Remove salt comments and replace variables with values
local
-r
src_file
=
"
${
KUBE_HOME
}
/kube-manifests/kubernetes/gci-trusty/cluster-autoscaler.manifest"
local
-r
src_file
=
"
${
KUBE_HOME
}
/kube-manifests/kubernetes/gci-trusty/cluster-autoscaler.manifest"
local
params
=
"
${
AUTOSCALER_MIG_CONFIG
}
${
CLOUD_CONFIG_OPT
}
${
AUTOSCALER_EXPANDER_CONFIG
:-
--expander=price
}
"
local
params
=
"
${
AUTOSCALER_MIG_CONFIG
}
${
CLOUD_CONFIG_OPT
}
${
AUTOSCALER_EXPANDER_CONFIG
:-
--expander=price
}
"
params+
=
" --kubeconfig=/etc/srv/kubernetes/cluster-autoscaler/kubeconfig"
sed
-i
-e
"s@{{params}}@
${
params
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{params}}@
${
params
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{cloud_config_mount}}@
${
CLOUD_CONFIG_MOUNT
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{cloud_config_mount}}@
${
CLOUD_CONFIG_MOUNT
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{cloud_config_volume}}@
${
CLOUD_CONFIG_VOLUME
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{cloud_config_volume}}@
${
CLOUD_CONFIG_VOLUME
}
@g"
"
${
src_file
}
"
...
@@ -2513,9 +2543,10 @@ function main() {
...
@@ -2513,9 +2543,10 @@ function main() {
fi
fi
fi
fi
# generate the controller manager
and schedu
ler tokens here since they are only used on the master.
# generate the controller manager
, scheduler and cluster autosca
ler tokens here since they are only used on the master.
KUBE_CONTROLLER_MANAGER_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
KUBE_CONTROLLER_MANAGER_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
KUBE_SCHEDULER_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
KUBE_SCHEDULER_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
KUBE_CLUSTER_AUTOSCALER_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
setup-os-params
setup-os-params
config-ip-firewall
config-ip-firewall
...
...
cluster/gce/manifests/cluster-autoscaler.manifest
View file @
3e483932
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
},
},
"command": [
"command": [
"./run.sh",
"./run.sh",
"--kubernetes=http
://127.0.0.1:8080?inClusterConfig=f
",
"--kubernetes=http
s://127.0.0.1:443
",
"--v=4",
"--v=4",
"--logtostderr=true",
"--logtostderr=true",
"--write-status-configmap=true",
"--write-status-configmap=true",
...
@@ -57,6 +57,11 @@
...
@@ -57,6 +57,11 @@
"mountPath": "/usr/share/ca-certificates"
"mountPath": "/usr/share/ca-certificates"
},
},
{
{
"name": "srvkube",
"readOnly": true,
"mountPath": "/etc/srv/kubernetes/cluster-autoscaler"
},
{
"name": "logfile",
"name": "logfile",
"mountPath": "/var/log/cluster-autoscaler.log",
"mountPath": "/var/log/cluster-autoscaler.log",
"readOnly": false
"readOnly": false
...
@@ -81,6 +86,12 @@
...
@@ -81,6 +86,12 @@
}
}
},
},
{
{
"name": "srvkube",
"hostPath": {
"path": "/etc/srv/kubernetes/cluster-autoscaler"
}
},
{
"name": "logfile",
"name": "logfile",
"hostPath": {
"hostPath": {
"path": "/var/log/cluster-autoscaler.log",
"path": "/var/log/cluster-autoscaler.log",
...
...
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