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

Merge pull request #5746 from willthames/k8s-ec2-srcdst-upgrade 

Update k8s-ec2-srcdst to v0.2.2
This commit is contained in:
k8s-ci-robot 2018-09-05 17:33:46 -07:00 committed by GitHub
parent 66b9e0e8b0 142d71f33f
commit 6f1874a93a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7.yaml.template
View File

@ -519,7 +519,7 @@ spec:
operator: Exists operator: Exists
serviceAccountName: k8s-ec2-srcdst serviceAccountName: k8s-ec2-srcdst
containers: containers:
- image: ottoyiu/k8s-ec2-srcdst:v0.2.1 - image: ottoyiu/k8s-ec2-srcdst:v0.2.2
name: k8s-ec2-srcdst name: k8s-ec2-srcdst
resources: resources:
requests: requests:

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

@ -594,7 +594,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
versions := map[string]string{ versions := map[string]string{
"pre-k8s-1.6": "2.4.2-kops.1", "pre-k8s-1.6": "2.4.2-kops.1",
"k8s-1.6": "2.6.7-kops.2", "k8s-1.6": "2.6.7-kops.2",
"k8s-1.7": "2.6.7-kops.2", "k8s-1.7": "2.6.7-kops.3",
} }
{ {