diff --git a/vendor.conf b/vendor.conf index 75d28662..acf4a544 100644 --- a/vendor.conf +++ b/vendor.conf @@ -28,4 +28,4 @@ github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0e github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/rancher/norman 0557aa4ff31a3a0f007dcb1b684894f23cda390c -github.com/rancher/types 4bbd2dbd8de1cc906863467777afa2003c81b5cf +github.com/rancher/types a6037e6ab730d9c660f0dad7f95a3880dcfe773d diff --git a/vendor/github.com/rancher/types/.gitignore b/vendor/github.com/rancher/types/.gitignore index bff99a38..5995f0a4 100644 --- a/vendor/github.com/rancher/types/.gitignore +++ b/vendor/github.com/rancher/types/.gitignore @@ -7,3 +7,4 @@ /trash.lock /types *trash.lock +.vscode/ diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go index d5fd1113..1540635b 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go @@ -35,7 +35,6 @@ var ( }, 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", - "cadvisor-port": "", }, }, "v1.11": { @@ -45,6 +44,7 @@ var ( }, 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", + "cadvisor-port": "0", }, }, "v1.10": { @@ -55,6 +55,7 @@ var ( }, 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", + "cadvisor-port": "0", }, }, "v1.9": { @@ -62,6 +63,9 @@ var ( "endpoint-reconciler-type": "lease", "admission-control": "ServiceAccount,NamespaceLifecycle,LimitRanger,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds", }, + Kubelet: map[string]string{ + "cadvisor-port": "0", + }, }, } @@ -709,10 +713,10 @@ var ( "v1.12.4-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24"), Kubernetes: m("rancher/hyperkube:v1.12.4-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.18"), - NginxProxy: m("rancher/rke-tools:v0.1.18"), - CertDownloader: m("rancher/rke-tools:v0.1.18"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.18"), + Alpine: m("rancher/rke-tools:v0.1.20"), + NginxProxy: m("rancher/rke-tools:v0.1.20"), + CertDownloader: m("rancher/rke-tools:v0.1.20"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.20"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.13"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.13"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.13"), diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go index 1495e408..894a4c99 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go @@ -200,6 +200,8 @@ type KubeAPIService struct { ServiceNodePortRange string `yaml:"service_node_port_range" json:"serviceNodePortRange,omitempty" norman:"default=30000-32767"` // Enabled/Disable PodSecurityPolicy PodSecurityPolicy bool `yaml:"pod_security_policy" json:"podSecurityPolicy,omitempty"` + // Enable/Disable AlwaysPullImages admissions plugin + AlwaysPullImages bool `yaml:"always_pull_images" json:"always_pull_images,omitempty"` } type KubeControllerService struct {