rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-14 06:00:53 +00:00
Code Issues Releases Wiki Activity

kontainer-driver-metadata vendor update

Browse Source
This commit is contained in:
Alena Prokharchyk
2019-11-14 12:50:13 -08:00
parent 3344b19b14
commit ad03afb6fb
7 changed files with 145 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_defaults.go generated vendored
View File

@@ -6,6 +6,7 @@ import (
"fmt"
"github.com/blang/semver"
"github.com/rancher/kontainer-driver-metadata/rke/templates"
"github.com/sirupsen/logrus"
"os"
"strings"
@@ -43,9 +44,10 @@ type Data struct {
}
var (
DriverData Data
TemplateData map[string]map[string]string
m = image.Mirror
DriverData Data
TemplateData map[string]map[string]string
MissedTemplate map[string][]string
m = image.Mirror
)
func init() {
@@ -89,6 +91,7 @@ func validateDefaultPresent(versions map[string]string) {
func validateTemplateMatch() {
TemplateData = map[string]map[string]string{}
MissedTemplate = map[string][]string{}
for k8sVersion := range DriverData.K8sVersionRKESystemImages {
toMatch, err := semver.Make(k8sVersion[1:])
if err != nil {
@@ -117,7 +120,13 @@ func validateTemplateMatch() {
}
}
if matchedKey == "" {
panic(fmt.Sprintf("no template found for k8sVersion %s plugin %s", k8sVersion, plugin))
if val, ok := MissedTemplate[plugin]; ok {
val = append(val, k8sVersion)
MissedTemplate[plugin] = val
} else {
MissedTemplate[plugin] = []string{k8sVersion}
}
continue
}
TemplateData[k8sVersion][plugin] = fmt.Sprintf("range=%s key=%s", matchedRange, matchedKey)
}
@@ -129,7 +138,6 @@ func GenerateData() {
splitStr := strings.SplitN(os.Args[1], "=", 2)
if len(splitStr) == 2 {
if splitStr[0] == "--write-data" && splitStr[1] == "true" {
buf := new(bytes.Buffer)
enc := json.NewEncoder(buf)
enc.SetEscapeHTML(false)
@@ -140,6 +148,13 @@ func GenerateData() {
}
fmt.Println(buf.String())
if len(MissedTemplate) != 0 {
logrus.Warnf("found k8s versions without a template")
for plugin, data := range MissedTemplate {
logrus.Warnf("no %s template for k8sVersions %v \n", plugin, data)
}
}
fmt.Println("generating data.json")
//todo: zip file
strData, _ := json.MarshalIndent(DriverData, "", " ")

92
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go generated vendored
View File

@@ -1324,6 +1324,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-rancher2-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.14.8-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.51"),
NginxProxy: m("rancher/rke-tools:v0.1.51"),
CertDownloader: m("rancher/rke-tools:v0.1.51"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
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"),
@@ -1535,6 +1564,37 @@ 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.3.0
"v1.15.5-rancher2-2": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.15.5-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.51"),
NginxProxy: m("rancher/rke-tools:v0.1.51"),
CertDownloader: m("rancher/rke-tools:v0.1.51"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
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"),
@@ -1599,6 +1659,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-rancher2-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.15-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.16.2-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.51"),
NginxProxy: m("rancher/rke-tools:v0.1.51"),
CertDownloader: m("rancher/rke-tools:v0.1.51"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
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": {

5
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_version_info.go generated vendored
View File

@@ -10,6 +10,7 @@ func loadRancherDefaultK8sVersions() map[string]string {
return map[string]string{
"2.3.0": "v1.15.x",
"2.3.1": "v1.15.x",
"2.3.2": "v1.15.x",
"2.3": "v1.16.x",
// rancher will use default if its version is absent
"default": "v1.16.x",
@@ -18,9 +19,9 @@ func loadRancherDefaultK8sVersions() map[string]string {
func loadRKEDefaultK8sVersions() map[string]string {
return map[string]string{
"0.3": "v1.16.2-rancher1-1",
"0.3": "v1.16.2-rancher2-1",
// rke will use default if its version is absent
"default": "v1.16.2-rancher1-1",
"default": "v1.16.2-rancher2-1",
}
}

24
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/nginx-ingress.go generated vendored
View File

@@ -248,6 +248,9 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
{{if .ExtraEnvs}}
{{ toYaml .ExtraEnvs | indent 12}}
{{end}}
ports:
- name: http
containerPort: 80
@@ -272,6 +275,15 @@ spec:
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
{{if .ExtraVolumeMounts}}
volumeMounts:
{{ toYaml .ExtraVolumeMounts | indent 12}}
{{end}}
{{if .ExtraVolumes}}
volumes:
{{ toYaml .ExtraVolumes | indent 8}}
{{end}}
---
apiVersion: apps/v1
kind: Deployment
@@ -595,6 +607,9 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
{{if .ExtraEnvs}}
{{ toYaml .ExtraEnvs | indent 12}}
{{end}}
ports:
- name: http
containerPort: 80
@@ -619,6 +634,15 @@ spec:
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
{{if .ExtraVolumeMounts}}
volumeMounts:
{{ toYaml .ExtraVolumeMounts | indent 12}}
{{end}}
{{if .ExtraVolumes}}
volumes:
{{ toYaml .ExtraVolumes | indent 8}}
{{end}}
---
apiVersion: apps/v1
kind: Deployment