1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-08 18:39:40 +00:00

update types vendor

This commit is contained in:
galal-hussein
2018-08-01 19:56:58 +02:00
committed by Denise
parent 6b7ab83899
commit e6e0b1e61d
5 changed files with 18 additions and 16 deletions

View File

@@ -276,8 +276,8 @@ type SamlConfig struct {
AuthConfig `json:",inline" mapstructure:",squash"`
IDPMetadataContent string `json:"idpMetadataContent" norman:"required"`
SPSelfSignedCert string `json:"spCert" norman:"required"`
SPSelfSignedKey string `json:"spKey" norman:"required"`
SpCert string `json:"spCert" norman:"required"`
SpKey string `json:"spKey" norman:"required"`
GroupsField string `json:"groupsField" norman:"required"`
DisplayNameField string `json:"displayNameField" norman:"required"`
UserNameField string `json:"userNameField" norman:"required"`

View File

@@ -9,6 +9,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
const RancherCreatedLabel = "creator.cattle.io/rancher-created"
var (
NamespaceBackedResource condition.Cond = "BackingNamespaceCreated"
CreatorMadeOwner condition.Cond = "CreatorMadeOwner"

View File

@@ -92,10 +92,10 @@ var (
"v1.9.7-rancher2-2": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.11"),
NginxProxy: m("rancher/rke-tools:v0.1.11"),
CertDownloader: m("rancher/rke-tools:v0.1.11"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.11"),
Alpine: m("rancher/rke-tools:v0.1.12"),
NginxProxy: m("rancher/rke-tools:v0.1.12"),
CertDownloader: m("rancher/rke-tools:v0.1.12"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.12"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7"),
@@ -248,10 +248,10 @@ var (
"v1.10.5-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
Kubernetes: m("rancher/hyperkube:v1.10.5-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.11"),
NginxProxy: m("rancher/rke-tools:v0.1.11"),
CertDownloader: m("rancher/rke-tools:v0.1.11"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.11"),
Alpine: m("rancher/rke-tools:v0.1.12"),
NginxProxy: m("rancher/rke-tools:v0.1.12"),
CertDownloader: m("rancher/rke-tools:v0.1.12"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.12"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"),
@@ -274,10 +274,10 @@ var (
"v1.11.1-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.18"),
Kubernetes: m("rancher/hyperkube:v1.11.1-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.11"),
NginxProxy: m("rancher/rke-tools:v0.1.11"),
CertDownloader: m("rancher/rke-tools:v0.1.11"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.11"),
Alpine: m("rancher/rke-tools:v0.1.12"),
NginxProxy: m("rancher/rke-tools:v0.1.12"),
CertDownloader: m("rancher/rke-tools:v0.1.12"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.12"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.10"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.10"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.10"),

View File

@@ -5,4 +5,4 @@ k8s.io/kubernetes v1.10.5
bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git
golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5
github.com/rancher/norman c032c4611f2eec1652ef37d254f0e8ccf90c80aa
github.com/rancher/norman 0953e9e976f1038bb3e93e81d164a69d6fbe9873