kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12951 from hakman/calico-3.21.2 

Update Calico and Canal to v3.21.2
This commit is contained in:
Kubernetes Prow Robot 2021-12-13 00:49:58 -08:00 committed by GitHub
parent 6ad49ce9ec 6a324b122c
commit 02caaa8951
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content
View File

@ -54,7 +54,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.projectcalico.org/k8s-1.16.yaml manifest: networking.projectcalico.org/k8s-1.16.yaml
manifestHash: fe30f09850e8d3744b3b4257a6199d9df7382c89b608391b40b027ba641e6c09 manifestHash: 83ec8afb5d42578a273b65645ac39565f3ac362a83eedbb7253862aa4063e4ec
name: networking.projectcalico.org name: networking.projectcalico.org
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"

10
tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-networking.projectcalico.org-k8s-1.16_content
View File

@ -4246,7 +4246,7 @@ spec:
- configMapRef: - configMapRef:
name: kubernetes-services-endpoint name: kubernetes-services-endpoint
optional: true optional: true
image: docker.io/calico/node:v3.21.1 image: docker.io/calico/node:v3.21.2
lifecycle: lifecycle:
preStop: preStop:
exec: exec:
@ -4318,7 +4318,7 @@ spec:
- configMapRef: - configMapRef:
name: kubernetes-services-endpoint name: kubernetes-services-endpoint
optional: true optional: true
image: docker.io/calico/cni:v3.21.1 image: docker.io/calico/cni:v3.21.2
name: upgrade-ipam name: upgrade-ipam
securityContext: securityContext:
privileged: true privileged: true
@ -4352,7 +4352,7 @@ spec:
- configMapRef: - configMapRef:
name: kubernetes-services-endpoint name: kubernetes-services-endpoint
optional: true optional: true
image: docker.io/calico/cni:v3.21.1 image: docker.io/calico/cni:v3.21.2
name: install-cni name: install-cni
securityContext: securityContext:
privileged: true privileged: true
@ -4361,7 +4361,7 @@ spec:
name: cni-bin-dir name: cni-bin-dir
- mountPath: /host/etc/cni/net.d - mountPath: /host/etc/cni/net.d
name: cni-net-dir name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.21.1 - image: docker.io/calico/pod2daemon-flexvol:v3.21.2
name: flexvol-driver name: flexvol-driver
securityContext: securityContext:
privileged: true privileged: true
@ -4469,7 +4469,7 @@ spec:
value: node value: node
- name: DATASTORE_TYPE - name: DATASTORE_TYPE
value: kubernetes value: kubernetes
image: docker.io/calico/kube-controllers:v3.21.1 image: docker.io/calico/kube-controllers:v3.21.2
livenessProbe: livenessProbe:
exec: exec:
command: command:

2
tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-bootstrap_content
View File

@ -54,7 +54,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.projectcalico.org/k8s-1.16.yaml manifest: networking.projectcalico.org/k8s-1.16.yaml
manifestHash: 69a558c349000e8f818014f5da0b029b62ba5eddab471670320b962eefbfc19c manifestHash: 708c14f382000e6abb73b8d0a3b8fffd65bd7f211b5ec898246316f4231dc2fd
name: networking.projectcalico.org name: networking.projectcalico.org
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"

10
tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-networking.projectcalico.org-k8s-1.16_content
View File

@ -4241,7 +4241,7 @@ spec:
- configMapRef: - configMapRef:
name: kubernetes-services-endpoint name: kubernetes-services-endpoint
optional: true optional: true
image: docker.io/calico/node:v3.21.1 image: docker.io/calico/node:v3.21.2
lifecycle: lifecycle:
preStop: preStop:
exec: exec:
@ -4315,7 +4315,7 @@ spec:
- configMapRef: - configMapRef:
name: kubernetes-services-endpoint name: kubernetes-services-endpoint
optional: true optional: true
image: docker.io/calico/cni:v3.21.1 image: docker.io/calico/cni:v3.21.2
name: upgrade-ipam name: upgrade-ipam
securityContext: securityContext:
privileged: true privileged: true
@ -4349,7 +4349,7 @@ spec:
- configMapRef: - configMapRef:
name: kubernetes-services-endpoint name: kubernetes-services-endpoint
optional: true optional: true
image: docker.io/calico/cni:v3.21.1 image: docker.io/calico/cni:v3.21.2
name: install-cni name: install-cni
securityContext: securityContext:
privileged: true privileged: true
@ -4358,7 +4358,7 @@ spec:
name: cni-bin-dir name: cni-bin-dir
- mountPath: /host/etc/cni/net.d - mountPath: /host/etc/cni/net.d
name: cni-net-dir name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.21.1 - image: docker.io/calico/pod2daemon-flexvol:v3.21.2
name: flexvol-driver name: flexvol-driver
securityContext: securityContext:
privileged: true privileged: true
@ -4466,7 +4466,7 @@ spec:
value: node value: node
- name: DATASTORE_TYPE - name: DATASTORE_TYPE
value: kubernetes value: kubernetes
image: docker.io/calico/kube-controllers:v3.21.1 image: docker.io/calico/kube-controllers:v3.21.2
livenessProbe: livenessProbe:
exec: exec:
command: command:

2
tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content
View File

@ -54,7 +54,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.22 - id: k8s-1.22
manifest: networking.projectcalico.org.canal/k8s-1.22.yaml manifest: networking.projectcalico.org.canal/k8s-1.22.yaml
manifestHash: 374571e60b4eb738a37569a126afb6d7f3478da5344e0e0c26cc08a93a29b6e6 manifestHash: bf0edcea126e143dd7f247f440586b7cf060af802c671600ea0811a4055d70fd
name: networking.projectcalico.org.canal name: networking.projectcalico.org.canal
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"

8
tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-networking.projectcalico.org.canal-k8s-1.22_content
View File

@ -4237,7 +4237,7 @@ spec:
- configMapRef: - configMapRef:
name: kubernetes-services-endpoint name: kubernetes-services-endpoint
optional: true optional: true
image: docker.io/calico/node:v3.21.1 image: docker.io/calico/node:v3.21.2
lifecycle: lifecycle:
preStop: preStop:
exec: exec:
@ -4350,7 +4350,7 @@ spec:
- configMapRef: - configMapRef:
name: kubernetes-services-endpoint name: kubernetes-services-endpoint
optional: true optional: true
image: docker.io/calico/cni:v3.21.1 image: docker.io/calico/cni:v3.21.2
name: install-cni name: install-cni
securityContext: securityContext:
privileged: true privileged: true
@ -4359,7 +4359,7 @@ spec:
name: cni-bin-dir name: cni-bin-dir
- mountPath: /host/etc/cni/net.d - mountPath: /host/etc/cni/net.d
name: cni-net-dir name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.21.1 - image: docker.io/calico/pod2daemon-flexvol:v3.21.2
name: flexvol-driver name: flexvol-driver
securityContext: securityContext:
privileged: true privileged: true
@ -4467,7 +4467,7 @@ spec:
value: node value: node
- name: DATASTORE_TYPE - name: DATASTORE_TYPE
value: kubernetes value: kubernetes
image: docker.io/calico/kube-controllers:v3.21.1 image: docker.io/calico/kube-controllers:v3.21.2
livenessProbe: livenessProbe:
exec: exec:
command: command:

10
upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.22.yaml.template
View File

@ -4136,7 +4136,7 @@ spec:
securityContext: securityContext:
fsGroup: 65534 fsGroup: 65534
containers: containers:
- image: calico/typha:v3.21.1 - image: calico/typha:v3.21.2
name: calico-typha name: calico-typha
ports: ports:
- containerPort: 5473 - containerPort: 5473
@ -4244,7 +4244,7 @@ spec:
# This container installs the CNI binaries # This container installs the CNI binaries
# and CNI network config file on each node. # and CNI network config file on each node.
- name: install-cni - name: install-cni
image: docker.io/calico/cni:v3.21.1 image: docker.io/calico/cni:v3.21.2
command: ["/opt/cni/bin/install"] command: ["/opt/cni/bin/install"]
envFrom: envFrom:
- configMapRef: - configMapRef:
@ -4285,7 +4285,7 @@ spec:
# Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes # Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
# to communicate with Felix over the Policy Sync API. # to communicate with Felix over the Policy Sync API.
- name: flexvol-driver - name: flexvol-driver
image: docker.io/calico/pod2daemon-flexvol:v3.21.1 image: docker.io/calico/pod2daemon-flexvol:v3.21.2
volumeMounts: volumeMounts:
- name: flexvol-driver-host - name: flexvol-driver-host
mountPath: /host/driver mountPath: /host/driver
@ -4296,7 +4296,7 @@ spec:
# container programs network policy and routes on each # container programs network policy and routes on each
# host. # host.
- name: calico-node - name: calico-node
image: docker.io/calico/node:v3.21.1 image: docker.io/calico/node:v3.21.2
envFrom: envFrom:
- configMapRef: - configMapRef:
# Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode. # Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
@ -4563,7 +4563,7 @@ spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
containers: containers:
- name: calico-kube-controllers - name: calico-kube-controllers
image: docker.io/calico/kube-controllers:v3.21.1 image: docker.io/calico/kube-controllers:v3.21.2
env: env:
# Choose which controllers to run. # Choose which controllers to run.
- name: ENABLED_CONTROLLERS - name: ENABLED_CONTROLLERS

12
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template
View File

@ -4137,7 +4137,7 @@ spec:
securityContext: securityContext:
fsGroup: 65534 fsGroup: 65534
containers: containers:
- image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/typha:{{ or .Networking.Calico.Version "v3.21.1" }} - image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/typha:{{ or .Networking.Calico.Version "v3.21.2" }}
name: calico-typha name: calico-typha
ports: ports:
- containerPort: 5473 - containerPort: 5473
@ -4258,7 +4258,7 @@ spec:
# It can be deleted if this is a fresh installation, or if you have already # It can be deleted if this is a fresh installation, or if you have already
# upgraded to use calico-ipam. # upgraded to use calico-ipam.
- name: upgrade-ipam - name: upgrade-ipam
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.21.1" }} image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.21.2" }}
command: ["/opt/cni/bin/calico-ipam", "-upgrade"] command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
envFrom: envFrom:
- configMapRef: - configMapRef:
@ -4285,7 +4285,7 @@ spec:
# This container installs the CNI binaries # This container installs the CNI binaries
# and CNI network config file on each node. # and CNI network config file on each node.
- name: install-cni - name: install-cni
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.21.1" }} image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.21.2" }}
command: ["/opt/cni/bin/install"] command: ["/opt/cni/bin/install"]
envFrom: envFrom:
- configMapRef: - configMapRef:
@ -4326,7 +4326,7 @@ spec:
# Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes # Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
# to communicate with Felix over the Policy Sync API. # to communicate with Felix over the Policy Sync API.
- name: flexvol-driver - name: flexvol-driver
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/pod2daemon-flexvol:{{ or .Networking.Calico.Version "v3.21.1" }} image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/pod2daemon-flexvol:{{ or .Networking.Calico.Version "v3.21.2" }}
volumeMounts: volumeMounts:
- name: flexvol-driver-host - name: flexvol-driver-host
mountPath: /host/driver mountPath: /host/driver
@ -4337,7 +4337,7 @@ spec:
# container programs network policy and routes on each # container programs network policy and routes on each
# host. # host.
- name: calico-node - name: calico-node
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/node:{{ or .Networking.Calico.Version "v3.21.1" }} image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/node:{{ or .Networking.Calico.Version "v3.21.2" }}
envFrom: envFrom:
- configMapRef: - configMapRef:
# Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode. # Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
@ -4652,7 +4652,7 @@ spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
containers: containers:
- name: calico-kube-controllers - name: calico-kube-controllers
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/kube-controllers:{{ or .Networking.Calico.Version "v3.21.1" }} image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/kube-controllers:{{ or .Networking.Calico.Version "v3.21.2" }}
env: env:
# Choose which controllers to run. # Choose which controllers to run.
- name: ENABLED_CONTROLLERS - name: ENABLED_CONTROLLERS