Skip to content

Commit 9a34837

Browse files
authored
🌱 remove old cilium version. Update to 1.17.2 (#1571)
remove old cilium version. Update to 1.17.2
1 parent 02c95b1 commit 9a34837

File tree

7 files changed

+467
-80
lines changed

7 files changed

+467
-80
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,5 @@ watchall-output*
7979

8080
/*.kubeconfig
8181
/*.log
82+
83+
/.config

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ wait-and-get-secret:
196196
install-cilium-in-wl-cluster: $(HELM)
197197
# Deploy cilium
198198
$(HELM) repo add cilium https://helm.cilium.io/
199-
$(HELM) repo update cilium
200-
KUBECONFIG=$(WORKER_CLUSTER_KUBECONFIG) $(HELM) upgrade --install cilium cilium/cilium --version 1.14.4 \
199+
$(HELM) repo update cilium \
201200
--namespace kube-system \
202201
-f templates/cilium/cilium.yaml
203202

docs/caph/01-getting-started/02-quickstart/03-creating-a-workload-cluster.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,13 @@ Cilium is used as a CNI solution in this guide. The following command deploys it
7676
```shell
7777
helm repo add cilium https://helm.cilium.io/
7878

79-
KUBECONFIG=$CAPH_WORKER_CLUSTER_KUBECONFIG helm upgrade --install cilium cilium/cilium --version 1.14.4 \
79+
KUBECONFIG=$CAPH_WORKER_CLUSTER_KUBECONFIG helm upgrade --install cilium cilium/cilium \
8080
--namespace kube-system \
8181
-f templates/cilium/cilium.yaml
8282
```
8383

8484
You can, of course, also install an alternative CNI, e.g., calico.
8585

86-
{% callout %}
87-
88-
There is a bug in Ubuntu that requires the older version of Cilium for this quickstart guide.
89-
90-
{% /callout %}
91-
9286
## Deploy the CCM
9387

9488
### Deploy HCloud Cloud Controller Manager - _hcloud only_

docs/caph/02-topics/05-baremetal/03-creating-workload-cluster.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ TEST SUITE: None
9595
For CNI, let's deploy cilium in the workload cluster that will facilitate the networking in the cluster.
9696

9797
```shell
98-
$ helm install cilium cilium/cilium --version 1.15.3 --kubeconfig workload-kubeconfig
98+
$ helm install cilium cilium/cilium --kubeconfig workload-kubeconfig
9999
NAME: cilium
100100
LAST DEPLOYED: Thu Apr 4 21:11:13 2024
101101
NAMESPACE: default
@@ -105,8 +105,6 @@ TEST SUITE: None
105105
NOTES:
106106
You have successfully installed Cilium with Hubble.
107107

108-
Your release version is 1.15.3.
109-
110108
For any further help, visit https://docs.cilium.io/en/v1.15/gettinghelp
111109
```
112110

templates/cilium/cilium.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ hubble:
1919
ipam:
2020
mode: "kubernetes"
2121

22-
kubeProxyReplacement: "partial"
22+
kubeProxyReplacement: true
2323

2424
operator:
2525
rollOutPods: true

test/e2e/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ e2e-cilium-templates:
5858
# Missing: ["BIN_PATH"]
5959
helm repo add cilium https://helm.cilium.io/
6060
helm repo update cilium
61-
helm template cilium cilium/cilium --version 1.15.4 \
61+
helm template cilium cilium/cilium --version 1.17.2 \
6262
--namespace kube-system \
6363
-f $(REPO_ROOT)/templates/cilium/cilium.yaml > $(REPO_ROOT)/test/e2e/data/cni/cilium/cilium.yaml
6464
sed -i 's/$${BIN_PATH}/$$BIN_PATH/' $(REPO_ROOT)/test/e2e/data/cni/cilium/cilium.yaml

test/e2e/data/cni/cilium/cilium.yaml

Lines changed: 460 additions & 66 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)