Merge pull request #102 from manuelbuil/update-canal-images

Upgrade flannel and calico images
pull/103/head
Michal Rostecki 2021-06-14 15:06:49 +02:00 committed by GitHub
commit 28a8f68301
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions

View File

@ -1,8 +1,8 @@
apiVersion: v1
name: rke2-canal
description: Install Canal Network Plugin.
version: v3.13.300-build20210223
appVersion: v3.13.3
version: v3.19.1-build20210611
appVersion: v3.19.1
home: https://www.projectcalico.org/
keywords:
- canal

View File

@ -51,7 +51,7 @@ spec:
# and CNI network config file on each node.
- name: install-cni
image: {{ template "system_default_registry" . }}{{ .Values.calico.cniImage.repository }}:{{ .Values.calico.cniImage.tag }}
command: ["/install-cni.sh"]
command: ["/opt/cni/bin/install"]
env:
# Name of the CNI config file to create.
- name: CNI_CONF_NAME

View File

@ -8,7 +8,7 @@ flannel:
# kube-flannel image
image:
repository: rancher/hardened-flannel
tag: v0.13.0-rancher1-build20210223
tag: v0.14.0-build20210611
# The interface used by canal for host <-> host communication.
# If left blank, then the interface is chosen using the node's
# default route.
@ -25,15 +25,15 @@ calico:
# CNI installation image.
cniImage:
repository: rancher/hardened-calico
tag: v3.13.3-build20210223
tag: v3.19.1-build20210611
# Canal node image.
nodeImage:
repository: rancher/hardened-calico
tag: v3.13.3-build20210223
tag: v3.19.1-build20210611
# Flexvol Image.
flexvolImage:
repository: rancher/hardened-calico
tag: v3.13.3-build20210223
tag: v3.19.1-build20210611
# Datastore type for canal. It can be either kuberentes or etcd.
datastoreType: kubernetes
# Wait for datastore to initialize.

View File

@ -1,4 +1,4 @@
url: local
packageVersion: 06
packageVersion: 07
# This repository does not use releaseCandidateVersions, so you can leave this as 00.
releaseCandidateVersion: 00