Skip to content

Commit d9c2ee3

Browse files
authored
Merge pull request #21961 from minikube-bot/auto_bump_calico_version
CNI: Update calico from v3.31.0 to v3.31.2
2 parents 96d0aa9 + 5c45c9d commit d9c2ee3

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

pkg/minikube/bootstrapper/images/images.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func KindNet(repo string) string {
185185
}
186186

187187
// all calico images are from https://github.com/projectcalico/calico/blob/master/manifests/calico.yaml
188-
const calicoVersion = "v3.31.0"
188+
const calicoVersion = "v3.31.2"
189189
const calicoRepo = "docker.io/calico"
190190

191191
// CalicoDaemonSet returns the image used for calicoDaemonSet

pkg/minikube/cni/calico.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2811,6 +2811,7 @@ spec:
28112811
loadBalancer:
28122812
properties:
28132813
assignIPs:
2814+
default: AllServices
28142815
type: string
28152816
type: object
28162817
namespace:
@@ -2897,6 +2898,7 @@ spec:
28972898
loadBalancer:
28982899
properties:
28992900
assignIPs:
2901+
default: AllServices
29002902
type: string
29012903
type: object
29022904
namespace:
@@ -7054,7 +7056,7 @@ spec:
70547056
# It can be deleted if this is a fresh installation, or if you have already
70557057
# upgraded to use calico-ipam.
70567058
- name: upgrade-ipam
7057-
image: quay.io/calico/cni:v3.31.0
7059+
image: quay.io/calico/cni:v3.31.2
70587060
imagePullPolicy: IfNotPresent
70597061
command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
70607062
envFrom:
@@ -7082,7 +7084,7 @@ spec:
70827084
# This container installs the CNI binaries
70837085
# and CNI network config file on each node.
70847086
- name: install-cni
7085-
image: quay.io/calico/cni:v3.31.0
7087+
image: quay.io/calico/cni:v3.31.2
70867088
imagePullPolicy: IfNotPresent
70877089
command: ["/opt/cni/bin/install"]
70887090
envFrom:
@@ -7126,7 +7128,7 @@ spec:
71267128
# networking to allow communication with the API Server. Calico-node initialization is executed
71277129
# in best effort fashion, i.e. no failure for errors, to not disrupt pod creation in iptables mode.
71287130
- name: "ebpf-bootstrap"
7129-
image: quay.io/calico/node:v3.31.0
7131+
image: quay.io/calico/node:v3.31.2
71307132
imagePullPolicy: IfNotPresent
71317133
command: ["calico-node", "-init", "-best-effort"]
71327134
volumeMounts:
@@ -7152,7 +7154,7 @@ spec:
71527154
# container programs network policy and routes on each
71537155
# host.
71547156
- name: calico-node
7155-
image: quay.io/calico/node:v3.31.0
7157+
image: quay.io/calico/node:v3.31.2
71567158
imagePullPolicy: IfNotPresent
71577159
envFrom:
71587160
- configMapRef:
@@ -7375,7 +7377,7 @@ spec:
73757377
priorityClassName: system-cluster-critical
73767378
containers:
73777379
- name: calico-kube-controllers
7378-
image: quay.io/calico/kube-controllers:v3.31.0
7380+
image: quay.io/calico/kube-controllers:v3.31.2
73797381
imagePullPolicy: IfNotPresent
73807382
env:
73817383
# Choose which controllers to run.

0 commit comments

Comments
 (0)