Skip to content

Commit abd4967

Browse files
authored
Merge pull request lockc-project#196 from vadorovsky/cilium-version
terraform: Use default Cilium version
2 parents 638a652 + 34cf3c0 commit abd4967

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

contrib/terraform/libvirt/deploy-kubernetes.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ fi
1414

1515
sleep 5
1616

17-
CILIUM_VERSION=$(curl -s https://api.github.com/repos/cilium/cilium/releases/latest | jq -r '.tag_name' | sed -e 's/^v//')
18-
1917
info "### Run following commands to bootstrap Kubernetes cluster:\\n"
2018

2119
i=0
@@ -29,7 +27,7 @@ for MASTER in $TR_MASTER_IPS; do
2927
sudo cp /etc/kubernetes/admin.conf /home/${TR_USERNAME}/.kube/config
3028
sudo chown ${TR_USERNAME}:users /home/${TR_USERNAME}/.kube/config
3129
helm repo add cilium https://helm.cilium.io/
32-
helm install cilium cilium/cilium --version ${CILIUM_VERSION} --namespace kube-system --set kubeProxyReplacement=disabled
30+
helm install cilium cilium/cilium --namespace kube-system --set kubeProxyReplacement=disabled
3331
EOF
3432

3533
export KUBEADM_MASTER_JOIN=`ssh -o 'StrictHostKeyChecking no' -l ${TR_USERNAME} ${MASTER} tail -n12 kubeadm-init.log | head -n3`

contrib/terraform/openstack/deploy-kubernetes.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ fi
1515

1616
sleep 5
1717

18-
CILIUM_VERSION=$(curl -s https://api.github.com/repos/cilium/cilium/releases/latest | jq -r '.tag_name' | sed -e 's/^v//')
19-
2018
info "### Run following commands to bootstrap Kubernetes cluster:\\n"
2119

2220
i=0
@@ -30,7 +28,7 @@ for MASTER in $TR_MASTER_IPS; do
3028
sudo cp /etc/kubernetes/admin.conf /home/${TR_USERNAME}/.kube/config
3129
sudo chown ${TR_USERNAME}:users /home/${TR_USERNAME}/.kube/config
3230
helm repo add cilium https://helm.cilium.io/
33-
helm install cilium cilium/cilium --version ${CILIUM_VERSION} --namespace kube-system --set kubeProxyReplacement=disabled
31+
helm install cilium cilium/cilium --namespace kube-system --set kubeProxyReplacement=disabled
3432
EOF
3533

3634
export KUBEADM_MASTER_JOIN=`ssh -o 'StrictHostKeyChecking no' -l ${TR_USERNAME} ${MASTER} tail -n12 kubeadm-init.log | head -n3`

0 commit comments

Comments
 (0)