mirror of https://github.com/k3s-io/k3s
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
commit
459a6d328b
|
@ -66,6 +66,8 @@ KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}"
|
|||
# LimitRanger, AlwaysDeny, SecurityContextDeny, NamespaceExists,
|
||||
# NamespaceLifecycle, NamespaceAutoProvision, AlwaysAdmit,
|
||||
# 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}"
|
||||
|
||||
# --client-ca-file="": If set, any request presenting a client certificate signed
|
||||
|
|
|
@ -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.
|
||||
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"
|
||||
EOF
|
||||
|
||||
|
|
|
@ -27,9 +27,11 @@ KUBE_LOGTOSTDERR="--logtostderr=true"
|
|||
# --v=0: log level for V logs
|
||||
KUBE_LOG_LEVEL="--v=4"
|
||||
|
||||
# --master: The address of the Kubernetes API server (overrides any value in kubeconfig).
|
||||
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"
|
||||
|
||||
# Add your own!
|
||||
|
|
|
@ -87,6 +87,7 @@ EnvironmentFile=-/opt/kubernetes/cfg/kubelet
|
|||
ExecStart=/opt/kubernetes/bin/kubelet ${KUBELET_OPTS}
|
||||
Restart=on-failure
|
||||
KillMode=process
|
||||
RestartSec=15s
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
Loading…
Reference in New Issue