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

fix: replace master with control #139

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: replace master with control #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c9234e
fix: replace master with control
iandyh Jan 9, 2025
476f545
fix: make the sa token management more flexible
iandyh Jan 9, 2025
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
14 changes: 10 additions & 4 deletions kubernetes/generate_kubeconfig.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,25 @@ if [ "$1" == "" ]; then
exit 1
fi

if [ "$2" == "" ]; then
echo "Provide the service account secret name"
exit 1
fi


# get token from secret
TOKEN=$(kubectl -n $1 get secrets $(kubectl -n $1 get sa shibuya -o=custom-columns=:."secrets[0].name") -o=custom-columns=:.data.token)
TOKEN=$(kubectl -n $1 get secrets $2 -o=custom-columns=:.data.token)
TOKEN=$(echo $TOKEN | base64 -d)
kubeconfig=$(echo "$kubeconfig" | sed 's,TOKEN_HERE,'"$TOKEN"',g')

# get ca.crt from secret
CAcrt=$(kubectl -n $1 get secrets $(kubectl -n $1 get sa shibuya -o=custom-columns=:."secrets[0].name") -o=custom-columns=:.data."ca\.crt" | tr -d '\n')
CAcrt=$(kubectl -n $1 get secrets $2 -o=custom-columns=:.data."ca\.crt" | tr -d '\n')
kubeconfig=$(echo "$kubeconfig" | sed 's,CA_HERE,'"$CAcrt"',g')

# get API server master url
SERVER=$(TERM=dumb kubectl cluster-info | grep "Kubernetes master" | awk '{print $NF}')
SERVER=$(TERM=dumb kubectl cluster-info | grep "Kubernetes control" | awk '{print $NF}')
kubeconfig=$(echo "$kubeconfig" | sed 's,SERVER_HERE,'"$SERVER"',g')

# export kubeconfig to shibuya/config/kube_configs using context name
FILEPATH="shibuya/config/kube_configs/$(kubectl config current-context)"
echo "$kubeconfig" > "$FILEPATH"
echo "$kubeconfig" > "$FILEPATH"
7 changes: 6 additions & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,14 @@ expose:
# After k8s 1.22, service account token is no longer auto generated. We need to manually create the secret
# for the service account. ref: "https://kubernetes.io/docs/reference/access-authn-authz/service-accounts-admin/#manual-secret-management-for-serviceaccounts"
# So we should fetch the token details from the manually created secret instead of the automatically created ones

# the shell script used here will rely on the secret in kubernetes/service-account-secret.yaml. So please create the secret first
# then export shibuya_sa_secret={secret name}

# Then run the script below.
.PHONY: kubeconfig
kubeconfig:
./kubernetes/generate_kubeconfig.sh $(shibuya-controller-ns)
./kubernetes/generate_kubeconfig.sh $(shibuya-controller-ns) $(shibuya_sa_secret)

.PHONY: permissions
permissions:
Expand Down