mirror of
https://github.com/rancher/types.git
synced 2025-07-15 22:15:49 +00:00
Refactor k8s versions to be less error prone
This commit is contained in:
Darren Shepherd
Denise
parent
e2046c89f0
commit
11394ace11
@ -1,6 +1,11 @@
|
||||
package v3
|
||||
|
||||
import "github.com/rancher/types/image"
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/rancher/types/image"
|
||||
)
|
||||
|
||||
const (
|
||||
DefaultK8s = "v1.11.1-rancher1-1"
|
||||
@ -9,8 +14,61 @@ const (
|
||||
var (
|
||||
m = image.Mirror
|
||||
|
||||
// K8sVersionToRKESystemImages - images map for 2.0
|
||||
K8sVersionToRKESystemImages = map[string]RKESystemImages{
|
||||
// k8sVersionsCurrent are the latest versions available for installation
|
||||
k8sVersionsCurrent = []string{
|
||||
"v1.9.7-rancher2-2",
|
||||
"v1.10.5-rancher1-2",
|
||||
"v1.11.1-rancher1-1",
|
||||
}
|
||||
|
||||
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
|
||||
K8sVersionToRKESystemImages map[string]RKESystemImages
|
||||
|
||||
// K8sVersionServiceOptions - service options per k8s version
|
||||
K8sVersionServiceOptions = map[string]KubernetesServicesOptions{
|
||||
"v1.10": {
|
||||
KubeAPI: map[string]string{
|
||||
"tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
|
||||
"endpoint-reconciler-type": "lease",
|
||||
},
|
||||
Kubelet: map[string]string{
|
||||
"tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
|
||||
},
|
||||
},
|
||||
"v1.9": {
|
||||
KubeAPI: map[string]string{
|
||||
"endpoint-reconciler-type": "lease",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
// ToolsSystemImages default images for alert, pipeline, logging
|
||||
ToolsSystemImages = struct {
|
||||
AlertSystemImages AlertSystemImages
|
||||
PipelineSystemImages PipelineSystemImages
|
||||
LoggingSystemImages LoggingSystemImages
|
||||
}{
|
||||
AlertSystemImages: AlertSystemImages{
|
||||
AlertManager: m("prom/alertmanager:v0.11.0"),
|
||||
AlertManagerHelper: m("rancher/alertmanager-helper:v0.0.2"),
|
||||
},
|
||||
PipelineSystemImages: PipelineSystemImages{
|
||||
Jenkins: m("jenkins/jenkins:2.107-slim"),
|
||||
JenkinsJnlp: m("jenkins/jnlp-slave:3.10-1-alpine"),
|
||||
AlpineGit: m("alpine/git:1.0.4"),
|
||||
PluginsDocker: m("plugins/docker:17.12"),
|
||||
},
|
||||
LoggingSystemImages: LoggingSystemImages{
|
||||
Fluentd: m("rancher/fluentd:v0.1.10"),
|
||||
FluentdHelper: m("rancher/fluentd-helper:v0.1.2"),
|
||||
LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.3"),
|
||||
Elaticsearch: m("quay.io/pires/docker-elasticsearch-kubernetes:5.6.2"),
|
||||
Kibana: m("kibana:5.6.4"),
|
||||
Busybox: m("busybox"),
|
||||
},
|
||||
}
|
||||
|
||||
AllK8sVersions = map[string]RKESystemImages{
|
||||
"v1.9.5-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.9.5-rancher1"),
|
||||
@ -297,56 +355,6 @@ var (
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
|
||||
},
|
||||
}
|
||||
|
||||
// K8sVersionServiceOptions - service options per k8s version
|
||||
K8sVersionServiceOptions = map[string]KubernetesServicesOptions{
|
||||
"v1.10": {
|
||||
KubeAPI: map[string]string{
|
||||
"tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
|
||||
"endpoint-reconciler-type": "lease",
|
||||
},
|
||||
Kubelet: map[string]string{
|
||||
"tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
|
||||
},
|
||||
},
|
||||
"v1.9": {
|
||||
KubeAPI: map[string]string{
|
||||
"endpoint-reconciler-type": "lease",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
// ToolsSystemImages default images for alert, pipeline, logging
|
||||
ToolsSystemImages = struct {
|
||||
AlertSystemImages AlertSystemImages
|
||||
PipelineSystemImages PipelineSystemImages
|
||||
LoggingSystemImages LoggingSystemImages
|
||||
}{
|
||||
AlertSystemImages: AlertSystemImages{
|
||||
AlertManager: m("prom/alertmanager:v0.11.0"),
|
||||
AlertManagerHelper: m("rancher/alertmanager-helper:v0.0.2"),
|
||||
},
|
||||
PipelineSystemImages: PipelineSystemImages{
|
||||
Jenkins: m("jenkins/jenkins:2.107-slim"),
|
||||
JenkinsJnlp: m("jenkins/jnlp-slave:3.10-1-alpine"),
|
||||
AlpineGit: m("alpine/git:1.0.4"),
|
||||
PluginsDocker: m("plugins/docker:17.12"),
|
||||
},
|
||||
LoggingSystemImages: LoggingSystemImages{
|
||||
Fluentd: m("rancher/fluentd:v0.1.10"),
|
||||
FluentdHelper: m("rancher/fluentd-helper:v0.1.2"),
|
||||
LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.3"),
|
||||
Elaticsearch: m("quay.io/pires/docker-elasticsearch-kubernetes:5.6.2"),
|
||||
Kibana: m("kibana:5.6.4"),
|
||||
Busybox: m("busybox"),
|
||||
},
|
||||
}
|
||||
|
||||
// LegacyK8sVersionToRKESystemImages - legacy images map
|
||||
// Get to keep non-supported version because they are being referenced in dynamic manner by rancher code;
|
||||
// so kept them in the separate data structure. Can be removed only if we decide to persist them on a cluster object.
|
||||
LegacyK8sVersionToRKESystemImages = map[string]RKESystemImages{
|
||||
"v1.8.10-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.0.17"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.8.10-rancher2"),
|
||||
@ -424,3 +432,41 @@ var (
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
func init() {
|
||||
badVersions := map[string]bool{
|
||||
"v1.9.7-rancher1": true,
|
||||
"v1.10.1-rancher1": true,
|
||||
"v1.8.11-rancher1": true,
|
||||
"v1.8.10-rancher1-1": true,
|
||||
}
|
||||
|
||||
if K8sVersionToRKESystemImages != nil {
|
||||
panic("Do not initialize or add values to K8sVersionToRKESystemImages")
|
||||
}
|
||||
|
||||
K8sVersionToRKESystemImages = map[string]RKESystemImages{}
|
||||
|
||||
for version, images := range AllK8sVersions {
|
||||
if badVersions[version] {
|
||||
continue
|
||||
}
|
||||
|
||||
longName := "rancher/hyperkube:" + version
|
||||
if !strings.HasPrefix(longName, images.Kubernetes) {
|
||||
panic(fmt.Sprintf("For K8s version %s, the Kubernetes image tag should be a substring of %s, currently it is %s", version, version, images.Kubernetes))
|
||||
}
|
||||
}
|
||||
|
||||
for _, latest := range k8sVersionsCurrent {
|
||||
images, ok := AllK8sVersions[latest]
|
||||
if !ok {
|
||||
panic("K8s version " + " is not found in AllK8sVersions map")
|
||||
}
|
||||
K8sVersionToRKESystemImages[latest] = images
|
||||
}
|
||||
|
||||
if _, ok := K8sVersionToRKESystemImages[DefaultK8s]; !ok {
|
||||
panic("Default K8s version " + DefaultK8s + " is not found in k8sVersionsCurrent list")
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user