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

Merge pull request #8022 from sportradar/bump-cilium-11 

Bump cilium version to 1.6.4
This commit is contained in:
Kubernetes Prow Robot 2019-12-07 20:53:08 -08:00 committed by GitHub
parent 6519a52653 5076af9b6c
commit f4320a8842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/kops/networking.go
View File

@ -163,7 +163,7 @@ type AmazonVPCNetworkingSpec struct {
ImageName string `json:"imageName,omitempty"`
}
const CiliumDefaultVersion = "v1.6.1"
const CiliumDefaultVersion = "v1.6.4"
// CiliumNetworkingSpec declares that we want Cilium networking
type CiliumNetworkingSpec struct {

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

@ -1131,7 +1131,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if b.cluster.Spec.Networking.Cilium != nil {
key := "networking.cilium.io"
version := "1.6.1-kops.1"
version := "1.6.4-kops.1"
{
id := "k8s-1.7"

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

@ -115,16 +115,16 @@ spec:
- id: k8s-1.7
kubernetesVersion: '>=1.7.0 <1.12.0'
manifest: networking.cilium.io/k8s-1.7.yaml
manifestHash: cc7937066cb472dce20e13fe9a76faefd74dee19
manifestHash: 2d40b9ab7453b4a0a413196fae4c8bdcd62c69ce
name: networking.cilium.io
selector:
role.kubernetes.io/networking: "1"
version: 1.6.1-kops.1
version: 1.6.4-kops.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: networking.cilium.io/k8s-1.12.yaml
manifestHash: cc7937066cb472dce20e13fe9a76faefd74dee19
manifestHash: 2d40b9ab7453b4a0a413196fae4c8bdcd62c69ce
name: networking.cilium.io
selector:
role.kubernetes.io/networking: "1"
version: 1.6.1-kops.1
version: 1.6.4-kops.1