Skip to content

Commit

Permalink
Merge pull request #8071 from olemarkus/automated-cherry-pick-of-#802…
Browse files Browse the repository at this point in the history
…2-origin-release-1.17

Automated cherry pick of #8022: Bump cilium version to 1.6.4
  • Loading branch information
k8s-ci-robot authored Dec 10, 2019
2 parents 94b792b + c0f45ea commit 6e47d81
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pkg/apis/kops/networking.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,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 {
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 6e47d81

Please sign in to comment.