diff --git a/Makefile b/Makefile index 8e73bda..1d7a75d 100644 --- a/Makefile +++ b/Makefile @@ -247,7 +247,6 @@ endef export METAL_PARTITION ?= mini-lab export METAL_PROJECT_ID ?= 00000000-0000-0000-0000-000000000001 export METAL_NODE_NETWORK_ID ?= $(shell metalctl network list --name metal-test -o template --template '{{ .id }}') -export CONTROL_PLANE_ENDPOINT ?= "203.0.113.129:443" export CONTROL_PLANE_MACHINE_IMAGE ?= ubuntu-24.04 export CONTROL_PLANE_MACHINE_SIZE ?= v1-small-x86 export WORKER_MACHINE_IMAGE ?= ubuntu-24.04 diff --git a/config/clusterctl-templates/cluster-template.yaml b/config/clusterctl-templates/cluster-template.yaml index 5c63cb7..65796a3 100644 --- a/config/clusterctl-templates/cluster-template.yaml +++ b/config/clusterctl-templates/cluster-template.yaml @@ -65,12 +65,11 @@ spec: name: ${CLUSTER_NAME}-controlplane kubeadmConfigSpec: format: ignition - clusterConfiguration: - controlPlaneEndpoint: ${CONTROL_PLANE_ENDPOINT} + clusterConfiguration: {} initConfiguration: localAPIEndpoint: advertiseAddress: 127.0.0.1 - bindPort: ${CONTROL_PLANE_PORT:=443} + bindPort: 443 nodeRegistration: {} joinConfiguration: controlPlane: {} @@ -117,7 +116,6 @@ spec: template: spec: format: ignition - clusterConfiguration: - controlPlaneEndpoint: ${CONTROL_PLANE_ENDPOINT} + clusterConfiguration: {} joinConfiguration: nodeRegistration: {} diff --git a/config/clusterctl-templates/example_variables.rc b/config/clusterctl-templates/example_variables.rc index 1cdb814..948f96d 100644 --- a/config/clusterctl-templates/example_variables.rc +++ b/config/clusterctl-templates/example_variables.rc @@ -10,8 +10,6 @@ export FIREWALL_MACHINE_SIZE=v1-small-x86 export FIREWALL_MACHINE_IMAGE= export FIREWALL_NETWORKS=[internet] -export CONTROL_PLANE_ENDPOINT=203.0.113.129:443 -export CONTROL_PLANE_PORT=443 export CONTROL_PLANE_MACHINE_SIZE=v1-small-x86 export CONTROL_PLANE_MACHINE_IMAGE=ubuntu-24.04