diff --git a/upup/models/bindata.go b/upup/models/bindata.go index d4023341e572f..201396de7135d 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 44c964faa59c9..44853644f069d 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 a20ea63d001ec..14bb9c8c69600 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", } { diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index 1c9b7ff955c2b..1ca1b95b5ae64 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -24,7 +24,7 @@ spec: name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io - version: 1.7.0-kops.2 + version: 1.7.0-kops.3 - id: k8s-1.9 manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml manifestHash: e1508d77cb4e527d7a2939babe36dc350dd83745 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml index 35e2f26f41371..ce97d46850a90 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml @@ -24,7 +24,7 @@ spec: name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io - version: 1.7.0-kops.2 + version: 1.7.0-kops.3 - id: k8s-1.9 manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml manifestHash: e1508d77cb4e527d7a2939babe36dc350dd83745 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 5db48b227975d..2cd88ff043b82 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -24,7 +24,7 @@ spec: name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io - version: 1.7.0-kops.2 + version: 1.7.0-kops.3 - id: k8s-1.9 manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml manifestHash: e1508d77cb4e527d7a2939babe36dc350dd83745 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index afd24d2e2e9c7..863b57cfb87bf 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -24,7 +24,7 @@ spec: name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io - version: 1.7.0-kops.2 + version: 1.7.0-kops.3 - id: k8s-1.9 manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml manifestHash: e1508d77cb4e527d7a2939babe36dc350dd83745