diff --git a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template index 20e2084a3a..bbcd774c36 100644 --- a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template @@ -226,9 +226,7 @@ "type": "DirectoryOrCreate" "name": "run-dir" "updateStrategy": - "rollingUpdate": - "maxUnavailable": "10%" - "type": "RollingUpdate" + "type": "OnDelete" --- "apiVersion": "v1" "kind": "ServiceAccount" diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go index ebe9d88a5d..9697780618 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go @@ -816,11 +816,12 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann location := key + "/" + id + ".yaml" addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ - Name: fi.String(key), - Version: fi.String(versions[id]), - Selector: networkingSelector(), - Manifest: fi.String(location), - Id: id, + Name: fi.String(key), + Version: fi.String(versions[id]), + Selector: networkingSelector(), + Manifest: fi.String(location), + Id: id, + NeedsRollingUpdate: "all", }) } } diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml index 3cd7cf4aea..f16b09442a 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -54,8 +54,9 @@ spec: version: 1.17.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: ba5c98ae679d9feb8a84a063075acee4956cc126 + manifestHash: 997781194bcdfa7602dfb69e2a1f42cb5106fc81 name: networking.amazon-vpc-routed-eni + needsRollingUpdate: all selector: role.kubernetes.io/networking: "1" version: 1.7.8-kops.1 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml index 08dc4b2e47..18a85b78e2 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml @@ -252,9 +252,7 @@ spec: type: DirectoryOrCreate name: run-dir updateStrategy: - rollingUpdate: - maxUnavailable: 10% - type: RollingUpdate + type: OnDelete --- diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index 3cd7cf4aea..f16b09442a 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -54,8 +54,9 @@ spec: version: 1.17.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: ba5c98ae679d9feb8a84a063075acee4956cc126 + manifestHash: 997781194bcdfa7602dfb69e2a1f42cb5106fc81 name: networking.amazon-vpc-routed-eni + needsRollingUpdate: all selector: role.kubernetes.io/networking: "1" version: 1.7.8-kops.1 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml index 08dc4b2e47..18a85b78e2 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml @@ -252,9 +252,7 @@ spec: type: DirectoryOrCreate name: run-dir updateStrategy: - rollingUpdate: - maxUnavailable: 10% - type: RollingUpdate + type: OnDelete ---