mirror of https://github.com/k3s-io/k3s
Merge pull request #60431 from dims/use-feature-gates-on-kube-proxy-command-line
Automatic merge from submit-queue (batch tested with PRs 59365, 60446, 60448, 55019, 60431). 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>. Use feature-gates command line for kube-proxy **What this PR does / why we need it**: Avoid throwing `featureGates:` into the kube-proxy yaml, since it's not in the right format. It should be ``` featureGates: AllAlpha: true ``` Since FEATURES_GATES is set to `AllAlpha=true`, we can't just throw that into the yaml file. Just pass along FEATURES_GATES in the command line instead just like we do for all other services **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 #60426 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```pull/6/head
commit
744b5d3357
|
@ -817,14 +817,14 @@ kind: KubeProxyConfiguration
|
|||
clientConnection:
|
||||
kubeconfig: ${CERT_DIR}/kube-proxy.kubeconfig
|
||||
hostnameOverride: ${HOSTNAME_OVERRIDE}
|
||||
featureGates: ${FEATURE_GATES}
|
||||
mode: ${KUBE_PROXY_MODE}
|
||||
EOF
|
||||
|
||||
sudo "${GO_OUT}/hyperkube" proxy \
|
||||
--v=${LOG_LEVEL} \
|
||||
--feature-gates="${FEATURE_GATES}" \
|
||||
--config=/tmp/kube-proxy.yaml \
|
||||
--master="https://${API_HOST}:${API_SECURE_PORT}" >"${PROXY_LOG}" \
|
||||
--v=${LOG_LEVEL} 2>&1 &
|
||||
--master="https://${API_HOST}:${API_SECURE_PORT}" >"${PROXY_LOG}" 2>&1 &
|
||||
PROXY_PID=$!
|
||||
|
||||
SCHEDULER_LOG=${LOG_DIR}/kube-scheduler.log
|
||||
|
|
Loading…
Reference in New Issue