From d5ed8509fe250765647e69f42271825c188eae42 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Mon, 16 Nov 2020 14:44:33 -0800 Subject: [PATCH] Fix version of storage-aws addon manifest --- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 2 +- .../tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml | 4 ++-- .../bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml | 4 ++-- .../tests/bootstrapchannelbuilder/cilium/manifest.yaml | 4 ++-- .../tests/bootstrapchannelbuilder/public-jwks/manifest.yaml | 4 ++-- .../tests/bootstrapchannelbuilder/simple/manifest.yaml | 4 ++-- .../cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index faefc6cf327ef..840659baa82f7 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -510,7 +510,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann if kops.CloudProviderID(b.Cluster.Spec.CloudProvider) == kops.CloudProviderAWS { key := "storage-aws.addons.k8s.io" - version := "1.15.0" + version := "1.17.0" { id := "v1.15.0" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index 78376d9eecc29..488471cc55f55 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -59,7 +59,7 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 - id: v1.7.0 kubernetesVersion: <1.15.0 manifest: storage-aws.addons.k8s.io/v1.7.0.yaml @@ -67,7 +67,7 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 - id: k8s-1.12 kubernetesVersion: <1.16.0 manifest: networking.amazon-vpc-routed-eni/k8s-1.12.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml index 109858c5bdb26..64cd1145db5d4 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml @@ -52,7 +52,7 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 - id: v1.7.0 kubernetesVersion: <1.15.0 manifest: storage-aws.addons.k8s.io/v1.7.0.yaml @@ -60,7 +60,7 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 - id: k8s-1.12 manifest: authentication.aws/k8s-1.12.yaml manifestHash: 7a5100a7a4938565f3bd64decc8c7767f57ae2cc diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index dd841f1004374..1da2d14c3ceca 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -59,7 +59,7 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 - id: v1.7.0 kubernetesVersion: <1.15.0 manifest: storage-aws.addons.k8s.io/v1.7.0.yaml @@ -67,7 +67,7 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 - id: k8s-1.12 manifest: networking.cilium.io/k8s-1.12-v1.8.yaml manifestHash: 67853b52a456f1b701ada61ecab28c8c1f615183 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml index a2f2725b797fc..45f1a4412432d 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml @@ -67,7 +67,7 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 - id: v1.7.0 kubernetesVersion: <1.15.0 manifest: storage-aws.addons.k8s.io/v1.7.0.yaml @@ -75,4 +75,4 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 5547674e43229..0f4e6f2bf67e6 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -52,7 +52,7 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 - id: v1.7.0 kubernetesVersion: <1.15.0 manifest: storage-aws.addons.k8s.io/v1.7.0.yaml @@ -60,4 +60,4 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index 3f13c796622c8..0ebca2af477db 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -59,7 +59,7 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 - id: v1.7.0 kubernetesVersion: <1.15.0 manifest: storage-aws.addons.k8s.io/v1.7.0.yaml @@ -67,7 +67,7 @@ spec: name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io - version: 1.15.0 + version: 1.17.0 - id: k8s-1.12 manifest: networking.weave/k8s-1.12.yaml manifestHash: 3b33c6cfe20c96620178864ba26f4afae37db5fd