Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 1.28] Default to apiserver-proxy port for worker kubeconfigs (#4265) #4286

Merged
merged 1 commit into from
Nov 4, 2023
Merged

[Backport 1.28] Default to apiserver-proxy port for worker kubeconfigs (#4265) #4286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions microk8s-resources/actions/common/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,10 +634,21 @@ create_user_kubeconfigs() {
}

create_worker_kubeconfigs() {
# $1: (Optional) API server IP
# $2: (Optional) API server port
apiserver="${1}"
port="${2}"
# $1: (Optional) API server IP, defaults to IP address from traefik-template.yaml (or empty)
# $2: (Optional) API server port, defaults to port from traefik-template.yaml

# NOTE(neoaggelos): Examples for how "${var%:*}" and ${var##*:} below behave
# apiserver_proxy_listen=":16443" => apiserver_default="" port_default="16443"
# apiserver_proxy_listen="1.1.1.1:6443" => apiserver_default="1.1.1.1" port_default="6443"
# apiserver_proxy_listen="[::1]:16443" => apiserver_default="[::1]" port_default="16443"
# apiserver_proxy_listen="" => apiserver_default="" port_default=""

local apiserver_proxy_listen="$($SNAP/bin/cat $SNAP_DATA/args/traefik/traefik-template.yaml | $SNAP/bin/grep "address:" | $SNAP/usr/bin/cut -d'"' -f2)"
local apiserver_default="${apiserver_proxy_listen%:*}" # drop last ':' and everything after
local port_default="${apiserver_proxy_listen##*:}" # drop last ':' and everything before

local apiserver="${1:-$apiserver_default}"
local port="${2:-$port_default}"

hostname=$($SNAP/bin/hostname | $SNAP/usr/bin/tr '[:upper:]' '[:lower:]')
create_kubeconfig_x509 "proxy.config" "system:kube-proxy" ${SNAP_DATA}/certs/proxy.crt ${SNAP_DATA}/certs/proxy.key ${SNAP_DATA}/certs/ca.remote.crt "${apiserver}" "${port}"
Expand Down