From 142d71f33f8f6200d673553a68c5a9c2fbd20cd9 Mon Sep 17 00:00:00 2001 From: Will Thames Date: Thu, 6 Sep 2018 09:46:21 +1000 Subject: [PATCH] Update k8s-ec2-srcdst to v0.2.2 v0.2.2 fixes a bug where k8s-ec2-srcdst can crash on node deletion. This crash causes SourceDestinationCheck to remain set to true on nodes created after this check. Such nodes cannot talk to calico destinations in the *same* subnet. Fixes kubernetes/kubernetes#66432 --- .../addons/networking.projectcalico.org/k8s-1.7.yaml.template | 2 +- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7.yaml.template index bae49bbf03..9af6738bf0 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7.yaml.template @@ -519,7 +519,7 @@ spec: operator: Exists serviceAccountName: k8s-ec2-srcdst containers: - - image: ottoyiu/k8s-ec2-srcdst:v0.2.1 + - image: ottoyiu/k8s-ec2-srcdst:v0.2.2 name: k8s-ec2-srcdst resources: requests: diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index dafd129e11..9f5232c7fc 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -594,7 +594,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri versions := map[string]string{ "pre-k8s-1.6": "2.4.2-kops.1", "k8s-1.6": "2.6.7-kops.2", - "k8s-1.7": "2.6.7-kops.2", + "k8s-1.7": "2.6.7-kops.3", } {