rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-25 12:21:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #406 from galal-hussein/update_canal_flannel

Browse Source 
Update canal images
This commit is contained in:
Alena Prokharchyk
2018-04-25 20:27:48 -07:00
committed by GitHub
parent db3e1ba382 7e219a513d
commit 71878a13b6
4 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
apis/management.cattle.io/v3/k8s_defaults.go
View File

@@ -25,11 +25,11 @@ var (
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.9.1"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"),
CalicoNode: m("quay.io/calico/node:v3.0.2"),
CalicoCNI: m("quay.io/calico/cni:v2.0.0"),
CalicoNode: m("quay.io/calico/node:v3.1.1"),
CalicoCNI: m("quay.io/calico/cni:v3.1.1"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v2.6.2"),
CanalCNI: m("quay.io/calico/cni:v1.11.0"),
CanalNode: m("quay.io/calico/node:v3.1.1"),
CanalCNI: m("quay.io/calico/cni:v3.1.1"),
CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"),
WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
@@ -50,11 +50,11 @@ var (
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.9.1"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"),
CalicoNode: m("quay.io/calico/node:v3.0.2"),
CalicoCNI: m("quay.io/calico/cni:v2.0.0"),
CalicoNode: m("quay.io/calico/node:v3.1.1"),
CalicoCNI: m("quay.io/calico/cni:v3.1.1"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v2.6.2"),
CanalCNI: m("quay.io/calico/cni:v1.11.0"),
CanalNode: m("quay.io/calico/node:v3.1.1"),
CanalCNI: m("quay.io/calico/cni:v3.1.1"),
CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"),
WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
@@ -75,11 +75,11 @@ var (
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.9.1"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"),
CalicoNode: m("quay.io/calico/node:v3.0.2"),
CalicoCNI: m("quay.io/calico/cni:v2.0.0"),
CalicoNode: m("quay.io/calico/node:v3.1.1"),
CalicoCNI: m("quay.io/calico/cni:v3.1.1"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v2.6.2"),
CanalCNI: m("quay.io/calico/cni:v1.11.0"),
CanalNode: m("quay.io/calico/node:v3.1.1"),
CanalCNI: m("quay.io/calico/cni:v3.1.1"),
CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"),
WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
@@ -100,11 +100,11 @@ var (
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.9.1"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"),
CalicoNode: m("quay.io/calico/node:v3.0.2"),
CalicoCNI: m("quay.io/calico/cni:v2.0.0"),
CalicoNode: m("quay.io/calico/node:v3.1.1"),
CalicoCNI: m("quay.io/calico/cni:v3.1.1"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v2.6.2"),
CanalCNI: m("quay.io/calico/cni:v1.11.0"),
CanalNode: m("quay.io/calico/node:v3.1.1"),
CanalCNI: m("quay.io/calico/cni:v3.1.1"),
CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"),
WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
@@ -125,11 +125,11 @@ var (
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.9.1"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"),
CalicoNode: m("quay.io/calico/node:v3.0.2"),
CalicoCNI: m("quay.io/calico/cni:v2.0.0"),
CalicoNode: m("quay.io/calico/node:v3.1.1"),
CalicoCNI: m("quay.io/calico/cni:v3.1.1"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v2.6.2"),
CanalCNI: m("quay.io/calico/cni:v1.11.0"),
CanalNode: m("quay.io/calico/node:v3.1.1"),
CanalCNI: m("quay.io/calico/cni:v3.1.1"),
CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"),
WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
@@ -150,11 +150,11 @@ var (
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.9.1"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"),
CalicoNode: m("quay.io/calico/node:v3.0.2"),
CalicoCNI: m("quay.io/calico/cni:v2.0.0"),
CalicoNode: m("quay.io/calico/node:v3.1.1"),
CalicoCNI: m("quay.io/calico/cni:v3.1.1"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v2.6.2"),
CanalCNI: m("quay.io/calico/cni:v1.11.0"),
CanalNode: m("quay.io/calico/node:v3.1.1"),
CanalCNI: m("quay.io/calico/cni:v3.1.1"),
CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"),
WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"),

1
apis/management.cattle.io/v3/rke_types.go
View File

@@ -400,6 +400,7 @@ type FlannelNetworkProvider struct {
}
type CanalNetworkProvider struct {
FlannelNetworkProvider `yaml:",inline" json:",inline"`
}
type KubernetesServicesOptions struct {

1
apis/management.cattle.io/v3/zz_generated_deepcopy.go
View File

@@ -1345,6 +1345,7 @@ func (in *CalicoNetworkProvider) DeepCopy() *CalicoNetworkProvider {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *CanalNetworkProvider) DeepCopyInto(out *CanalNetworkProvider) {
*out = *in
out.FlannelNetworkProvider = in.FlannelNetworkProvider
return
}

4
client/management/v3/zz_generated_canal_network_provider.go
View File

@@ -1,8 +1,10 @@
package client
const (
CanalNetworkProviderType = "canalNetworkProvider"
CanalNetworkProviderType = "canalNetworkProvider"
CanalNetworkProviderFieldIface = "iface"
)
type CanalNetworkProvider struct {
Iface string `json:"iface,omitempty" yaml:"iface,omitempty"`
}