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

Merge pull request #11771 from olemarkus/fix-default-sc 

fix enable default SC when EBS driver is not installed
This commit is contained in:
Kubernetes Prow Robot 2021-06-15 14:29:43 -07:00 committed by GitHub
parent 3358042976 0798553565
commit b0b1ae1ea7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.15.0.yaml.template
View File

@ -30,7 +30,7 @@ kind: StorageClass
metadata:
name: kops-ssd-1-17
annotations:
storageclass.kubernetes.io/is-default-class: "{{ not .CloudConfig.AWSEBSCSIDriver.Enabled }}"
storageclass.kubernetes.io/is-default-class: "{{ not ( WithDefaultBool .CloudConfig.AWSEBSCSIDriver.Enabled true ) }}"
labels:
k8s-addon: storage-aws.addons.k8s.io
provisioner: kubernetes.io/aws-ebs

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

@ -47,7 +47,7 @@ spec:
version: 1.22.0-alpha.1
- id: v1.15.0
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: b8aadc7d9d09c2626b8680c1d5f2d0699628519c
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io

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

@ -47,7 +47,7 @@ spec:
version: 1.22.0-alpha.1
- id: v1.15.0
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: b8aadc7d9d09c2626b8680c1d5f2d0699628519c
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
View File

@ -47,7 +47,7 @@ spec:
version: 1.22.0-alpha.1
- id: v1.15.0
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: b8aadc7d9d09c2626b8680c1d5f2d0699628519c
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View File

@ -54,7 +54,7 @@ spec:
version: 1.22.0-alpha.1
- id: v1.15.0
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: b8aadc7d9d09c2626b8680c1d5f2d0699628519c
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml
View File

@ -54,7 +54,7 @@ spec:
version: 1.22.0-alpha.1
- id: v1.15.0
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: b8aadc7d9d09c2626b8680c1d5f2d0699628519c
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
View File

@ -47,7 +47,7 @@ spec:
version: 1.22.0-alpha.1
- id: v1.15.0
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: b8aadc7d9d09c2626b8680c1d5f2d0699628519c
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View File

@ -47,7 +47,7 @@ spec:
version: 1.22.0-alpha.1
- id: v1.15.0
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: b8aadc7d9d09c2626b8680c1d5f2d0699628519c
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io