From 676fdc6ab4a3db9d112b31814091683c10bc08fb Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 23 Apr 2020 10:59:07 +0300 Subject: [PATCH] Update Calico and Canal misc stuff --- upup/models/bindata.go | 29 ++++++++++--------- .../pkg/fi/cloudup/bootstrapchannelbuilder.go | 8 ++--- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/upup/models/bindata.go b/upup/models/bindata.go index e3b14b41ba..832ac28c58 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -7645,6 +7645,7 @@ spec: command: - /bin/calico-node - -felix-live + - -bird-live periodSeconds: 10 initialDelaySeconds: 10 failureThreshold: 6 @@ -8490,7 +8491,7 @@ spec: securityContext: fsGroup: 65534 containers: - - image: calico/typha:v3.13.2 + - image: calico/typha:v3.13.3 name: calico-typha ports: - containerPort: 5473 @@ -8602,7 +8603,7 @@ spec: # It can be deleted if this is a fresh installation, or if you have already # upgraded to use calico-ipam. - name: upgrade-ipam - image: calico/cni:v3.13.2 + image: calico/cni:v3.13.3 command: ["/opt/cni/bin/calico-ipam", "-upgrade"] env: - name: KUBERNETES_NODE_NAME @@ -8624,7 +8625,7 @@ spec: # This container installs the CNI binaries # and CNI network config file on each node. - name: install-cni - image: calico/cni:v3.13.2 + image: calico/cni:v3.13.3 command: ["/install-cni.sh"] env: # Name of the CNI config file to create. @@ -8660,7 +8661,7 @@ spec: # 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. - name: flexvol-driver - image: calico/pod2daemon-flexvol:v3.13.2 + image: calico/pod2daemon-flexvol:v3.13.3 volumeMounts: - name: flexvol-driver-host mountPath: /host/driver @@ -8671,7 +8672,7 @@ spec: # container programs network policy and routes on each # host. - name: calico-node - image: calico/node:v3.13.2 + image: calico/node:v3.13.3 env: # Use Kubernetes API as the backing datastore. - name: DATASTORE_TYPE @@ -8875,7 +8876,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: calico-kube-controllers - image: calico/kube-controllers:v3.13.2 + image: calico/kube-controllers:v3.13.3 env: # Choose which controllers to run. - name: ENABLED_CONTROLLERS @@ -11530,7 +11531,7 @@ spec: securityContext: fsGroup: 65534 containers: - - image: calico/typha:v3.12.0 + - image: calico/typha:v3.12.1 name: calico-typha ports: - containerPort: 5473 @@ -11647,7 +11648,7 @@ spec: # This container installs the CNI binaries # and CNI network config file on each node. - name: install-cni - image: calico/cni:v3.12.0 + image: calico/cni:v3.12.1 command: ["/install-cni.sh"] env: # Name of the CNI config file to create. @@ -11683,7 +11684,7 @@ spec: # 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. - name: flexvol-driver - image: calico/pod2daemon-flexvol:v3.12.0 + image: calico/pod2daemon-flexvol:v3.12.1 volumeMounts: - name: flexvol-driver-host mountPath: /host/driver @@ -11694,7 +11695,7 @@ spec: # container programs network policy and routes on each # host. - name: calico-node - image: calico/node:v3.12.0 + image: calico/node:v3.12.1 env: # Use Kubernetes API as the backing datastore. - name: DATASTORE_TYPE @@ -12454,7 +12455,7 @@ spec: securityContext: fsGroup: 65534 containers: - - image: calico/typha:v3.13.2 + - image: calico/typha:v3.13.3 name: calico-typha ports: - containerPort: 5473 @@ -12565,7 +12566,7 @@ spec: # This container installs the CNI binaries # and CNI network config file on each node. - name: install-cni - image: calico/cni:v3.13.2 + image: calico/cni:v3.13.3 command: ["/install-cni.sh"] env: # Name of the CNI config file to create. @@ -12601,7 +12602,7 @@ spec: # 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. - name: flexvol-driver - image: calico/pod2daemon-flexvol:v3.13.2 + image: calico/pod2daemon-flexvol:v3.13.3 volumeMounts: - name: flexvol-driver-host mountPath: /host/driver @@ -12612,7 +12613,7 @@ spec: # container programs network policy and routes on each # host. - name: calico-node - image: calico/node:v3.13.2 + image: calico/node:v3.13.3 env: # Use Kubernetes API as the backing datastore. - name: DATASTORE_TYPE diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 24405dc039..45c2fb817a 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -725,8 +725,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { versions := map[string]string{ "k8s-1.7": "2.6.12-kops.1", "k8s-1.7-v3": "3.8.0-kops.2", - "k8s-1.12": "3.9.5-kops.1", - "k8s-1.16": "3.13.2-kops.1", + "k8s-1.12": "3.9.5-kops.2", + "k8s-1.16": "3.13.3-kops.1", } { @@ -793,8 +793,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { versions := map[string]string{ "k8s-1.9": "3.2.3-kops.1", "k8s-1.12": "3.7.5-kops.1", - "k8s-1.15": "3.12.0-kops.1", - "k8s-1.16": "3.13.2-kops.1", + "k8s-1.15": "3.12.1-kops.1", + "k8s-1.16": "3.13.3-kops.1", } { id := "k8s-1.9"