kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add startup probe for calico-kube-controllers

This commit is contained in:
Ciprian Hacman 2021-01-22 09:44:53 +02:00
parent 7c93c3e7b1
commit ebd0759033
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upup/models/bindata.go
View File

@ -37929,6 +37929,12 @@ spec:
command: command:
- /usr/bin/check-status - /usr/bin/check-status
- -r - -r
startupProbe:
exec:
command:
- /usr/bin/check-status
- -r
initialDelaySeconds: 10
--- ---

6
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template
View File

@ -4112,6 +4112,12 @@ spec:
command: command:
- /usr/bin/check-status - /usr/bin/check-status
- -r - -r
startupProbe:
exec:
command:
- /usr/bin/check-status
- -r
initialDelaySeconds: 10
--- ---

4
upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
View File

@ -313,7 +313,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
if kubeDNS.Provider == "CoreDNS" { if kubeDNS.Provider == "CoreDNS" {
{ {
key := "coredns.addons.k8s.io" key := "coredns.addons.k8s.io"
version := "1.7.0-kops.2" version := "1.7.0-kops.3"
{ {
location := key + "/k8s-1.12.yaml" location := key + "/k8s-1.12.yaml"
@ -740,7 +740,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
key := "networking.projectcalico.org" key := "networking.projectcalico.org"
versions := map[string]string{ versions := map[string]string{
"k8s-1.12": "3.9.6-kops.2", "k8s-1.12": "3.9.6-kops.2",
"k8s-1.16": "3.17.1-kops.1", "k8s-1.16": "3.17.1-kops.2",
} }
{ {