From 67d377c49fae77e92935de4c67623f9f114ee9a3 Mon Sep 17 00:00:00 2001 From: Josh Branham Date: Wed, 19 Feb 2020 12:42:54 -0500 Subject: [PATCH] Update expected --- .../addons/storage-aws.addons.k8s.io/v1.15.0.yaml | 15 +++++++++++++++ .../amazonvpc/manifest.yaml | 2 +- .../bootstrapchannelbuilder/cilium/manifest.yaml | 2 +- .../bootstrapchannelbuilder/simple/manifest.yaml | 2 +- .../bootstrapchannelbuilder/weave/manifest.yaml | 2 +- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.15.0.yaml b/upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.15.0.yaml index 106d981892..1963f7003f 100644 --- a/upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.15.0.yaml +++ b/upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.15.0.yaml @@ -14,6 +14,18 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: gp2 + labels: + k8s-addon: storage-aws.addons.k8s.io +provisioner: kubernetes.io/aws-ebs +parameters: + type: gp2 + +--- + +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: gp2-kops annotations: storageclass.beta.kubernetes.io/is-default-class: "true" labels: @@ -21,6 +33,9 @@ metadata: provisioner: kubernetes.io/aws-ebs parameters: type: gp2 + encrypted: "true" +allowVolumeExpansion: true +volumeBindingMode: WaitForFirstConsumer --- diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index 40b36a58cd..848192c232 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -73,7 +73,7 @@ spec: - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml - manifestHash: 23459f7be52d7c818dc060a8bcf5e3565bd87a7b + manifestHash: 5e829e8981470696bef2ed5e96839ea83cb36d24 name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 617a8a502b..32a0dba837 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -73,7 +73,7 @@ spec: - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml - manifestHash: 23459f7be52d7c818dc060a8bcf5e3565bd87a7b + manifestHash: 5e829e8981470696bef2ed5e96839ea83cb36d24 name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 04a14dd83e..db8de8ae90 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -73,7 +73,7 @@ spec: - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml - manifestHash: 23459f7be52d7c818dc060a8bcf5e3565bd87a7b + manifestHash: 5e829e8981470696bef2ed5e96839ea83cb36d24 name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index 8423e0b320..c9dd5ab90c 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -73,7 +73,7 @@ spec: - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml - manifestHash: 23459f7be52d7c818dc060a8bcf5e3565bd87a7b + manifestHash: 5e829e8981470696bef2ed5e96839ea83cb36d24 name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io