rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-06-27 05:56:50 +00:00
Code Issues Releases Wiki Activity

add disable metrics server options and system image

Browse Source
This commit is contained in:
galal-hussein 2018-07-17 02:31:34 +02:00 committed by Alena Prokharchyk
parent 374bbecefe
commit 1a4b8ecd84
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ var (
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.8.11-rancher1": {
Etcd: m("quay.io/coreos/etcd:v3.0.17"),
@ -60,6 +61,7 @@ var (
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.8.11-rancher2-1": {
Etcd: m("quay.io/coreos/etcd:v3.0.17"),
@ -85,6 +87,7 @@ var (
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.9.5-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
@ -110,6 +113,7 @@ var (
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.9.7-rancher1": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
@ -135,6 +139,7 @@ var (
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.9.7-rancher2-1": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
@ -160,6 +165,7 @@ var (
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.10.0-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
@ -185,6 +191,7 @@ var (
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.10.1-rancher1": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
@ -210,6 +217,7 @@ var (
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.10.1-rancher2-1": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
@ -235,6 +243,7 @@ var (
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.10.3-rancher2-1": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
@ -260,6 +269,7 @@ var (
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.10.5-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
@ -285,6 +295,7 @@ var (
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
}

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

@ -39,6 +39,8 @@ type RancherKubernetesEngineConfig struct {
AddonJobTimeout int `yaml:"addon_job_timeout" json:"addonJobTimeout,omitempty" norman:"default=30"`
// Bastion/Jump Host configuration
BastionHost BastionHost `yaml:"bastion_host" json:"bastionHost,omitempty"`
// Monitoring Config
Monitoring MonitoringConfig `yaml:"monitoring" json:"monitoring,omitempty"`
}
type BastionHost struct {
@ -114,6 +116,8 @@ type RKESystemImages struct {
Ingress string `yaml:"ingress" json:"ingress,omitempty"`
// Ingress Controller Backend image
IngressBackend string `yaml:"ingress_backend" json:"ingressBackend,omitempty"`
// Metrics Server image
MetricsServer string `yaml:"metrics_server" json:"metricsServer,omitempty"`
}
type RKEConfigNode struct {
@ -552,3 +556,10 @@ type AzureCloudProvider struct {
// AWSCloudProvider options
type AWSCloudProvider struct {
}
type MonitoringConfig struct {
// Monitoring server provider
Provider string `yaml:"provider" json:"provider,omitempty"`
// Metrics server options
Options map[string]string `yaml:"options" json:"options,omitempty"`
}