github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #67628 from zouyee/centos-config 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Supplementary information for common flags and add restart second config

**What this PR does / why we need it**:
the admission-control flag has been marked deprecated, it need to be updated.
And provide them  with supplementary information about flags.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes https://github.com/kubernetes/kubernetes/issues/67627

**Special notes for your reviewer**:

**Release note**:

```NONE

```
pull/8/head
Kubernetes Submit Queue 2018-08-22 01:11:14 -07:00 committed by GitHub
parent 974978a7c7 f2a29676b8
commit 459a6d328b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/centos/master/scripts/apiserver.sh
View File

@ -66,6 +66,8 @@ KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}"
# LimitRanger, AlwaysDeny, SecurityContextDeny, NamespaceExists, # LimitRanger, AlwaysDeny, SecurityContextDeny, NamespaceExists,
# NamespaceLifecycle, NamespaceAutoProvision, AlwaysAdmit, # NamespaceLifecycle, NamespaceAutoProvision, AlwaysAdmit,
# ServiceAccount, DefaultStorageClass, DefaultTolerationSeconds, ResourceQuota # ServiceAccount, DefaultStorageClass, DefaultTolerationSeconds, ResourceQuota
# Mark Deprecated. Use --enable-admission-plugins or --disable-admission-plugins instead since v1.10.
# It will be removed in a future version.
KUBE_ADMISSION_CONTROL="--admission-control=${ADMISSION_CONTROL}" KUBE_ADMISSION_CONTROL="--admission-control=${ADMISSION_CONTROL}"
# --client-ca-file="": If set, any request presenting a client certificate signed # --client-ca-file="": If set, any request presenting a client certificate signed

3
cluster/centos/master/scripts/controller-manager.sh
View File

@ -30,7 +30,8 @@ KUBE_CONTROLLER_MANAGER_ROOT_CA_FILE="--root-ca-file=/srv/kubernetes/ca.crt"
# RSA key used to sign service account tokens. # RSA key used to sign service account tokens.
KUBE_CONTROLLER_MANAGER_SERVICE_ACCOUNT_PRIVATE_KEY_FILE="--service-account-private-key-file=/srv/kubernetes/server.key" KUBE_CONTROLLER_MANAGER_SERVICE_ACCOUNT_PRIVATE_KEY_FILE="--service-account-private-key-file=/srv/kubernetes/server.key"
# --leader-elect # --leader-elect: Start a leader election client and gain leadership before
# executing the main loop. Enable this when running replicated components for high availability.
KUBE_LEADER_ELECT="--leader-elect" KUBE_LEADER_ELECT="--leader-elect"
EOF EOF

4
cluster/centos/master/scripts/scheduler.sh
View File

@ -27,9 +27,11 @@ KUBE_LOGTOSTDERR="--logtostderr=true"
# --v=0: log level for V logs # --v=0: log level for V logs
KUBE_LOG_LEVEL="--v=4" KUBE_LOG_LEVEL="--v=4"
# --master: The address of the Kubernetes API server (overrides any value in kubeconfig).
KUBE_MASTER="--master=${MASTER_ADDRESS}:8080" KUBE_MASTER="--master=${MASTER_ADDRESS}:8080"
# --leader-elect # --leader-elect: Start a leader election client and gain leadership before
# executing the main loop. Enable this when running replicated components for high availability.
KUBE_LEADER_ELECT="--leader-elect" KUBE_LEADER_ELECT="--leader-elect"
# Add your own! # Add your own!

1
cluster/centos/node/scripts/kubelet.sh
View File

@ -87,6 +87,7 @@ EnvironmentFile=-/opt/kubernetes/cfg/kubelet
ExecStart=/opt/kubernetes/bin/kubelet ${KUBELET_OPTS} ExecStart=/opt/kubernetes/bin/kubelet ${KUBELET_OPTS}
Restart=on-failure Restart=on-failure
KillMode=process KillMode=process
RestartSec=15s
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target