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

Merge pull request #11590 from johngmyers/aws-vpc-ondelete 

Use the OnDelete updateStrategy for AWS VPC CNI DaemonSet
This commit is contained in:
Kubernetes Prow Robot 2021-05-24 22:04:20 -07:00 committed by GitHub
parent 03ddb9568e 6ac345e23d
commit 0749674d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
View File

@ -226,9 +226,7 @@
"type": "DirectoryOrCreate" "type": "DirectoryOrCreate"
"name": "run-dir" "name": "run-dir"
"updateStrategy": "updateStrategy":
"rollingUpdate": "type": "OnDelete"
"maxUnavailable": "10%"
"type": "RollingUpdate"
--- ---
"apiVersion": "v1" "apiVersion": "v1"
"kind": "ServiceAccount" "kind": "ServiceAccount"

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

@ -816,11 +816,12 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
location := key + "/" + id + ".yaml" location := key + "/" + id + ".yaml"
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key), Name: fi.String(key),
Version: fi.String(versions[id]), Version: fi.String(versions[id]),
Selector: networkingSelector(), Selector: networkingSelector(),
Manifest: fi.String(location), Manifest: fi.String(location),
Id: id, Id: id,
NeedsRollingUpdate: "all",
}) })
} }
} }

3
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
View File

@ -54,8 +54,9 @@ spec:
version: 1.17.0 version: 1.17.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: ba5c98ae679d9feb8a84a063075acee4956cc126 manifestHash: 997781194bcdfa7602dfb69e2a1f42cb5106fc81
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
version: 1.7.8-kops.1 version: 1.7.8-kops.1

4
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
View File

@ -252,9 +252,7 @@ spec:
type: DirectoryOrCreate type: DirectoryOrCreate
name: run-dir name: run-dir
updateStrategy: updateStrategy:
rollingUpdate: type: OnDelete
maxUnavailable: 10%
type: RollingUpdate
--- ---

3
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View File

@ -54,8 +54,9 @@ spec:
version: 1.17.0 version: 1.17.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: ba5c98ae679d9feb8a84a063075acee4956cc126 manifestHash: 997781194bcdfa7602dfb69e2a1f42cb5106fc81
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
version: 1.7.8-kops.1 version: 1.7.8-kops.1

4
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
View File

@ -252,9 +252,7 @@ spec:
type: DirectoryOrCreate type: DirectoryOrCreate
name: run-dir name: run-dir
updateStrategy: updateStrategy:
rollingUpdate: type: OnDelete
maxUnavailable: 10%
type: RollingUpdate
--- ---