Skip to content

K
k3s
Unverified Commit 2e0181af authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #55181 from rramkumar1/custom-kube-proxy

Automatic merge from submit-queue (batch tested with PRs 51001, 55181). 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>. Added logic for custom kube proxy yaml for GKE Added yaml-replacement logic for custom kube-proxy daemon set on GKE. Release Note: ```release-note None ```
parents 3a3e090b eeb643dd
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
cluster/gce/container-linux/configure-helper.sh
View file @ 2e0181af
...@@ -1241,6 +1241,13 @@ function start-kube-addons { ...@@ -1241,6 +1241,13 @@ function start-kube-addons {
# Set up manifests of other addons. # Set up manifests of other addons.
if [[ "${KUBE_PROXY_DAEMONSET:-}" == "true" ]]; then if [[ "${KUBE_PROXY_DAEMONSET:-}" == "true" ]]; then
if [ -n "${CUSTOM_KUBE_PROXY_YAML:-}" ]; then
# Replace with custom GKE kube proxy.
cat > "$src_dir/kube-proxy/kube-proxy-ds.yaml" <<EOF
$(echo "$CUSTOM_KUBE_PROXY_YAML")
EOF
update-prometheus-to-sd-parameters "$src_dir/kube-proxy/kube-proxy-ds.yaml"
fi
prepare-kube-proxy-manifest-variables "$src_dir/kube-proxy/kube-proxy-ds.yaml" prepare-kube-proxy-manifest-variables "$src_dir/kube-proxy/kube-proxy-ds.yaml"
setup-addon-manifests "addons" "kube-proxy" setup-addon-manifests "addons" "kube-proxy"
fi fi
......
cluster/gce/gci/configure-helper.sh
View file @ 2e0181af
...@@ -1776,6 +1776,13 @@ function start-kube-addons { ...@@ -1776,6 +1776,13 @@ function start-kube-addons {
# Set up manifests of other addons. # Set up manifests of other addons.
if [[ "${KUBE_PROXY_DAEMONSET:-}" == "true" ]]; then if [[ "${KUBE_PROXY_DAEMONSET:-}" == "true" ]]; then
if [ -n "${CUSTOM_KUBE_PROXY_YAML:-}" ]; then
# Replace with custom GKE kube proxy.
cat > "$src_dir/kube-proxy/kube-proxy-ds.yaml" <<EOF
$(echo "$CUSTOM_KUBE_PROXY_YAML")
EOF
update-prometheus-to-sd-parameters "$src_dir/kube-proxy/kube-proxy-ds.yaml"
fi
prepare-kube-proxy-manifest-variables "$src_dir/kube-proxy/kube-proxy-ds.yaml" prepare-kube-proxy-manifest-variables "$src_dir/kube-proxy/kube-proxy-ds.yaml"
setup-addon-manifests "addons" "kube-proxy" setup-addon-manifests "addons" "kube-proxy"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment