mirror of
https://github.com/rancher/rke.git
synced 2025-08-02 07:43:04 +00:00
kontainer-dirver-metadata update
This commit is contained in:
Alena Prokharchyk
parent
7c4c1324f9
commit
58791749a6
2
go.mod
2
go.mod
@ -27,7 +27,7 @@ require (
|
||||
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
|
||||
github.com/opencontainers/image-spec v0.0.0-20170929214853-7c889fafd04a // indirect
|
||||
github.com/pkg/errors v0.8.1
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191003190312-bd4630881fb2
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191021164950-6514452b9732
|
||||
github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36
|
||||
github.com/rancher/types v0.0.0-20191003184925-ab3403a2c8ca
|
||||
github.com/sirupsen/logrus v1.4.2
|
||||
|
||||
4
go.sum
4
go.sum
@ -440,8 +440,8 @@ github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R
|
||||
github.com/prometheus/prometheus v2.9.2+incompatible/go.mod h1:vdLuLLM0uqhLSofrQ7Nev2b/rQUyZ+pkT3zF7LB/i1g=
|
||||
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
|
||||
github.com/prometheus/tsdb v0.8.0/go.mod h1:fSI0j+IUQrDd7+ZtR9WKIGtoYAYAJUKcKhYLG25tN4g=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191003190312-bd4630881fb2 h1:BjiVFYM513H2dwGDlQyqZ2fX/5Vu/cIUzb6M5+owe8E=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191003190312-bd4630881fb2/go.mod h1:n9MKsJByqAqhVG61d9G5pbJuKcHUMXUw97YF8+98ar0=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191021164950-6514452b9732 h1:6InjIL/kY99O1kdLLmiYVaUkMRhVEZjjlz7WRxRJraQ=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191021164950-6514452b9732/go.mod h1:n9MKsJByqAqhVG61d9G5pbJuKcHUMXUw97YF8+98ar0=
|
||||
github.com/rancher/norman v0.0.0-20190930164704-e09204b63081 h1:t0Yq2Rm0PdPkhY5AfHjtoyKEbt0bhYk4Jya27EfJk5Q=
|
||||
github.com/rancher/norman v0.0.0-20190930164704-e09204b63081/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
|
||||
github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36 h1:N0ZUBJRq/ydy2ULiuqKhmiKShmEtpDOWXxKzVZxTzHk=
|
||||
|
||||
182
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go
generated
vendored
182
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go
generated
vendored
@ -1063,6 +1063,64 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
|
||||
CoreDNS: m("coredns/coredns:1.2.6"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
|
||||
},
|
||||
// Enabled in Rancher v2.3.1
|
||||
"v1.13.12-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.13.12-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.50"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.50"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.50"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.50"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"),
|
||||
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.4.0"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.4.0"),
|
||||
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
|
||||
CanalNode: m("quay.io/calico/node:v3.4.0"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.4.0"),
|
||||
CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"),
|
||||
WeaveNode: m("weaveworks/weave-kube:2.5.0"),
|
||||
WeaveCNI: m("weaveworks/weave-npc:2.5.0"),
|
||||
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
|
||||
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
|
||||
CoreDNS: m("coredns/coredns:1.2.6"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
|
||||
},
|
||||
// Enabled in Rancher v2.3.2
|
||||
"v1.13.12-rancher2-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.13.12-rancher2"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.50"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.50"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.50"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.50"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"),
|
||||
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.4.0"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.4.0"),
|
||||
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
|
||||
CanalNode: m("quay.io/calico/node:v3.4.0"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.4.0"),
|
||||
CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"),
|
||||
WeaveNode: m("weaveworks/weave-kube:2.5.0"),
|
||||
WeaveCNI: m("weaveworks/weave-npc:2.5.0"),
|
||||
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
|
||||
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
|
||||
CoreDNS: m("coredns/coredns:1.2.6"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
|
||||
},
|
||||
// Enabled in Rancher v2.2.2
|
||||
"v1.14.1-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
@ -1237,6 +1295,35 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
|
||||
CoreDNS: m("coredns/coredns:1.3.1"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
},
|
||||
// Enabled in Rancher v2.3.0
|
||||
"v1.14.8-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.14.8-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.50"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.50"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.50"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.50"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"),
|
||||
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.4.0"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.4.0"),
|
||||
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
|
||||
CanalNode: m("quay.io/calico/node:v3.4.0"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.4.0"),
|
||||
CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"),
|
||||
WeaveNode: m("weaveworks/weave-kube:2.5.0"),
|
||||
WeaveCNI: m("weaveworks/weave-npc:2.5.0"),
|
||||
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
|
||||
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
|
||||
CoreDNS: m("coredns/coredns:1.3.1"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
},
|
||||
// Experimental in Rancher v2.2.5
|
||||
"v1.15.0-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
@ -1326,7 +1413,7 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
|
||||
CoreDNS: m("coredns/coredns:1.3.1"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
},
|
||||
// Enabled in Rancher v2.3.0
|
||||
// Enabled in Rancher v2.2.9
|
||||
"v1.15.4-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.15.4-rancher1"),
|
||||
@ -1387,6 +1474,67 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
WindowsPodInfraContainer: m("rancher/kubelet-pause:v0.1.3"),
|
||||
},
|
||||
// Enabled in Rancher v2.2.9
|
||||
"v1.15.5-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.15.5-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.50"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.50"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.50"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.50"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
|
||||
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.7.4"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.7.4"),
|
||||
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
|
||||
CalicoControllers: m("quay.io/calico/kube-controllers:v3.7.4"),
|
||||
CanalNode: m("quay.io/calico/node:v3.7.4"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.7.4"),
|
||||
CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"),
|
||||
WeaveNode: m("weaveworks/weave-kube:2.5.2"),
|
||||
WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
|
||||
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
|
||||
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.3"),
|
||||
CoreDNS: m("coredns/coredns:1.3.1"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
},
|
||||
// Enabled in Rancher v2.3.0
|
||||
"v1.15.5-rancher1-2": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.15.5-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.50"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.50"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.50"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.50"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
|
||||
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.7.4"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.7.4"),
|
||||
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
|
||||
CalicoControllers: m("quay.io/calico/kube-controllers:v3.7.4"),
|
||||
CanalNode: m("quay.io/calico/node:v3.7.4"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.7.4"),
|
||||
CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"),
|
||||
WeaveNode: m("weaveworks/weave-kube:2.5.2"),
|
||||
WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
|
||||
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
|
||||
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.3"),
|
||||
CoreDNS: m("coredns/coredns:1.3.1"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
WindowsPodInfraContainer: m("rancher/kubelet-pause:v0.1.3"),
|
||||
},
|
||||
// Experimental in Rancher v2.3.0
|
||||
"v1.16.1-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.15-rancher1"),
|
||||
@ -1419,6 +1567,38 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
|
||||
WindowsPodInfraContainer: m("rancher/kubelet-pause:v0.1.3"),
|
||||
},
|
||||
// Experimental in Rancher v2.3.0
|
||||
"v1.16.2-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.15-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.16.2-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.50"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.50"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.50"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.50"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
|
||||
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.8.1"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.8.1"),
|
||||
CalicoControllers: m("quay.io/calico/kube-controllers:v3.8.1"),
|
||||
CalicoFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
|
||||
CanalNode: m("quay.io/calico/node:v3.8.1"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.8.1"),
|
||||
CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"),
|
||||
CanalFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
|
||||
WeaveNode: m("weaveworks/weave-kube:2.5.2"),
|
||||
WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
|
||||
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
|
||||
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.4"),
|
||||
CoreDNS: m("coredns/coredns:1.6.2"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
|
||||
WindowsPodInfraContainer: m("rancher/kubelet-pause:v0.1.3"),
|
||||
},
|
||||
// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
|
||||
// without all clusters being restarted
|
||||
"v1.11.9-rancher1-3": {
|
||||
|
||||
16
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_version_info.go
generated
vendored
16
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_version_info.go
generated
vendored
@ -8,17 +8,19 @@ func loadRancherDefaultK8sVersions() map[string]string {
|
||||
automatically picked based on Rancher's max/min version information.
|
||||
*/
|
||||
return map[string]string{
|
||||
"2.3": "v1.15.x",
|
||||
"2.3.0": "v1.15.x",
|
||||
"2.3.1": "v1.15.x",
|
||||
"2.3": "v1.16.x",
|
||||
// rancher will use default if its version is absent
|
||||
"default": "v1.15.x",
|
||||
"default": "v1.16.x",
|
||||
}
|
||||
}
|
||||
|
||||
func loadRKEDefaultK8sVersions() map[string]string {
|
||||
return map[string]string{
|
||||
"0.3": "v1.15.4-rancher1-1",
|
||||
"0.3": "v1.16.2-rancher1-1",
|
||||
// rke will use default if its version is absent
|
||||
"default": "v1.15.4-rancher1-1",
|
||||
"default": "v1.16.2-rancher1-1",
|
||||
}
|
||||
}
|
||||
|
||||
@ -51,7 +53,11 @@ func loadK8sVersionInfo() map[string]v3.K8sVersionInfo {
|
||||
MaxRancherVersion: "2.2",
|
||||
MaxRKEVersion: "0.2.2",
|
||||
},
|
||||
"v1.15.4-rancher1-1": {
|
||||
"v1.13": {
|
||||
MaxRancherVersion: "2.3.1",
|
||||
MaxRKEVersion: "0.3.1",
|
||||
},
|
||||
"v1.15.5-rancher1-1": {
|
||||
MaxRancherVersion: "2.2.9",
|
||||
MaxRKEVersion: "0.2.8",
|
||||
},
|
||||
|
||||
30
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/canal.go
generated
vendored
30
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/canal.go
generated
vendored
@ -1508,6 +1508,9 @@ spec:
|
||||
# Use Kubernetes API as the backing datastore.
|
||||
- name: DATASTORE_TYPE
|
||||
value: "kubernetes"
|
||||
# Configure route aggregation based on pod CIDR.
|
||||
- name: USE_POD_CIDR
|
||||
value: "true"
|
||||
# Wait for the datastore.
|
||||
- name: WAIT_FOR_DATASTORE
|
||||
value: "true"
|
||||
@ -1656,6 +1659,8 @@ metadata:
|
||||
# Create all the CustomResourceDefinitions needed for
|
||||
# Calico policy and networking mode.
|
||||
|
||||
---
|
||||
# Source: calico/templates/kdd-crds.yaml
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
@ -1772,6 +1777,21 @@ spec:
|
||||
kind: NetworkPolicy
|
||||
plural: networkpolicies
|
||||
singular: networkpolicy
|
||||
|
||||
---
|
||||
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: networksets.crd.projectcalico.org
|
||||
spec:
|
||||
scope: Namespaced
|
||||
group: crd.projectcalico.org
|
||||
version: v1
|
||||
names:
|
||||
kind: NetworkSet
|
||||
plural: networksets
|
||||
singular: networkset
|
||||
`
|
||||
|
||||
const CanalTemplateV116 = `
|
||||
@ -2279,9 +2299,15 @@ spec:
|
||||
# Disable IPv6 on Kubernetes.
|
||||
- name: FELIX_IPV6SUPPORT
|
||||
value: "false"
|
||||
# Set Felix logging to "info"
|
||||
# Disable felix logging to file
|
||||
- name: FELIX_LOGFILEPATH
|
||||
value: "none"
|
||||
# Disable felix logging for syslog
|
||||
- name: FELIX_LOGSEVERITYSYS
|
||||
value: ""
|
||||
# Enable felix logging to stdout
|
||||
- name: FELIX_LOGSEVERITYSCREEN
|
||||
value: "info"
|
||||
value: "Warning"
|
||||
- name: FELIX_HEALTHENABLED
|
||||
value: "true"
|
||||
securityContext:
|
||||
|
||||
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -113,7 +113,7 @@ github.com/prometheus/procfs
|
||||
github.com/prometheus/procfs/nfs
|
||||
github.com/prometheus/procfs/xfs
|
||||
github.com/prometheus/procfs/internal/util
|
||||
# github.com/rancher/kontainer-driver-metadata v0.0.0-20191003190312-bd4630881fb2
|
||||
# github.com/rancher/kontainer-driver-metadata v0.0.0-20191021164950-6514452b9732
|
||||
github.com/rancher/kontainer-driver-metadata/rke/templates
|
||||
github.com/rancher/kontainer-driver-metadata/rke
|
||||
# github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36
|
||||
|
||||
Loading…
Reference in New Issue
Block a user