mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Revert "[Re-Apply][Distroless] Convert the GCE manifests for master containers."
This commit is contained in:
parent
b066e0d783
commit
9da7db76b7
@ -94,12 +94,11 @@ func (c *kubeAPIServerManifestTestCase) invokeTest(e kubeAPIServerEnv, kubeEnv s
|
|||||||
|
|
||||||
func TestEncryptionProviderFlag(t *testing.T) {
|
func TestEncryptionProviderFlag(t *testing.T) {
|
||||||
var (
|
var (
|
||||||
// command": [
|
// command": [
|
||||||
// "/usr/local/bin/kube-apiserver " - Index 0,
|
// "/bin/sh", - Index 0
|
||||||
// "--flag1=val1", - Index 1,
|
// "-c", - Index 1
|
||||||
// "--flag2=val2", - Index 2,
|
// "exec /usr/local/bin/kube-apiserver " - Index 2
|
||||||
// ...
|
execArgsIndex = 2
|
||||||
// "--flagN=valN", - Index N,
|
|
||||||
encryptionConfigFlag = "--encryption-provider-config"
|
encryptionConfigFlag = "--encryption-provider-config"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -133,15 +132,10 @@ func TestEncryptionProviderFlag(t *testing.T) {
|
|||||||
|
|
||||||
c.invokeTest(e, deployHelperEnv)
|
c.invokeTest(e, deployHelperEnv)
|
||||||
|
|
||||||
var flagIsInArg bool
|
execArgs := c.pod.Spec.Containers[0].Command[execArgsIndex]
|
||||||
var flag, execArgs string
|
flagIsInArg := strings.Contains(execArgs, encryptionConfigFlag)
|
||||||
for _, execArgs = range c.pod.Spec.Containers[0].Args[1:] {
|
flag := fmt.Sprintf("%s=%s", encryptionConfigFlag, e.EncryptionProviderConfigPath)
|
||||||
if strings.Contains(execArgs, encryptionConfigFlag) {
|
|
||||||
flagIsInArg = true
|
|
||||||
flag = fmt.Sprintf("%s=%s", encryptionConfigFlag, e.EncryptionProviderConfigPath)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
switch {
|
switch {
|
||||||
case tc.wantFlag && !flagIsInArg:
|
case tc.wantFlag && !flagIsInArg:
|
||||||
t.Fatalf("Got %q,\n want flags to contain %q", execArgs, flag)
|
t.Fatalf("Got %q,\n want flags to contain %q", execArgs, flag)
|
||||||
|
@ -25,24 +25,6 @@ set -o errexit
|
|||||||
set -o nounset
|
set -o nounset
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
function convert-manifest-params {
|
|
||||||
# A helper function to convert the manifest args from a string to a list of
|
|
||||||
# flag arguments.
|
|
||||||
# Old format:
|
|
||||||
# command=["/bin/sh", "-c", "exec KUBE_EXEC_BINARY --param1=val1 --param2-val2"].
|
|
||||||
# New format:
|
|
||||||
# command=["KUBE_EXEC_BINARY"] # No shell dependencies.
|
|
||||||
# args=["--param1=val1", "--param2-val2"]
|
|
||||||
IFS=' ' read -ra FLAGS <<< "$1"
|
|
||||||
params=""
|
|
||||||
for flag in "${FLAGS[@]}"; do
|
|
||||||
params+="\n\"$flag\","
|
|
||||||
done
|
|
||||||
if [ ! -z $params ]; then
|
|
||||||
echo "${params::-1}" # drop trailing comma
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
function setup-os-params {
|
function setup-os-params {
|
||||||
# Reset core_pattern. On GCI, the default core_pattern pipes the core dumps to
|
# Reset core_pattern. On GCI, the default core_pattern pipes the core dumps to
|
||||||
# /sbin/crash_reporter which is more restrictive in saving crash dumps. So for
|
# /sbin/crash_reporter which is more restrictive in saving crash dumps. So for
|
||||||
@ -1849,10 +1831,6 @@ function start-kube-apiserver {
|
|||||||
# params is passed by reference, so no "$"
|
# params is passed by reference, so no "$"
|
||||||
setup-etcd-encryption "${src_file}" params
|
setup-etcd-encryption "${src_file}" params
|
||||||
|
|
||||||
params+=" --log-file=${KUBE_API_SERVER_LOG_PATH:-/var/log/kube-apiserver.log}"
|
|
||||||
params+=" --logtostderr=false"
|
|
||||||
params+=" --log-file-max-size=0"
|
|
||||||
params="$(convert-manifest-params "${params}")"
|
|
||||||
# Evaluate variables.
|
# Evaluate variables.
|
||||||
local -r kube_apiserver_docker_tag="${KUBE_API_SERVER_DOCKER_TAG:-$(cat /home/kubernetes/kube-docker-files/kube-apiserver.docker_tag)}"
|
local -r kube_apiserver_docker_tag="${KUBE_API_SERVER_DOCKER_TAG:-$(cat /home/kubernetes/kube-docker-files/kube-apiserver.docker_tag)}"
|
||||||
sed -i -e "s@{{params}}@${params}@g" "${src_file}"
|
sed -i -e "s@{{params}}@${params}@g" "${src_file}"
|
||||||
@ -2034,8 +2012,7 @@ function apply-encryption-config() {
|
|||||||
function start-kube-controller-manager {
|
function start-kube-controller-manager {
|
||||||
echo "Start kubernetes controller-manager"
|
echo "Start kubernetes controller-manager"
|
||||||
create-kubeconfig "kube-controller-manager" ${KUBE_CONTROLLER_MANAGER_TOKEN}
|
create-kubeconfig "kube-controller-manager" ${KUBE_CONTROLLER_MANAGER_TOKEN}
|
||||||
local LOG_PATH=/var/log/kube-controller-manager.log
|
prepare-log-file /var/log/kube-controller-manager.log
|
||||||
prepare-log-file "${LOG_PATH}"
|
|
||||||
# Calculate variables and assemble the command line.
|
# Calculate variables and assemble the command line.
|
||||||
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}"
|
||||||
params+=" --use-service-account-credentials"
|
params+=" --use-service-account-credentials"
|
||||||
@ -2063,7 +2040,7 @@ function start-kube-controller-manager {
|
|||||||
params+=" --concurrent-service-syncs=${CONCURRENT_SERVICE_SYNCS}"
|
params+=" --concurrent-service-syncs=${CONCURRENT_SERVICE_SYNCS}"
|
||||||
fi
|
fi
|
||||||
if [[ "${NETWORK_PROVIDER:-}" == "kubenet" ]]; then
|
if [[ "${NETWORK_PROVIDER:-}" == "kubenet" ]]; then
|
||||||
params+=" --allocate-node-cidrs"
|
params+=" --allocate-node-cidrs=true"
|
||||||
elif [[ -n "${ALLOCATE_NODE_CIDRS:-}" ]]; then
|
elif [[ -n "${ALLOCATE_NODE_CIDRS:-}" ]]; then
|
||||||
params+=" --allocate-node-cidrs=${ALLOCATE_NODE_CIDRS}"
|
params+=" --allocate-node-cidrs=${ALLOCATE_NODE_CIDRS}"
|
||||||
fi
|
fi
|
||||||
@ -2094,14 +2071,9 @@ function start-kube-controller-manager {
|
|||||||
params+=" --pv-recycler-pod-template-filepath-hostpath=$PV_RECYCLER_OVERRIDE_TEMPLATE"
|
params+=" --pv-recycler-pod-template-filepath-hostpath=$PV_RECYCLER_OVERRIDE_TEMPLATE"
|
||||||
fi
|
fi
|
||||||
if [[ -n "${RUN_CONTROLLERS:-}" ]]; then
|
if [[ -n "${RUN_CONTROLLERS:-}" ]]; then
|
||||||
# Trim the `RUN_CONTROLLERS` value. This field is quoted which is
|
params+=" --controllers=${RUN_CONTROLLERS}"
|
||||||
# incompatible with the `convert-manifest-params` format.
|
|
||||||
params+=" --controllers=${RUN_CONTROLLERS//\'}"
|
|
||||||
fi
|
fi
|
||||||
params+=" --log-file=${LOG_PATH}"
|
|
||||||
params+=" --logtostderr=false"
|
|
||||||
params+=" --log-file-max-size=0"
|
|
||||||
params="$(convert-manifest-params "${params}")"
|
|
||||||
local -r kube_rc_docker_tag=$(cat /home/kubernetes/kube-docker-files/kube-controller-manager.docker_tag)
|
local -r kube_rc_docker_tag=$(cat /home/kubernetes/kube-docker-files/kube-controller-manager.docker_tag)
|
||||||
local container_env=""
|
local container_env=""
|
||||||
if [[ -n "${ENABLE_CACHE_MUTATION_DETECTOR:-}" ]]; then
|
if [[ -n "${ENABLE_CACHE_MUTATION_DETECTOR:-}" ]]; then
|
||||||
@ -2136,8 +2108,7 @@ function start-kube-controller-manager {
|
|||||||
function start-kube-scheduler {
|
function start-kube-scheduler {
|
||||||
echo "Start kubernetes scheduler"
|
echo "Start kubernetes scheduler"
|
||||||
create-kubeconfig "kube-scheduler" ${KUBE_SCHEDULER_TOKEN}
|
create-kubeconfig "kube-scheduler" ${KUBE_SCHEDULER_TOKEN}
|
||||||
local LOG_PATH=/var/log/kube-scheduler.log
|
prepare-log-file /var/log/kube-scheduler.log
|
||||||
prepare-log-file "${LOG_PATH}"
|
|
||||||
|
|
||||||
# Calculate variables and set them in the manifest.
|
# Calculate variables and set them in the manifest.
|
||||||
params="${SCHEDULER_TEST_LOG_LEVEL:-"--v=2"} ${SCHEDULER_TEST_ARGS:-}"
|
params="${SCHEDULER_TEST_LOG_LEVEL:-"--v=2"} ${SCHEDULER_TEST_ARGS:-}"
|
||||||
@ -2153,11 +2124,6 @@ function start-kube-scheduler {
|
|||||||
params+=" --use-legacy-policy-config"
|
params+=" --use-legacy-policy-config"
|
||||||
params+=" --policy-config-file=/etc/srv/kubernetes/kube-scheduler/policy-config"
|
params+=" --policy-config-file=/etc/srv/kubernetes/kube-scheduler/policy-config"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
params+=" --log-file=${LOG_PATH}"
|
|
||||||
params+=" --logtostderr=false"
|
|
||||||
params+=" --log-file-max-size=0"
|
|
||||||
params="$(convert-manifest-params "${params}")"
|
|
||||||
local -r kube_scheduler_docker_tag=$(cat "${KUBE_HOME}/kube-docker-files/kube-scheduler.docker_tag")
|
local -r kube_scheduler_docker_tag=$(cat "${KUBE_HOME}/kube-docker-files/kube-scheduler.docker_tag")
|
||||||
|
|
||||||
# Remove salt comments and replace variables with values.
|
# Remove salt comments and replace variables with values.
|
||||||
|
@ -25,12 +25,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"command": [
|
"command": [
|
||||||
"/usr/local/bin/kube-apiserver"
|
"/bin/sh",
|
||||||
],
|
"-c",
|
||||||
"args": [
|
"exec /usr/local/bin/kube-apiserver {{params}} --allow-privileged={{pillar['allow_privileged']}} 1>>/var/log/kube-apiserver.log 2>&1"
|
||||||
"--allow-privileged={{pillar['allow_privileged']}}",
|
],
|
||||||
{{params}}
|
|
||||||
],
|
|
||||||
{{container_env}}
|
{{container_env}}
|
||||||
"livenessProbe": {
|
"livenessProbe": {
|
||||||
"httpGet": {
|
"httpGet": {
|
||||||
|
@ -25,11 +25,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"command": [
|
"command": [
|
||||||
"/usr/local/bin/kube-controller-manager"
|
"/bin/sh",
|
||||||
],
|
"-c",
|
||||||
"args": [
|
"exec /usr/local/bin/kube-controller-manager {{params}} 1>>/var/log/kube-controller-manager.log 2>&1"
|
||||||
{{params}}
|
],
|
||||||
],
|
|
||||||
{{container_env}}
|
{{container_env}}
|
||||||
"livenessProbe": {
|
"livenessProbe": {
|
||||||
"httpGet": {
|
"httpGet": {
|
||||||
|
@ -25,11 +25,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"command": [
|
"command": [
|
||||||
"/usr/local/bin/kube-scheduler"
|
"/bin/sh",
|
||||||
],
|
"-c",
|
||||||
"args": [
|
"exec /usr/local/bin/kube-scheduler {{params}} 1>>/var/log/kube-scheduler.log 2>&1"
|
||||||
{{params}}
|
],
|
||||||
],
|
|
||||||
"livenessProbe": {
|
"livenessProbe": {
|
||||||
"httpGet": {
|
"httpGet": {
|
||||||
"host": "127.0.0.1",
|
"host": "127.0.0.1",
|
||||||
|
Loading…
Reference in New Issue
Block a user