Skip to content

Commit e12017e

Browse files
Merge pull request #5696 from juanluisvaladas/bump-calico-3.29.3
Bump calico to 3.29.3
2 parents 20996f9 + cd98e12 commit e12017e

34 files changed

+43
-42
lines changed

pkg/constant/constant.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const (
9292
EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"
9393
EnvoyProxyImageVersion = "v1.32.3"
9494
CalicoImage = "quay.io/k0sproject/calico-cni"
95-
CalicoComponentImagesVersion = "v3.29.2-0"
95+
CalicoComponentImagesVersion = "v3.29.3-0"
9696
CalicoNodeImage = "quay.io/k0sproject/calico-node"
9797
KubeControllerImage = "quay.io/k0sproject/calico-kube-controllers"
9898
KubeRouterCNIImage = "quay.io/k0sproject/kube-router"

static/manifests/calico/ClusterRole/calico-cni-plugin.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-node-rbac.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-node-rbac.yaml
33
# CNI cluster role
44
kind: ClusterRole
55
apiVersion: rbac.authorization.k8s.io/v1

static/manifests/calico/ClusterRole/calico-kube-controllers.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-kube-controllers-rbac.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-kube-controllers-rbac.yaml
33
# assuming datastore == "kubernetes"
44
#
55
# Include a clusterrole for the kube-controllers component,

static/manifests/calico/ClusterRole/calico-node.yaml

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-node-rbac.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-node-rbac.yaml
33
# Include a clusterrole for the calico-node DaemonSet,
44
# and bind it to the calico-node serviceaccount.
55
kind: ClusterRole
@@ -62,6 +62,13 @@ rules:
6262
verbs:
6363
- watch
6464
- list
65+
# Watch for changes to Kubernetes AdminNetworkPolicies.
66+
- apiGroups: ["policy.networking.k8s.io"]
67+
resources:
68+
- adminnetworkpolicies
69+
verbs:
70+
- watch
71+
- list
6572
# Used by Calico for policy information.
6673
- apiGroups: [""]
6774
resources:
@@ -97,18 +104,12 @@ rules:
97104
- hostendpoints
98105
- blockaffinities
99106
- caliconodestatuses
107+
- tiers
100108
verbs:
101109
- get
102110
- list
103111
- watch
104-
# Watch for changes to Kubernetes AdminNetworkPolicies.
105-
- apiGroups: ["policy.networking.k8s.io"]
106-
resources:
107-
- adminnetworkpolicies
108-
verbs:
109-
- watch
110-
- list
111-
# Calico creates some tiers on startup.
112+
# Calico creates some tiers on startup.
112113
- apiGroups: ["crd.projectcalico.org"]
113114
resources:
114115
- tiers

static/manifests/calico/ClusterRoleBinding/calico-cni-plugin.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-node-rbac.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-node-rbac.yaml
33
apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:

static/manifests/calico/ClusterRoleBinding/calico-kube-controllers.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-kube-controllers-rbac.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-kube-controllers-rbac.yaml
33
kind: ClusterRoleBinding
44
apiVersion: rbac.authorization.k8s.io/v1
55
metadata:

static/manifests/calico/ClusterRoleBinding/calico-node.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-node-rbac.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-node-rbac.yaml
33
apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:

static/manifests/calico/ConfigMap/calico-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-config.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-config.yaml
33
# This ConfigMap is used to configure a self-hosted Calico installation.
44
kind: ConfigMap
55
apiVersion: v1

static/manifests/calico/CustomResourceDefinition/adminnetworkpolicies.crd.policy.networking.k8s.io.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/policy.networking.k8s.io_adminnetworkpolicies.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/policy.networking.k8s.io_adminnetworkpolicies.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/bgpconfigurations.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_bgpconfigurations.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_bgpconfigurations.yam
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/bgpfilters.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_bgpfilters.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_bgpfilters.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/bgppeers.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_bgppeers.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_bgppeers.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/blockaffinities.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_blockaffinities.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_blockaffinities.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/caliconodestatuses.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_caliconodestatuses.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_caliconodestatuses.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/clusterinformations.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_clusterinformations.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_clusterinformations.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/felixconfigurations.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_felixconfigurations.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_felixconfigurations.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/globalnetworkpolicies.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_globalnetworkpolicies.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_globalnetworkpolicies.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/globalnetworksets.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_globalnetworksets.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_globalnetworksets.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/hostendpoints.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_hostendpoints.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_hostendpoints.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/ipamblocks.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_ipamblocks.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_ipamblocks.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/ipamconfigs.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_ipamconfigs.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_ipamconfigs.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/ipamhandles.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_ipamhandles.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_ipamhandles.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/ippools.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_ippools.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_ippools.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/ipreservations.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_ipreservations.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_ipreservations.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/kubecontrollersconfigurations.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_kubecontrollersconfigurations.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_kubecontrollersconfigurations.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/networkpolicies.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_networkpolicies.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_networkpolicies.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/networksets.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: libcalico-go/config/crd/crd.projectcalico.org_networksets.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_networksets.yaml
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:

static/manifests/calico/CustomResourceDefinition/tiers.crd.projectcalico.org.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Source: libcalico-go/config/crd/crd.projectcalico.org_tiers.yaml
1+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/libcalico-go/config/crd/crd.projectcalico.org_tiers.yaml
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:

static/manifests/calico/DaemonSet/calico-node.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-node.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-node.yaml
33
# This manifest installs the calico-node container, as well
44
# as the CNI plugins and network config on
55
# each master and worker node in a Kubernetes cluster.

static/manifests/calico/Deployment/calico-kube-controllers.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-kube-controllers.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-kube-controllers.yaml
33
# See https://github.com/projectcalico/kube-controllers
44
apiVersion: apps/v1
55
kind: Deployment

static/manifests/calico/PodDisruptionBudget/calico-kube-controllers.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-kube-controllers.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-kube-controllers.yaml
33
# This manifest creates a Pod Disruption Budget for Controller to allow K8s Cluster Autoscaler to evict
44

55
apiVersion: policy/v1

static/manifests/calico/ServiceAccount/calico-cni-plugin.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-node.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-node.yaml
33
apiVersion: v1
44
kind: ServiceAccount
55
metadata:

static/manifests/calico/ServiceAccount/calico-kube-controllers.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-kube-controllers.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-kube-controllers.yaml
33
apiVersion: v1
44
kind: ServiceAccount
55
metadata:

static/manifests/calico/ServiceAccount/calico-node.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Source: calico/templates/calico-node.yaml
2+
# Source: https://github.com/projectcalico/calico/blob/v3.29.3/charts/calico/templates/calico-node.yaml
33
apiVersion: v1
44
kind: ServiceAccount
55
metadata:

0 commit comments

Comments
 (0)