Skip to content

Commit 508b500

Browse files
committed
fix: cluster id
1 parent 0ae0900 commit 508b500

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

capi-lab/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ mtu-fix:
9999

100100
.PHONY: deploy-metal-ccm
101101
deploy-metal-ccm:
102-
$(eval METAL_CLUSTER_ID = $(shell kubectl get metalstackclusters.infrastructure.cluster.x-k8s.io $(CLUSTER_NAME) -ojsonpath='{.metadata.uid}'))
102+
$(eval NAMESPACE = $(shell kubectl get metalstackclusters.infrastructure.cluster.x-k8s.io $(CLUSTER_NAME) -ojsonpath='{.metadata.namespace}'))
103103
$(eval METAL_NODE_NETWORK_ID = $(shell metalctl network list --name $(CLUSTER_NAME) -o template --template '{{ .id }}'))
104104
$(eval CONTROL_PLANE_IP = $(shell metalctl network ip list --name "$(CLUSTER_NAME)-vip" -o template --template '{{ .id }}'))
105105
cat metal-ccm.yaml | envsubst | kubectl --kubeconfig=.capms-cluster-kubeconfig.yaml apply -f -

capi-lab/metal-ccm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ spec:
184184
value: mini-lab
185185
# associates service type load balancer ips with this cluster:
186186
- name: METAL_CLUSTER_ID
187-
value: ${METAL_CLUSTER_ID}
187+
value: ${NAMESPACE}.${CLUSTER_NAME}
188188
- name: METAL_DEFAULT_EXTERNAL_NETWORK_ID
189189
value: internet-mini-lab
190190
- name: METAL_ADDITIONAL_NETWORKS

0 commit comments

Comments
 (0)