From ebd0759033f077b28db3037f8711b18c7b2ef6de Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 22 Jan 2021 09:44:53 +0200 Subject: [PATCH] Add startup probe for calico-kube-controllers --- upup/models/bindata.go | 6 ++++++ .../networking.projectcalico.org/k8s-1.16.yaml.template | 6 ++++++ .../bootstrapchannelbuilder/bootstrapchannelbuilder.go | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/upup/models/bindata.go b/upup/models/bindata.go index d4023341e5..201396de71 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -37929,6 +37929,12 @@ spec: command: - /usr/bin/check-status - -r + startupProbe: + exec: + command: + - /usr/bin/check-status + - -r + initialDelaySeconds: 10 --- diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template index 44c964faa5..44853644f0 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template @@ -4112,6 +4112,12 @@ spec: command: - /usr/bin/check-status - -r + startupProbe: + exec: + command: + - /usr/bin/check-status + - -r + initialDelaySeconds: 10 --- diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go index a20ea63d00..14bb9c8c69 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go @@ -313,7 +313,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann if kubeDNS.Provider == "CoreDNS" { { key := "coredns.addons.k8s.io" - version := "1.7.0-kops.2" + version := "1.7.0-kops.3" { location := key + "/k8s-1.12.yaml" @@ -740,7 +740,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann key := "networking.projectcalico.org" versions := map[string]string{ "k8s-1.12": "3.9.6-kops.2", - "k8s-1.16": "3.17.1-kops.1", + "k8s-1.16": "3.17.1-kops.2", } {