Skip to content

Commit 050d8fa

Browse files
authored
Merge pull request #72 from sighupio/feat/upgrade-calico-v3.26.3
Feat/upgrade calico v3.26.3
2 parents 6777e9c + bf1c29a commit 050d8fa

File tree

10 files changed

+65
-75
lines changed

10 files changed

+65
-75
lines changed

.drone.yml

Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ steps:
6666
- /pluto detect tigera-on-prem.yml --ignore-deprecations --target-versions=k8s=v1.26.0
6767

6868
---
69-
name: e2e-kubernetes-1.24-calico
69+
name: e2e-kubernetes-1.25-calico
7070
kind: pipeline
7171
type: docker
7272

@@ -88,17 +88,17 @@ depends_on:
8888

8989
steps:
9090
- name: init
91-
image: quay.io/sighup/e2e-testing-drone-plugin:v1.24.0
91+
image: quay.io/sighup/e2e-testing-drone-plugin:v1.25.3
9292
pull: always
9393
volumes:
9494
- name: shared
9595
path: /shared
9696
depends_on: [clone]
9797
settings:
98-
action: custom-cluster-124
99-
pipeline_id: cluster-124
98+
action: custom-cluster-125
99+
pipeline_id: cluster-125
100100
local_kind_config_path: katalog/tests/calico/resources/kind-config
101-
cluster_version: "1.24.0"
101+
cluster_version: "1.25.3"
102102
instance_path: /shared
103103
aws_default_region:
104104
from_secret: aws_region
@@ -120,23 +120,24 @@ steps:
120120
from_secret: dockerhub_password
121121

122122
- name: test
123-
image: quay.io/sighup/e2e-testing:1.1.0_0.7.0_3.1.1_1.9.4_1.24.1_3.8.7_4.21.1
123+
# KUBECTL 1.25.3 - KUSTOMIZE 3.5.3 - HELM 3.1.1 - YQ 4.21.1 - ISTIOCTL 1.9.4 - FURYCTL 0.9.0 - BATS 1.1.0
124+
image: quay.io/sighup/e2e-testing:1.1.0_0.9.0_3.1.1_1.9.4_1.25.3_3.5.3_4.21.1
124125
pull: always
125126
volumes:
126127
- name: shared
127128
path: /shared
128129
depends_on: [init]
129130
commands:
130-
- export KUBECONFIG=/shared/kube/kubeconfig-124
131+
- export KUBECONFIG=/shared/kube/kubeconfig-125
131132
- bats -t katalog/tests/calico/calico.sh
132133

133134
- name: destroy
134-
image: quay.io/sighup/e2e-testing-drone-plugin:v1.24.0
135+
image: quay.io/sighup/e2e-testing-drone-plugin:v1.25.3
135136
pull: always
136137
depends_on: [test]
137138
settings:
138139
action: destroy
139-
pipeline_id: cluster-124
140+
pipeline_id: cluster-125
140141
aws_default_region:
141142
from_secret: aws_region
142143
aws_access_key_id:
@@ -163,9 +164,8 @@ steps:
163164
volumes:
164165
- name: shared
165166
temp: {}
166-
167167
---
168-
name: e2e-kubernetes-1.25-calico
168+
name: e2e-kubernetes-1.26-calico
169169
kind: pipeline
170170
type: docker
171171

@@ -187,17 +187,17 @@ depends_on:
187187

188188
steps:
189189
- name: init
190-
image: quay.io/sighup/e2e-testing-drone-plugin:v1.25.3
190+
image: quay.io/sighup/e2e-testing-drone-plugin:v1.26.4
191191
pull: always
192192
volumes:
193193
- name: shared
194194
path: /shared
195195
depends_on: [clone]
196196
settings:
197-
action: custom-cluster-125
198-
pipeline_id: cluster-125
197+
action: custom-cluster-126
198+
pipeline_id: cluster-126
199199
local_kind_config_path: katalog/tests/calico/resources/kind-config
200-
cluster_version: "1.25.3"
200+
cluster_version: "1.26.4"
201201
instance_path: /shared
202202
aws_default_region:
203203
from_secret: aws_region
@@ -219,24 +219,23 @@ steps:
219219
from_secret: dockerhub_password
220220

221221
- name: test
222-
# KUBECTL 1.25.3 - KUSTOMIZE 3.5.3 - HELM 3.1.1 - YQ 4.21.1 - ISTIOCTL 1.9.4 - FURYCTL 0.9.0 - BATS 1.1.0
223-
image: quay.io/sighup/e2e-testing:1.1.0_0.9.0_3.1.1_1.9.4_1.25.3_3.5.3_4.21.1
222+
image: quay.io/sighup/e2e-testing:1.1.0_0.11.0_3.1.1_1.9.4_1.26.3_3.5.3_4.33.3
224223
pull: always
225224
volumes:
226225
- name: shared
227226
path: /shared
228227
depends_on: [init]
229228
commands:
230-
- export KUBECONFIG=/shared/kube/kubeconfig-125
229+
- export KUBECONFIG=/shared/kube/kubeconfig-126
231230
- bats -t katalog/tests/calico/calico.sh
232231

233232
- name: destroy
234-
image: quay.io/sighup/e2e-testing-drone-plugin:v1.25.3
233+
image: quay.io/sighup/e2e-testing-drone-plugin:v1.26.4
235234
pull: always
236235
depends_on: [test]
237236
settings:
238237
action: destroy
239-
pipeline_id: cluster-125
238+
pipeline_id: cluster-126
240239
aws_default_region:
241240
from_secret: aws_region
242241
aws_access_key_id:
@@ -264,7 +263,7 @@ volumes:
264263
- name: shared
265264
temp: {}
266265
---
267-
name: e2e-kubernetes-1.26-calico
266+
name: e2e-kubernetes-1.27-calico
268267
kind: pipeline
269268
type: docker
270269

@@ -286,17 +285,17 @@ depends_on:
286285

287286
steps:
288287
- name: init
289-
image: quay.io/sighup/e2e-testing-drone-plugin:v1.26.4
288+
image: quay.io/sighup/e2e-testing-drone-plugin:v2.0.0
290289
pull: always
291290
volumes:
292291
- name: shared
293292
path: /shared
294293
depends_on: [clone]
295294
settings:
296-
action: custom-cluster-126
297-
pipeline_id: cluster-126
295+
action: custom-cluster-127
296+
pipeline_id: cluster-127
298297
local_kind_config_path: katalog/tests/calico/resources/kind-config
299-
cluster_version: "1.26.4"
298+
cluster_version: "1.27.1"
300299
instance_path: /shared
301300
aws_default_region:
302301
from_secret: aws_region
@@ -318,23 +317,23 @@ steps:
318317
from_secret: dockerhub_password
319318

320319
- name: test
321-
image: quay.io/sighup/e2e-testing:1.1.0_0.11.0_3.1.1_1.9.4_1.26.3_3.5.3_4.33.3
320+
image: quay.io/sighup/e2e-testing:1.1.0_0.11.0_3.12.0_1.9.4_1.27.1_3.5.3_4.33.3
322321
pull: always
323322
volumes:
324323
- name: shared
325324
path: /shared
326325
depends_on: [init]
327326
commands:
328-
- export KUBECONFIG=/shared/kube/kubeconfig-126
327+
- export KUBECONFIG=/shared/kube/kubeconfig-127
329328
- bats -t katalog/tests/calico/calico.sh
330329

331330
- name: destroy
332-
image: quay.io/sighup/e2e-testing-drone-plugin:v1.26.4
331+
image: quay.io/sighup/e2e-testing-drone-plugin:v2.0.0
333332
pull: always
334333
depends_on: [test]
335334
settings:
336335
action: destroy
337-
pipeline_id: cluster-126
336+
pipeline_id: cluster-127
338337
aws_default_region:
339338
from_secret: aws_region
340339
aws_access_key_id:
@@ -381,9 +380,7 @@ trigger:
381380
- refs/tags/**
382381

383382
depends_on:
384-
- e2e-kubernetes-1.24-calico
385383
- e2e-kubernetes-1.25-calico
386-
- e2e-kubernetes-1.26-calico
387384

388385
steps:
389386
- name: init
@@ -483,8 +480,6 @@ trigger:
483480
- refs/tags/**
484481

485482
depends_on:
486-
- e2e-kubernetes-1.24-calico
487-
- e2e-kubernetes-1.25-calico
488483
- e2e-kubernetes-1.26-calico
489484

490485
steps:
@@ -583,13 +578,11 @@ trigger:
583578
- refs/tags/**
584579

585580
depends_on:
586-
- e2e-kubernetes-1.24-calico
587-
- e2e-kubernetes-1.25-calico
588-
- e2e-kubernetes-1.26-calico
581+
- e2e-kubernetes-1.27-calico
589582

590583
steps:
591584
- name: init
592-
image: quay.io/sighup/e2e-testing-drone-plugin:v1.27.1
585+
image: quay.io/sighup/e2e-testing-drone-plugin:v2.0.0
593586
pull: always
594587
volumes:
595588
- name: shared
@@ -599,7 +592,7 @@ steps:
599592
action: custom-cluster-127
600593
pipeline_id: cluster-127-cilium
601594
local_kind_config_path: katalog/tests/calico/resources/kind-config
602-
cluster_version: "1.27.0"
595+
cluster_version: "1.27.1"
603596
instance_path: /shared
604597
aws_default_region:
605598
from_secret: aws_region
@@ -628,11 +621,11 @@ steps:
628621
path: /shared
629622
depends_on: [init]
630623
commands:
631-
- export KUBECONFIG=/shared/kube/kubeconfig-124
624+
- export KUBECONFIG=/shared/kube/kubeconfig-127
632625
- bats -t katalog/tests/cilium/cilium.sh
633626

634627
- name: destroy
635-
image: quay.io/sighup/e2e-testing-drone-plugin:v1.27.1
628+
image: quay.io/sighup/e2e-testing-drone-plugin:v2.0.0
636629
pull: always
637630
depends_on: [test]
638631
settings:
@@ -670,9 +663,9 @@ kind: pipeline
670663
type: docker
671664

672665
depends_on:
673-
- e2e-kubernetes-1.24-calico
674666
- e2e-kubernetes-1.25-calico
675667
- e2e-kubernetes-1.26-calico
668+
- e2e-kubernetes-1.27-calico
676669
- e2e-kubernetes-1.25-cilium
677670
- e2e-kubernetes-1.26-cilium
678671
- e2e-kubernetes-1.27-cilium

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ Kubernetes Fury Networking provides the following packages:
2929

3030
| Package | Version | Description |
3131
| -------------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- |
32-
| [calico](katalog/calico) | `3.26.1` | [Calico][calico-page] CNI Plugin. For cluster with `< 50` nodes. |
32+
| [calico](katalog/calico) | `3.26.3` | [Calico][calico-page] CNI Plugin. For cluster with `< 50` nodes. |
3333
| [cilium](katalog/cilium) | `1.14.3` | [Cilium][cilium-page] CNI Plugin. For cluster with `< 200` nodes. |
34-
| [tigera](katalog/tigera) | `1.30.4` | [Tigera Operator][tigera-page], a Kubernetes Operator for Calico, provides pre-configured installations for on-prem and for EKS in policy-only mode. |
34+
| [tigera](katalog/tigera) | `1.30.7` | [Tigera Operator][tigera-page], a Kubernetes Operator for Calico, provides pre-configured installations for on-prem and for EKS in policy-only mode. |
3535
| [ip-masq](katalog/ip-masq) | `2.8.0` | The `ip-masq-agent` configures iptables rules to implement IP masquerading functionality |
3636

3737
> The resources in these packages are going to be deployed in `kube-system` namespace. Except for the operator.
@@ -60,7 +60,7 @@ Check the [compatibility matrix][compatibility-matrix] for additional informatio
6060

6161
### Deployment
6262

63-
> ⚠️ Please notice that the Calico packages is for cluster with less the 50 nodes. If your cluster has more than 50 nodes, you'll need to switch to [Calico + Typha](https://projectcalico.docs.tigera.io/archive/v3.23/getting-started/kubernetes/self-managed-onprem/onpremises#install-calico-with-kubernetes-api-datastore-more-than-50-nodes) or to the [Tigera Operator](katalog/tigera/README.md).
63+
> ⚠️ Please notice that the Calico packages is for cluster with less the 50 nodes. If your cluster has more than 50 nodes, you'll need to switch to [Calico + Typha](https://docs.tigera.io/calico/latest/getting-started/kubernetes/self-managed-onprem/onpremises) or to the [Tigera Operator](katalog/tigera/README.md).
6464
6565
1. List the packages you want to deploy and their version in a `Furyfile.yml`
6666

docs/COMPATIBILITY_MATRIX.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
| v1.12.1 | :white_check_mark: | :white_check_mark: | | |
99
| v1.12.2 | :white_check_mark: | :white_check_mark: | | |
1010
| v1.14.0 | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
11-
| v1.15.0 | | | :white_check_mark: | :white_check_mark: |
11+
| v1.15.0 | | :white_check_mark: | :white_check_mark: | :white_check_mark: |
1212

1313

1414
:white_check_mark: Compatible

docs/releases/v1.15.0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ This minor release updates some components and adds support to Kubernetes 1.27.
88

99
| Component | Supported Version | Previous Version |
1010
| ----------------- | -------------------------------------------------------------------------------- | ---------------- |
11-
| `calico` | [`v3.26.1`](https://projectcalico.docs.tigera.io/archive/v3.26/release-notes/) | `v3.25.0` |
11+
| `calico` | [`v3.26.3`](https://projectcalico.docs.tigera.io/archive/v3.26/release-notes/) | `v3.26.1` |
1212
| `cilium` | [`v1.14.3`](https://github.com/cilium/cilium/releases/tag/v1.14.3) | `v1.13.1` |
1313
| `ip-masq` | [`v2.8.0`](https://github.com/kubernetes-sigs/ip-masq-agent/releases/tag/v2.5.0) | No update |
14-
| `tigera-operator` | [`v1.30.4`](https://github.com/tigera/operator/releases/tag/v1.30.4) | `v1.29.0` |
14+
| `tigera-operator` | [`v1.30.7`](https://github.com/tigera/operator/releases/tag/v1.30.7) | `v1.30.4` |
1515

1616
> Please refer the individual release notes to get detailed information on each release.
1717

katalog/calico/MAINTENANCE.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ Compare the `deploy.yaml` file with the downloaded `calico-${CALICO_VERSION}` fi
2020
3. Update the `kustomization.yaml` file with the right image versions.
2121

2222
```bash
23-
export CALICO_IMAGE_TAG=v3.26.1
23+
export CALICO_IMAGE_TAG=v3.26.3
2424
kustomize edit set image docker.io/calico/kube-controllers=registry.sighup.io/fury/calico/kube-controllers:${CALICO_IMAGE_TAG}
2525
kustomize edit set image docker.io/calico/cni=registry.sighup.io/fury/calico/cni:${CALICO_IMAGE_TAG}
2626
kustomize edit set image docker.io/calico/node=registry.sighup.io/fury/calico/node:${CALICO_IMAGE_TAG}
27-
# Not present anymore in 3.23:
28-
# kustomize edit set image docker.io/calico/pod2daemon-flexvol=registry.sighup.io/fury/calico/pod2daemon-flexvol:${CALICO_IMAGE_TAG}
2927
```
3028

3129
> ⚠️ Remember to check if images have been added to or dropped from upstream.
@@ -36,12 +34,12 @@ kustomize edit set image docker.io/calico/node=registry.sighup.io/fury/calico/no
3634

3735
The resources needed to provide monitoring features are not included in the default upstream manifests. There are some additional steps to perform.
3836

39-
See <https://projectcalico.docs.tigera.io/archive/v3.23/maintenance/monitor/monitor-component-metrics> for details. Note that we are adding an environment variable to the DaemonSet instead of modifing the `default` instance of the `felixconfigurations.crd.projectcalico.org` CRD as the docs say. Modifing the CRD is not possible using Kustomize patches.
37+
See <https://docs.tigera.io/calico/latest/operations/monitor/monitor-component-metrics> for details. Note that we are adding an environment variable to the DaemonSet instead of modifing the `default` instance of the `felixconfigurations.crd.projectcalico.org` CRD as the docs say. Modifing the CRD is not possible using Kustomize patches.
4038

4139
1. Download the dashboard from upstream:
4240

4341
```bash
44-
export CALICO_VERSION=3.26.1
42+
export CALICO_VERSION=3.26.3
4543
# ⚠️ Assuming $PWD == root of the project
4644
# We take the `felix-dashboard.json` from the downloaded yaml, we are not deploying `typha`, so we don't need its dashboard.
4745
curl -L https://raw.githubusercontent.com/projectcalico/calico/v${CALICO_VERSION}/manifests/grafana-dashboards.yaml | yq '.data["felix-dashboard.json"]' | sed 's/calico-demo-prometheus/prometheus/g' | jq > ./monitoring/dashboards/felix-dashboard.json

katalog/calico/README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Calico supports a broad range of platforms including Kubernetes, OpenShift, Dock
77

88
> For more information about Calico refer to [calico documentation][calico-documentation]
99
10+
## Components and features
1011
The deployment of Calico consists of a daemon set running on every node (including the control-plane) and a controller that implements:
1112

1213
- *policy controller* watches network policies and programs Calico policies.
@@ -20,18 +21,18 @@ The deployment of Calico consists of a daemon set running on every node (includi
2021
## Image repository and tag
2122

2223
- calico images:
23-
- `calico/kube-controllers:v3.25.0`.
24-
- `calico/cni:v3.25.0`.
25-
- `calico/node:v3.25.0`.
24+
- `calico/kube-controllers:v3.26.3`.
25+
- `calico/cni:v3.26.3`.
26+
- `calico/node:v3.26.3`.
2627
- calico repositories:
27-
- [https://github.com/projectcalico/kube-controllers](https://github.com/projectcalico/kube-controllers).
28-
- [https://github.com/projectcalico/cni-plugin](https://github.com/projectcalico/cni-plugin).
29-
- [https://github.com/projectcalico/node](https://github.com/projectcalico/node).
28+
- [https://github.com/projectcalico/kube-controllers](https://github.com/projectcalico/calico/tree/master/kube-controllers).
29+
- [https://github.com/projectcalico/cni-plugin](https://github.com/projectcalico/calico/tree/master/cni-plugin).
30+
- [https://github.com/projectcalico/node](https://github.com/projectcalico/calico/tree/master/node).
3031

3132
## Requirements
3233

33-
- Tested with Kubernetes >= `1.23.X`.
34-
- Tested with Kustomize >= `v3.3.X`.
34+
- Tested with Kubernetes >= `1.25.X`.
35+
- Tested with Kustomize >= `v3.5.3`.
3536
- Prometheus Operator, optional if you want to have metrics.
3637

3738
## Configuration

0 commit comments

Comments
 (0)