Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit bf28d93

Browse files
cpriviterecprivitere
committed
Run make generate
Signed-off-by: Chris Privitere <[email protected]>
1 parent 9876764 commit bf28d93

File tree

3 files changed

+87
-52
lines changed

3 files changed

+87
-52
lines changed

‎templates/cluster-template-crs-cni.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,12 @@ spec:
157157
netmask 255.255.255.255
158158
EOF
159159
systemctl restart networking
160+
mkdir -p /root/.kube && cp -f /etc/kubernetes/admin.conf /root/.kube/config
161+
echo "source <(kubectl completion bash)" >> /root/.bashrc
162+
echo "alias k=kubectl" >> /root/.bashrc
163+
echo "complete -o default -F __start_kubectl k" >> /root/.bashrc
160164
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
161-
export KUBECONFIG=/etc/kubernetes/admin.conf
162-
mkdir -p /root/.kube && cp -f $${KUBECONFIG} /root/.kube/config
163-
echo "source <(kubectl completion bash)" >> /root/.bashrc
164-
echo "alias k=kubectl" >> /root/.bashrc
165-
echo "complete -o default -F __start_kubectl k" >> /root/.bashrc
166-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.5.0/deployment.yaml
165+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
167166
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "eipTag": "cluster-api-provider-packet:cluster-id:${CLUSTER_NAME}", "eipHealthCheckUseHostIP": true}'''
168167
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
169168
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})

‎templates/cluster-template-kube-vip-crs-cni.yaml

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,32 @@ spec:
150150
provider-id: equinixmetal://{{ `{{ v1.instance_id }}` }}
151151
postKubeadmCommands:
152152
- |-
153+
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
154+
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
155+
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
156+
done
153157
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
154-
export KUBECONFIG=/etc/kubernetes/admin.conf
155-
mkdir -p /root/.kube && cp -f $${KUBECONFIG} /root/.kube/config
156-
echo "source <(kubectl completion bash)" >> /root/.bashrc
157-
echo "alias k=kubectl" >> /root/.bashrc
158-
echo "complete -o default -F __start_kubectl k" >> /root/.bashrc
159-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.5.0/deployment.yaml
158+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
160159
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "loadbalancer": "kube-vip://", "facility": "${FACILITY}"}'''
161160
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
162161
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})
162+
else
163+
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
164+
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
165+
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
166+
--interface "lo" \
167+
--vip "{{ .controlPlaneEndpoint }}" \
168+
--controlplane \
169+
--bgp \
170+
--peerAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_as') \
171+
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
172+
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
173+
--bgpRouterID $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_ip') > /etc/kubernetes/manifests/vip.yaml
174+
rm /run/metadata.json
175+
mkdir -p /root/.kube && cp -f /etc/kubernetes/admin.conf /root/.kube/config
176+
echo "source <(kubectl completion bash)" >> /root/.bashrc
177+
echo "alias k=kubectl" >> /root/.bashrc
178+
echo "complete -o default -F __start_kubectl k" >> /root/.bashrc
163179
fi
164180
preKubeadmCommands:
165181
- |
@@ -199,23 +215,25 @@ spec:
199215
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
200216
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
201217
systemctl restart containerd
202-
ping -c 3 -q {{ .controlPlaneEndpoint }} && echo OK || ip addr add {{ .controlPlaneEndpoint }} dev lo
203-
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
204-
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
205-
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
206-
done
207-
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
208-
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
209-
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
210-
--interface "lo" \
211-
--vip "{{ .controlPlaneEndpoint }}" \
212-
--controlplane \
213-
--bgp \
214-
--peerAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_as') \
215-
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
216-
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
217-
--bgpRouterID $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_ip') > /etc/kubernetes/manifests/vip.yaml
218-
rm /run/metadata.json
218+
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
219+
ip addr add {{ .controlPlaneEndpoint }} dev lo
220+
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
221+
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
222+
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
223+
done
224+
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
225+
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
226+
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
227+
--interface "lo" \
228+
--vip "{{ .controlPlaneEndpoint }}" \
229+
--controlplane \
230+
--bgp \
231+
--peerAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_as') \
232+
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
233+
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
234+
--bgpRouterID $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_ip') > /etc/kubernetes/manifests/vip.yaml
235+
rm /run/metadata.json
236+
fi
219237
machineTemplate:
220238
infrastructureRef:
221239
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

‎templates/cluster-template-kube-vip.yaml

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,32 @@ spec:
129129
provider-id: equinixmetal://{{ `{{ v1.instance_id }}` }}
130130
postKubeadmCommands:
131131
- |-
132+
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
133+
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
134+
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
135+
done
132136
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
133-
export KUBECONFIG=/etc/kubernetes/admin.conf
134-
mkdir -p /root/.kube && cp -f $${KUBECONFIG} /root/.kube/config
135-
echo "source <(kubectl completion bash)" >> /root/.bashrc
136-
echo "alias k=kubectl" >> /root/.bashrc
137-
echo "complete -o default -F __start_kubectl k" >> /root/.bashrc
138-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.5.0/deployment.yaml
137+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
139138
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "loadbalancer": "kube-vip://", "facility": "${FACILITY}"}'''
140139
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
141140
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})
141+
else
142+
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
143+
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
144+
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
145+
--interface "lo" \
146+
--vip "{{ .controlPlaneEndpoint }}" \
147+
--controlplane \
148+
--bgp \
149+
--peerAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_as') \
150+
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
151+
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
152+
--bgpRouterID $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_ip') > /etc/kubernetes/manifests/vip.yaml
153+
rm /run/metadata.json
154+
mkdir -p /root/.kube && cp -f /etc/kubernetes/admin.conf /root/.kube/config
155+
echo "source <(kubectl completion bash)" >> /root/.bashrc
156+
echo "alias k=kubectl" >> /root/.bashrc
157+
echo "complete -o default -F __start_kubectl k" >> /root/.bashrc
142158
fi
143159
preKubeadmCommands:
144160
- |
@@ -178,23 +194,25 @@ spec:
178194
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
179195
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
180196
systemctl restart containerd
181-
ping -c 3 -q {{ .controlPlaneEndpoint }} && echo OK || ip addr add {{ .controlPlaneEndpoint }} dev lo
182-
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
183-
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
184-
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
185-
done
186-
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
187-
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
188-
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
189-
--interface "lo" \
190-
--vip "{{ .controlPlaneEndpoint }}" \
191-
--controlplane \
192-
--bgp \
193-
--peerAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_as') \
194-
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
195-
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
196-
--bgpRouterID $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_ip') > /etc/kubernetes/manifests/vip.yaml
197-
rm /run/metadata.json
197+
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
198+
ip addr add {{ .controlPlaneEndpoint }} dev lo
199+
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
200+
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
201+
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
202+
done
203+
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
204+
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
205+
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
206+
--interface "lo" \
207+
--vip "{{ .controlPlaneEndpoint }}" \
208+
--controlplane \
209+
--bgp \
210+
--peerAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_as') \
211+
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
212+
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
213+
--bgpRouterID $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_ip') > /etc/kubernetes/manifests/vip.yaml
214+
rm /run/metadata.json
215+
fi
198216
machineTemplate:
199217
infrastructureRef:
200218
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

0 commit comments

Comments
 (0)