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

Merge pull request #6622 from justinsb/followup_6502 

Apply scope fix in #6502 to all manifest versions
This commit is contained in:
Kubernetes Prow Robot 2019-03-15 09:47:12 -07:00 committed by GitHub
parent 492031d4c7 7f4dbb59ad
commit 04ccfb2f27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,6 @@ spec:
group: crd.k8s.amazonaws.com
version: v1alpha1
names:
scope: Cluster
plural: eniconfigs
singular: eniconfig
kind: ENIConfig

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

@ -120,7 +120,6 @@ spec:
group: crd.k8s.amazonaws.com
version: v1alpha1
names:
scope: Cluster
plural: eniconfigs
singular: eniconfig
kind: ENIConfig

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

@ -120,7 +120,6 @@ spec:
group: crd.k8s.amazonaws.com
version: v1alpha1
names:
scope: Cluster
plural: eniconfigs
singular: eniconfig
kind: ENIConfig

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

@ -1047,7 +1047,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
if b.cluster.Spec.Networking.AmazonVPC != nil {
key := "networking.amazon-vpc-routed-eni"
version := "1.3.0-kops.1"
version := "1.3.0-kops.2"
{
id := "k8s-1.7"