mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #106241 from jdnurme/cloud-provider-env-var
Added env variable for cloud-provider
This commit is contained in:
commit
7bffb3b2ca
@ -555,3 +555,7 @@ export WINDOWS_ENABLE_HYPERV="${WINDOWS_ENABLE_HYPERV:-false}"
|
|||||||
# TLS_CIPHER_SUITES defines cipher suites allowed to be used by kube-apiserver.
|
# TLS_CIPHER_SUITES defines cipher suites allowed to be used by kube-apiserver.
|
||||||
# If this variable is unset or empty, kube-apiserver will allow its default set of cipher suites.
|
# If this variable is unset or empty, kube-apiserver will allow its default set of cipher suites.
|
||||||
export TLS_CIPHER_SUITES=""
|
export TLS_CIPHER_SUITES=""
|
||||||
|
|
||||||
|
# CLOUD_PROVIDER_FLAG defines the cloud-provider value presented to KCM, apiserver,
|
||||||
|
# and kubelet
|
||||||
|
export CLOUD_PROVIDER_FLAG="${CLOUD_PROVIDER_FLAG:-gce}"
|
||||||
|
@ -603,3 +603,7 @@ export WINDOWS_NODE_PROBLEM_DETECTOR_CUSTOM_FLAGS="${WINDOWS_NODE_PROBLEM_DETECT
|
|||||||
# TLS_CIPHER_SUITES defines cipher suites allowed to be used by kube-apiserver.
|
# TLS_CIPHER_SUITES defines cipher suites allowed to be used by kube-apiserver.
|
||||||
# If this variable is unset or empty, kube-apiserver will allow its default set of cipher suites.
|
# If this variable is unset or empty, kube-apiserver will allow its default set of cipher suites.
|
||||||
export TLS_CIPHER_SUITES=""
|
export TLS_CIPHER_SUITES=""
|
||||||
|
|
||||||
|
# CLOUD_PROVIDER_FLAG defines the cloud-provider value presented to KCM, apiserver,
|
||||||
|
# and kubelet
|
||||||
|
export CLOUD_PROVIDER_FLAG="${CLOUD_PROVIDER_FLAG:-gce}"
|
||||||
|
@ -2179,7 +2179,7 @@ function start-kube-controller-manager {
|
|||||||
local params=("${CONTROLLER_MANAGER_TEST_LOG_LEVEL:-"--v=2"}" "${CONTROLLER_MANAGER_TEST_ARGS:-}" "${CLOUD_CONFIG_OPT}")
|
local params=("${CONTROLLER_MANAGER_TEST_LOG_LEVEL:-"--v=2"}" "${CONTROLLER_MANAGER_TEST_ARGS:-}" "${CLOUD_CONFIG_OPT}")
|
||||||
local config_path='/etc/srv/kubernetes/kube-controller-manager/kubeconfig'
|
local config_path='/etc/srv/kubernetes/kube-controller-manager/kubeconfig'
|
||||||
params+=("--use-service-account-credentials")
|
params+=("--use-service-account-credentials")
|
||||||
params+=("--cloud-provider=gce")
|
params+=("--cloud-provider=${CLOUD_PROVIDER_FLAG:-gce}")
|
||||||
params+=("--kubeconfig=${config_path}" "--authentication-kubeconfig=${config_path}" "--authorization-kubeconfig=${config_path}")
|
params+=("--kubeconfig=${config_path}" "--authentication-kubeconfig=${config_path}" "--authorization-kubeconfig=${config_path}")
|
||||||
params+=("--root-ca-file=${CA_CERT_BUNDLE_PATH}")
|
params+=("--root-ca-file=${CA_CERT_BUNDLE_PATH}")
|
||||||
params+=("--service-account-private-key-file=${SERVICEACCOUNT_KEY_PATH}")
|
params+=("--service-account-private-key-file=${SERVICEACCOUNT_KEY_PATH}")
|
||||||
|
@ -68,7 +68,7 @@ function start-kube-apiserver {
|
|||||||
# Calculate variables and assemble the command line.
|
# Calculate variables and assemble the command line.
|
||||||
local params="${API_SERVER_TEST_LOG_LEVEL:-"--v=2"} ${APISERVER_TEST_ARGS:-} ${CLOUD_CONFIG_OPT}"
|
local params="${API_SERVER_TEST_LOG_LEVEL:-"--v=2"} ${APISERVER_TEST_ARGS:-} ${CLOUD_CONFIG_OPT}"
|
||||||
params+=" --allow-privileged=true"
|
params+=" --allow-privileged=true"
|
||||||
params+=" --cloud-provider=gce"
|
params+=" --cloud-provider=${CLOUD_PROVIDER_FLAG:-gce}"
|
||||||
params+=" --client-ca-file=${CA_CERT_BUNDLE_PATH}"
|
params+=" --client-ca-file=${CA_CERT_BUNDLE_PATH}"
|
||||||
|
|
||||||
# params is passed by reference, so no "$"
|
# params is passed by reference, so no "$"
|
||||||
|
@ -730,7 +730,7 @@ function yaml-map-string-string {
|
|||||||
# Returns kubelet flags used on both Linux and Windows nodes.
|
# Returns kubelet flags used on both Linux and Windows nodes.
|
||||||
function construct-common-kubelet-flags {
|
function construct-common-kubelet-flags {
|
||||||
local flags="${KUBELET_TEST_LOG_LEVEL:-"--v=2"} ${KUBELET_TEST_ARGS:-}"
|
local flags="${KUBELET_TEST_LOG_LEVEL:-"--v=2"} ${KUBELET_TEST_ARGS:-}"
|
||||||
flags+=" --cloud-provider=gce"
|
flags+=" --cloud-provider=${CLOUD_PROVIDER_FLAG:-gce}"
|
||||||
# TODO(mtaufen): ROTATE_CERTIFICATES seems unused; delete it?
|
# TODO(mtaufen): ROTATE_CERTIFICATES seems unused; delete it?
|
||||||
if [[ -n "${ROTATE_CERTIFICATES:-}" ]]; then
|
if [[ -n "${ROTATE_CERTIFICATES:-}" ]]; then
|
||||||
flags+=" --rotate-certificates=true"
|
flags+=" --rotate-certificates=true"
|
||||||
|
Loading…
Reference in New Issue
Block a user