Skip to content

Commit b58db2c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #436 from cprivitere/cprivitere/issue435
Update templates
2 parents 8d2e4db + 278e397 commit b58db2c

File tree

5 files changed

+45
-50
lines changed

5 files changed

+45
-50
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,13 @@ 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
160+
mkdir -p $HOME/.kube
161+
cp /etc/kubernetes/admin.conf $HOME/.kube/config
162+
echo "source <(kubectl completion bash)" >> $HOME/.bashrc
163+
echo "alias k=kubectl" >> $HOME/.bashrc
164+
echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
164165
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
166+
export KUBECONFIG=/etc/kubernetes/admin.conf
165167
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
166168
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "eipTag": "cluster-api-provider-packet:cluster-id:${CLUSTER_NAME}", "eipHealthCheckUseHostIP": true}'''
167169
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}")

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,13 @@ 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
153+
mkdir -p $HOME/.kube
154+
cp /etc/kubernetes/admin.conf $HOME/.kube/config
155+
echo "source <(kubectl completion bash)" >> $HOME/.bashrc
156+
echo "alias k=kubectl" >> $HOME/.bashrc
157+
echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
157158
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
159+
export KUBECONFIG=/etc/kubernetes/admin.conf
158160
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
159161
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "loadbalancer": "kube-vip://", "facility": "${FACILITY}"}'''
160162
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}")
@@ -171,12 +173,8 @@ spec:
171173
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
172174
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
173175
--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
179176
fi
177+
rm /run/metadata.json
180178
preKubeadmCommands:
181179
- |
182180
sed -ri '/\sswap\s/s/^#?/#/' /etc/fstab
@@ -215,12 +213,12 @@ spec:
215213
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
216214
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
217215
systemctl restart containerd
216+
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
217+
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
218+
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
219+
done
218220
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
219221
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
224222
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
225223
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
226224
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
@@ -232,7 +230,6 @@ spec:
232230
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
233231
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
234232
--bgpRouterID $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_ip') > /etc/kubernetes/manifests/vip.yaml
235-
rm /run/metadata.json
236233
fi
237234
machineTemplate:
238235
infrastructureRef:

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,13 @@ 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
132+
mkdir -p $HOME/.kube
133+
cp /etc/kubernetes/admin.conf $HOME/.kube/config
134+
echo "source <(kubectl completion bash)" >> $HOME/.bashrc
135+
echo "alias k=kubectl" >> $HOME/.bashrc
136+
echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
136137
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
138+
export KUBECONFIG=/etc/kubernetes/admin.conf
137139
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
138140
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "loadbalancer": "kube-vip://", "facility": "${FACILITY}"}'''
139141
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}")
@@ -150,12 +152,8 @@ spec:
150152
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
151153
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
152154
--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
158155
fi
156+
rm /run/metadata.json
159157
preKubeadmCommands:
160158
- |
161159
sed -ri '/\sswap\s/s/^#?/#/' /etc/fstab
@@ -194,12 +192,12 @@ spec:
194192
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
195193
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
196194
systemctl restart containerd
195+
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
196+
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
197+
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
198+
done
197199
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
198200
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
203201
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
204202
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
205203
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
@@ -211,7 +209,6 @@ spec:
211209
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
212210
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
213211
--bgpRouterID $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_ip') > /etc/kubernetes/manifests/vip.yaml
214-
rm /run/metadata.json
215212
fi
216213
machineTemplate:
217214
infrastructureRef:

‎templates/cluster-template.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,13 @@ spec:
8282
netmask 255.255.255.255
8383
EOF
8484
systemctl restart networking
85-
mkdir -p /root/.kube && cp -f /etc/kubernetes/admin.conf /root/.kube/config
86-
echo "source <(kubectl completion bash)" >> /root/.bashrc
87-
echo "alias k=kubectl" >> /root/.bashrc
88-
echo "complete -o default -F __start_kubectl k" >> /root/.bashrc
85+
mkdir -p $HOME/.kube
86+
cp /etc/kubernetes/admin.conf $HOME/.kube/config
87+
echo "source <(kubectl completion bash)" >> $HOME/.bashrc
88+
echo "alias k=kubectl" >> $HOME/.bashrc
89+
echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
8990
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
91+
export KUBECONFIG=/etc/kubernetes/admin.conf
9092
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
9193
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "eipTag": "cluster-api-provider-packet:cluster-id:${CLUSTER_NAME}", "eipHealthCheckUseHostIP": true}'''
9294
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}")

‎templates/experimental-kube-vip/kustomization.yaml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ patches:
5656
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
5757
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
5858
systemctl restart containerd
59+
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
60+
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
61+
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
62+
done
5963
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
6064
ip addr add {{ .controlPlaneEndpoint }} dev lo
61-
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
62-
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
63-
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
64-
done
6565
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
6666
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
6767
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
@@ -73,15 +73,16 @@ patches:
7373
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
7474
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
7575
--bgpRouterID $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_ip') > /etc/kubernetes/manifests/vip.yaml
76-
rm /run/metadata.json
7776
fi
7877
postKubeadmCommands:
7978
- |
80-
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
81-
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
82-
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
83-
done
79+
mkdir -p $HOME/.kube
80+
cp /etc/kubernetes/admin.conf $HOME/.kube/config
81+
echo "source <(kubectl completion bash)" >> $HOME/.bashrc
82+
echo "alias k=kubectl" >> $HOME/.bashrc
83+
echo "complete -o default -F __start_kubectl k" >> $HOME/.bashrc
8484
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
85+
export KUBECONFIG=/etc/kubernetes/admin.conf
8586
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/${CPEM_VERSION:=v3.5.0}/deployment.yaml
8687
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "loadbalancer": "kube-vip://", "facility": "${FACILITY}"}'''
8788
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}")
@@ -98,12 +99,8 @@ patches:
9899
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
99100
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
100101
--bgpRouterID $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_ip') > /etc/kubernetes/manifests/vip.yaml
101-
rm /run/metadata.json
102-
mkdir -p /root/.kube && cp -f /etc/kubernetes/admin.conf /root/.kube/config
103-
echo "source <(kubectl completion bash)" >> /root/.bashrc
104-
echo "alias k=kubectl" >> /root/.bashrc
105-
echo "complete -o default -F __start_kubectl k" >> /root/.bashrc
106102
fi
103+
rm /run/metadata.json
107104
- patch: |
108105
kind: KubeadmConfigTemplate
109106
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1

0 commit comments

Comments
 (0)