make makefile target install-ccm-in-wl-cluster work again.

Author: guettli

.gitignore

@@ -83,3 +83,5 @@ watchall-output*
 /conditions*.txt
 
 /.config
+
+/.kube

Makefile

@@ -192,9 +192,11 @@ install-cilium-in-wl-cluster:
 		-f templates/cilium/cilium.yaml
 
 
-install-ccm-in-wl-cluster:
+install-ccm-in-wl-cluster: $(WORKER_CLUSTER_KUBECONFIG)
 ifeq ($(BUILD_IN_CONTAINER),true)
 	docker run  --rm \
+	    -e CLUSTER_NAME=$(CLUSTER_NAME) \
+	    -e KUBECONFIG=$(KUBECONFIG) \
 		-v $(shell go env GOPATH)/pkg:/go/pkg$(MOUNT_FLAGS) \
 		-v $(shell pwd):/src/cluster-api-provider-$(INFRA_PROVIDER)$(MOUNT_FLAGS) \
 		$(BUILDER_IMAGE):$(BUILDER_IMAGE_VERSION) $@;
@@ -438,6 +440,7 @@ $(ARTIFACTS):
 $(MGT_CLUSTER_KUBECONFIG):
 	./hack/get-kubeconfig-of-management-cluster.sh
 
+.PHONY: $(WORKER_CLUSTER_KUBECONFIG)
 $(WORKER_CLUSTER_KUBECONFIG):
 	./hack/get-kubeconfig-of-workload-cluster.sh
 

controllers/hetznercluster_controller.go

@@ -595,7 +595,7 @@ func reconcileOneWorkloadClusterSecret(ctx context.Context, clusterScope *scope.
 		}
 
 		if clusterScope.HetznerCluster.Spec.HetznerSecret.Name != "hcloud" {
-			notes = append(notes, fmt.Sprintf("We recommend to use 'hcloud' for hetznercluster.spec.hetznerSecret.name(not %q).",
+			notes = append(notes, fmt.Sprintf("We recommend to use 'hcloud' for hetznercluster.spec.hetznerSecret.name (not %q).",
 				clusterScope.HetznerCluster.Spec.HetznerSecret.Name))
 		}
 

hack/get-kubeconfig-of-workload-cluster.sh

@@ -16,12 +16,26 @@
 
 set -euo pipefail
 
-if [ -z "$CLUSTER_NAME" ]; then
+if [ -z "${CLUSTER_NAME:-}" ]; then
     echo "env var CLUSTER_NAME is missing. Failed to get kubeconfig of workload cluster"
     exit 1
 fi
+
+if [ -z "${KUBECONFIG:-}" ]; then
+    echo "env var KUBECONFIG (for mgt-cluster) is missing. Failed to get kubeconfig of workload cluster"
+    exit 1
+fi
+
+if [[ ! -e $KUBECONFIG ]]; then
+    echo "KUBECONFIG=$KUBECONFIG file does not exist!  Failed to get kubeconfig of workload cluster"
+    exit 1
+fi
+
 kubeconfig=".workload-cluster-kubeconfig.yaml"
-new_content="$(kubectl get secrets "${CLUSTER_NAME}-kubeconfig" -ojsonpath='{.data.value}' | base64 -d)"
+if ! new_content="$(kubectl get secrets "${CLUSTER_NAME}-kubeconfig" -ojsonpath='{.data.value}' 2>/dev/null | base64 -d)"; then
+    echo "error: Failed to get kubeconfig of wl-cluster"
+    exit 1
+fi
 
 if [ -z "$new_content" ]; then
     echo "failed to get kubeconfig of workload cluster"