github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 21:36:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122710 from dims/local-up-cluster-use-newly-built-library-always

Browse Source 
local-up-cluster: use the newly built library always
This commit is contained in:
Kubernetes Prow Robot 2024-01-11 18:25:47 +01:00 committed by GitHub
commit 9d86dbd0ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hack/local-up-cluster.sh
View File

@ -1324,7 +1324,7 @@ if [[ "${ENABLE_DAEMON}" = false ]]; then
trap cleanup INT trap cleanup INT
fi fi
KUBECTL=${KUBECTL:-"${GO_OUT}/kubectl"} KUBECTL=$(kube::util::find-binary "kubectl")
echo "Starting services now!" echo "Starting services now!"
if [[ "${START_MODE}" != "kubeletonly" ]]; then if [[ "${START_MODE}" != "kubeletonly" ]]; then
@ -1391,8 +1391,8 @@ if [[ "${ENABLE_DAEMON}" = false ]]; then
fi fi
if [[ "${KUBETEST_IN_DOCKER:-}" == "true" ]]; then if [[ "${KUBETEST_IN_DOCKER:-}" == "true" ]]; then
cluster/kubectl.sh config set-cluster local --server=https://localhost:6443 --certificate-authority=/var/run/kubernetes/server-ca.crt ${KUBECTL} config set-cluster local --server=https://localhost:6443 --certificate-authority=/var/run/kubernetes/server-ca.crt
cluster/kubectl.sh config set-credentials myself --client-key=/var/run/kubernetes/client-admin.key --client-certificate=/var/run/kubernetes/client-admin.crt ${KUBECTL} config set-credentials myself --client-key=/var/run/kubernetes/client-admin.key --client-certificate=/var/run/kubernetes/client-admin.crt
cluster/kubectl.sh config set-context local --cluster=local --user=myself ${KUBECTL} config set-context local --cluster=local --user=myself
cluster/kubectl.sh config use-context local ${KUBECTL} config use-context local
fi fi