diff --git a/vendor.conf b/vendor.conf index 8efd54b2..1d0211e6 100644 --- a/vendor.conf +++ b/vendor.conf @@ -24,4 +24,4 @@ github.com/ugorji/go ccfe18359b55b97855cee1d3f74e5efbda4869dc github.com/Microsoft/go-winio ab35fc04b6365e8fcb18e6e9e41ea4a02b10b175 github.com/go-ini/ini 06f5f3d67269ccec1fe5fe4134ba6e982984f7f5 github.com/rancher/norman c032c4611f2eec1652ef37d254f0e8ccf90c80aa -github.com/rancher/types fdaf972f5264c2863c2d93cc8f8bc970bf9bf6a6 +github.com/rancher/types bc4dd479ded52ab94f054f80522bce70ed2c4939 diff --git a/vendor/github.com/rancher/types/Dockerfile.dapper b/vendor/github.com/rancher/types/Dockerfile.dapper index 89bcb1b1..f069bfa7 100644 --- a/vendor/github.com/rancher/types/Dockerfile.dapper +++ b/vendor/github.com/rancher/types/Dockerfile.dapper @@ -1,32 +1,19 @@ -FROM ubuntu:16.04 -# FROM arm=armhf/ubuntu:16.04 +FROM golang:1.11-alpine -ARG DAPPER_HOST_ARCH -ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} +RUN apk -U add bash git gcc musl-dev docker vim less file curl wget ca-certificates +RUN go get -d golang.org/x/lint/golint && \ + git -C /go/src/golang.org/x/lint/golint checkout -b current 06c8688daad7faa9da5a0c2f163a3d14aac986ca && \ + go install golang.org/x/lint/golint && \ + rm -rf /go/src /go/pkg +RUN go get -d golang.org/x/tools/cmd/goimports && \ + git -C /go/src/golang.org/x/tools/cmd/goimports checkout -b current 0b24b358f4c7eaa92895f67a3f6cea2a0cf525d5 && \ + go install golang.org/x/tools/cmd/goimports && \ + rm -rf /go/src /go/pkg -RUN apt-get update && \ - apt-get install -y gcc ca-certificates git wget curl vim less file && \ - rm -f /bin/sh && ln -s /bin/bash /bin/sh - -ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH=GOLANG_ARCH_${ARCH} \ - GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash - -RUN wget -O - https://storage.googleapis.com/golang/go1.8.3.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \ - go get github.com/rancher/trash && \ - go get github.com/golang/lint/golint && \ - go get golang.org/x/tools/cmd/goimports - -ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \ - DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm \ - DOCKER_URL=DOCKER_URL_${ARCH} - -RUN wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker - -ENV DAPPER_ENV REPO TAG +ENV DAPPER_ENV REPO TAG DRONE_TAG ENV DAPPER_SOURCE /go/src/github.com/rancher/types/ ENV DAPPER_OUTPUT ./bin ./dist ENV DAPPER_DOCKER_SOCKET true -ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache ENV HOME ${DAPPER_SOURCE} WORKDIR ${DAPPER_SOURCE} diff --git a/vendor/github.com/rancher/types/Makefile b/vendor/github.com/rancher/types/Makefile index d7d72a16..78839b9b 100644 --- a/vendor/github.com/rancher/types/Makefile +++ b/vendor/github.com/rancher/types/Makefile @@ -10,14 +10,6 @@ TARGETS := $(shell ls scripts) $(TARGETS): .dapper ./.dapper $@ -trash: .dapper - ./.dapper -m bind trash - -trash-keep: .dapper - ./.dapper -m bind trash -k - -deps: trash - .DEFAULT_GOAL := ci .PHONY: $(TARGETS) diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go index ea62ed3b..70783e07 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go @@ -125,7 +125,7 @@ type NotifierSpec struct { } type Notification struct { - Message string `json:"message, omitempty"` + Message string `json:"message,omitempty"` SMTPConfig *SMTPConfig `json:"smtpConfig,omitempty"` SlackConfig *SlackConfig `json:"slackConfig,omitempty"` PagerdutyConfig *PagerdutyConfig `json:"pagerdutyConfig,omitempty"` diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authn_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authn_types.go index 9a9aab5e..50812dad 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authn_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authn_types.go @@ -197,12 +197,14 @@ type ActiveDirectoryConfig struct { UserDisabledBitMask int64 `json:"userDisabledBitMask,omitempty" norman:"default=2"` UserSearchBase string `json:"userSearchBase,omitempty" norman:"required"` UserSearchAttribute string `json:"userSearchAttribute,omitempty" norman:"default=sAMAccountName|sn|givenName,required"` + UserSearchFilter string `json:"userSearchFilter,omitempty"` UserLoginAttribute string `json:"userLoginAttribute,omitempty" norman:"default=sAMAccountName,required"` UserObjectClass string `json:"userObjectClass,omitempty" norman:"default=person,required"` UserNameAttribute string `json:"userNameAttribute,omitempty" norman:"default=name,required"` UserEnabledAttribute string `json:"userEnabledAttribute,omitempty" norman:"default=userAccountControl,required"` GroupSearchBase string `json:"groupSearchBase,omitempty"` GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" norman:"default=sAMAccountName,required"` + GroupSearchFilter string `json:"groupSearchFilter,omitempty"` GroupObjectClass string `json:"groupObjectClass,omitempty" norman:"default=group,required"` GroupNameAttribute string `json:"groupNameAttribute,omitempty" norman:"default=name,required"` GroupDNAttribute string `json:"groupDNAttribute,omitempty" norman:"default=distinguishedName,required"` diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go index c1ce44eb..69735ea3 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go @@ -228,6 +228,7 @@ type AmazonElasticContainerServiceConfig struct { Subnets []string `json:"subnets,omitempty"` SecurityGroups []string `json:"securityGroups,omitempty"` ServiceRole string `json:"serviceRole,omitempty"` + AMI string `json:"ami,omitempty"` } type ClusterEvent struct { 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 bd52e6b9..3f83d447 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 @@ -9,7 +9,7 @@ import ( ) const ( - DefaultK8s = "v1.11.2-rancher1-2" + DefaultK8s = "v1.11.3-rancher1-1" ) var ( @@ -19,7 +19,8 @@ var ( k8sVersionsCurrent = []string{ "v1.9.7-rancher2-2", "v1.10.5-rancher1-2", - "v1.11.2-rancher1-2", + "v1.11.3-rancher1-1", + "v1.12.0-rancher1-1", } // K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions @@ -27,6 +28,16 @@ var ( // K8sVersionServiceOptions - service options per k8s version K8sVersionServiceOptions = map[string]KubernetesServicesOptions{ + "v1.12": { + 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", + "enable-admission-plugins": "ServiceAccount,NamespaceLifecycle,LimitRanger,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds", + }, + 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": { 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", @@ -61,17 +72,18 @@ var ( LoggingSystemImages LoggingSystemImages }{ AlertSystemImages: AlertSystemImages{ - AlertManager: m("prom/alertmanager:v0.11.0"), + AlertManager: m("prom/alertmanager:v0.15.2"), AlertManagerHelper: m("rancher/alertmanager-helper:v0.0.2"), }, PipelineSystemImages: projectv3.PipelineSystemImages{ Jenkins: m("rancher/pipeline-jenkins-server:v0.1.0"), JenkinsJnlp: m("jenkins/jnlp-slave:3.10-1-alpine"), - AlpineGit: m("alpine/git:1.0.4"), - PluginsDocker: m("rancher/pipeline-docker-publish:v0.2.0"), + AlpineGit: m("rancher/pipeline-tools:v0.1.0"), + PluginsDocker: m("plugins/docker:17.12"), Minio: m("minio/minio:RELEASE.2018-05-25T19-49-13Z"), Registry: m("registry:2"), - KubeApply: m("rancher/pipeline-kube-apply:v0.2.0"), + RegistryProxy: m("rancher/pipeline-tools:v0.1.0"), + KubeApply: m("rancher/pipeline-tools:v0.1.0"), }, LoggingSystemImages: LoggingSystemImages{ Fluentd: m("rancher/fluentd:v0.1.10"), @@ -489,6 +501,58 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, + "v1.11.3-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.2.18"), + Kubernetes: m("rancher/hyperkube:v1.11.3-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.14"), + NginxProxy: m("rancher/rke-tools:v0.1.14"), + CertDownloader: m("rancher/rke-tools:v0.1.14"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.14"), + 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"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.10.0"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.0"), + CalicoNode: m("quay.io/calico/node:v3.1.3"), + CalicoCNI: m("quay.io/calico/cni:v3.1.3"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.3"), + CanalCNI: m("quay.io/calico/cni:v3.1.3"), + CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"), + WeaveNode: m("weaveworks/weave-kube:2.1.2"), + WeaveCNI: m("weaveworks/weave-npc:2.1.2"), + PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), + Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), + }, + "v1.12.0-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.2.24"), + Kubernetes: m("rancher/hyperkube:v1.12.0-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.14"), + NginxProxy: m("rancher/rke-tools:v0.1.14"), + CertDownloader: m("rancher/rke-tools:v0.1.14"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.14"), + 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"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.10.0"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.0"), + CalicoNode: m("quay.io/calico/node:v3.1.3"), + CalicoCNI: m("quay.io/calico/cni:v3.1.3"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.3"), + CanalCNI: m("quay.io/calico/cni:v3.1.3"), + CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"), + WeaveNode: m("weaveworks/weave-kube:2.1.2"), + WeaveCNI: m("weaveworks/weave-npc:2.1.2"), + PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), + Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), + }, } ) diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_windows_default.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_windows_default.go index 3914aeb6..acf6a883 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_windows_default.go @@ -40,6 +40,16 @@ var ( "resolv-conf": "", }, }, + "v1.12": { + 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", + "feature-gates": "MountPropagation=false,HyperVContainer=true", + "cgroups-per-qos": "false", + "enforce-node-allocatable": "", + "resolv-conf": "", + "cadvisor-port": "", + }, + }, } // AllK8sWindowsVersions - images map for 2.0 @@ -172,6 +182,22 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, + "v1.11.3-rancher1-1": { + NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.11.3-nanoserver-1803"), + FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), + CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"), + CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), + KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), + }, + "v1.12.0-rancher1-1": { + NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.12.0-nanoserver-1803"), + FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), + CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"), + CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), + KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), + }, } ) diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/logging_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/logging_types.go index f1a1ffc0..15e7f325 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/logging_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/logging_types.go @@ -40,24 +40,22 @@ type ProjectLogging struct { type LoggingCommonSpec struct { DisplayName string `json:"displayName,omitempty"` - OutputFlushInterval int `json:"outputFlushInterval,omitempty" norman:"default=3"` - OutputTags map[string]string `json:"outputTags,omitempty"` - ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty"` - SplunkConfig *SplunkConfig `json:"splunkConfig,omitempty"` - KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty"` - SyslogConfig *SyslogConfig `json:"syslogConfig,omitempty"` + OutputFlushInterval int `json:"outputFlushInterval,omitempty" norman:"default=3"` + OutputTags map[string]string `json:"outputTags,omitempty"` + ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty"` + SplunkConfig *SplunkConfig `json:"splunkConfig,omitempty"` + KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty"` + SyslogConfig *SyslogConfig `json:"syslogConfig,omitempty"` + FluentForwarderConfig *FluentForwarderConfig `json:"fluentForwarderConfig,omitempty"` } type ClusterLoggingSpec struct { LoggingCommonSpec ClusterName string `json:"clusterName" norman:"type=reference[cluster]"` - - EmbeddedConfig *EmbeddedConfig `json:"embeddedConfig,omitempty"` } type ProjectLoggingSpec struct { LoggingCommonSpec - ProjectName string `json:"projectName" norman:"type=reference[project]"` } @@ -117,17 +115,6 @@ type SplunkConfig struct { Index string `json:"index,omitempty"` } -type EmbeddedConfig struct { - IndexPrefix string `json:"indexPrefix,omitempty" norman:"required"` - DateFormat string `json:"dateFormat,omitempty" norman:"required,type=enum,options=YYYY-MM-DD|YYYY-MM|YYYY,default=YYYY-MM-DD"` - ElasticsearchEndpoint string `json:"elasticsearchEndpoint,omitempty" norman:"nocreate"` - KibanaEndpoint string `json:"kibanaEndpoint,omitempty" norman:"nocreate"` - RequestsMemery int `json:"requestsMemory,omitempty" norman:"default=4096,min=512"` - RequestsCPU int `json:"requestsCpu,omitempty" norman:"default=2000,min=1000"` - LimitsMemery int `json:"limitsMemory,omitempty" norman:"default=4096,min=512"` - LimitsCPU int `json:"limitsCpu,omitempty" norman:"default=2000,min=1000"` -} - type KafkaConfig struct { ZookeeperEndpoint string `json:"zookeeperEndpoint,omitempty"` BrokerEndpoints []string `json:"brokerEndpoints,omitempty"` @@ -149,6 +136,23 @@ type SyslogConfig struct { SSLVerify bool `json:"sslVerify,omitempty"` } +type FluentForwarderConfig struct { + EnableTLS bool `json:"enableTls,omitempty" norman:"default=false"` + Certificate string `json:"certificate,omitempty"` + Compress bool `json:"compress,omitempty" norman:"default=true"` + FluentServers []FluentServer `json:"fluentServers,omitempty" norman:"required"` +} + +type FluentServer struct { + Endpoint string `json:"endpoint,omitempty" norman:"required"` + Hostname string `json:"hostname,omitempty"` + Weight int `json:"weight,omitempty" norman:"default=100"` + Standby bool `json:"standby,omitempty" norman:"default=false"` + Username string `json:"username,omitempty"` + Password string `json:"password,omitempty"` + SharedKey string `json:"sharedKey,omitempty"` +} + type LoggingSystemImages struct { Fluentd string `json:"fluentd,omitempty"` FluentdHelper string `json:"fluentdHelper,omitempty"` diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go index 5ea2e66a..071a273b 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go @@ -184,7 +184,7 @@ type NodeSpec struct { Imported bool `json:"imported"` Description string `json:"description,omitempty"` DisplayName string `json:"displayName"` - RequestedHostname string `json:"requestedHostname,omitempty" norman:"type=dnsLabel,nullable,noupdate,required"` + RequestedHostname string `json:"requestedHostname,omitempty" norman:"type=hostname,nullable,noupdate,required"` InternalNodeSpec v1.NodeSpec `json:"internalNodeSpec"` DesiredNodeLabels map[string]string `json:"desiredNodeLabels,omitempty"` DesiredNodeAnnotations map[string]string `json:"desiredNodeAnnotations,omitempty"` 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 a0d3d012..3cb011e0 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 @@ -22,7 +22,7 @@ type RancherKubernetesEngineConfig struct { // Authorization mode configuration used in the cluster Authorization AuthzConfig `yaml:"authorization" json:"authorization,omitempty"` // Enable/disable strict docker version checking - IgnoreDockerVersion bool `yaml:"ignore_docker_version" json:"ignoreDockerVersion"` + IgnoreDockerVersion bool `yaml:"ignore_docker_version" json:"ignoreDockerVersion" norman:"default=true"` // Kubernetes version to use (if kubernetes image is specifed, image version takes precedence) Version string `yaml:"kubernetes_version" json:"kubernetesVersion,omitempty"` // List of private registries and their credentials @@ -64,7 +64,7 @@ type PrivateRegistry struct { // User name for registry acces User string `yaml:"user" json:"user,omitempty"` // Password for registry access - Password string `yaml:"password" json:"password,omitempty"` + Password string `yaml:"password" json:"password,omitempty" norman:"type=password"` // Default registry IsDefault bool `yaml:"is_default" json:"isDefault,omitempty"` } @@ -142,7 +142,7 @@ type RKEConfigNode struct { // SSH Agent Auth enable SSHAgentAuth bool `yaml:"ssh_agent_auth,omitempty" json:"sshAgentAuth,omitempty"` // SSH Private Key - SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty"` + SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"` // SSH Private Key Path SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"` // Node Labels @@ -191,7 +191,7 @@ type KubeAPIService struct { // Virtual IP range that will be used by Kubernetes services ServiceClusterIPRange string `yaml:"service_cluster_ip_range" json:"serviceClusterIpRange,omitempty"` // Port range for services defined with NodePort type - ServiceNodePortRange string `yaml:"service_node_port_range" json:"serviceNodePortRange,omitempty"` + 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"` } @@ -241,7 +241,7 @@ type BaseService struct { type NetworkConfig struct { // Network Plugin That will be used in kubernetes cluster - Plugin string `yaml:"plugin" json:"plugin,omitempty"` + Plugin string `yaml:"plugin" json:"plugin,omitempty" norman:"default=canal"` // Plugin options to configure network properties Options map[string]string `yaml:"options" json:"options,omitempty"` // CalicoNetworkProvider @@ -254,7 +254,7 @@ type NetworkConfig struct { type AuthnConfig struct { // Authentication strategy that will be used in kubernetes cluster - Strategy string `yaml:"strategy" json:"strategy,omitempty"` + Strategy string `yaml:"strategy" json:"strategy,omitempty" norman:"default=x509"` // Authentication options Options map[string]string `yaml:"options" json:"options,omitempty"` // List of additional hostnames and IPs to include in the api server PKI cert @@ -270,7 +270,7 @@ type AuthzConfig struct { type IngressConfig struct { // Ingress controller type used by kubernetes - Provider string `yaml:"provider" json:"provider,omitempty"` + Provider string `yaml:"provider" json:"provider,omitempty" norman:"default=nginx"` // Ingress controller options Options map[string]string `yaml:"options" json:"options,omitempty"` // NodeSelector key pair @@ -563,7 +563,7 @@ type AWSCloudProvider struct { type MonitoringConfig struct { // Monitoring server provider - Provider string `yaml:"provider" json:"provider,omitempty"` + Provider string `yaml:"provider" json:"provider,omitempty" norman:"default=metrics-server"` // Metrics server options Options map[string]string `yaml:"options" json:"options,omitempty"` } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go index 7175b694..c136bb45 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go @@ -42,6 +42,7 @@ type AuthConfigLister interface { } type AuthConfigController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() AuthConfigLister AddHandler(name string, handler AuthConfigHandlerFunc) @@ -104,6 +105,10 @@ type authConfigController struct { controller.GenericController } +func (c *authConfigController) Generic() controller.GenericController { + return c.GenericController +} + func (c *authConfigController) Lister() AuthConfigLister { return &authConfigLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_catalog_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_catalog_controller.go index 1087660f..3c7e594f 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_catalog_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_catalog_controller.go @@ -42,6 +42,7 @@ type CatalogLister interface { } type CatalogController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() CatalogLister AddHandler(name string, handler CatalogHandlerFunc) @@ -104,6 +105,10 @@ type catalogController struct { controller.GenericController } +func (c *catalogController) Generic() controller.GenericController { + return c.GenericController +} + func (c *catalogController) Lister() CatalogLister { return &catalogLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go index 3e49e934..1c9b2d33 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go @@ -43,6 +43,7 @@ type ClusterAlertLister interface { } type ClusterAlertController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ClusterAlertLister AddHandler(name string, handler ClusterAlertHandlerFunc) @@ -105,6 +106,10 @@ type clusterAlertController struct { controller.GenericController } +func (c *clusterAlertController) Generic() controller.GenericController { + return c.GenericController +} + func (c *clusterAlertController) Lister() ClusterAlertLister { return &clusterAlertLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_controller.go index 2dbb4320..6f178015 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_controller.go @@ -42,6 +42,7 @@ type ClusterLister interface { } type ClusterController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ClusterLister AddHandler(name string, handler ClusterHandlerFunc) @@ -104,6 +105,10 @@ type clusterController struct { controller.GenericController } +func (c *clusterController) Generic() controller.GenericController { + return c.GenericController +} + func (c *clusterController) Lister() ClusterLister { return &clusterLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go index 06f019a8..75262703 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go @@ -43,6 +43,7 @@ type ClusterEventLister interface { } type ClusterEventController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ClusterEventLister AddHandler(name string, handler ClusterEventHandlerFunc) @@ -105,6 +106,10 @@ type clusterEventController struct { controller.GenericController } +func (c *clusterEventController) Generic() controller.GenericController { + return c.GenericController +} + func (c *clusterEventController) Lister() ClusterEventLister { return &clusterEventLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go index ff7865c6..908406f1 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go @@ -43,6 +43,7 @@ type ClusterLoggingLister interface { } type ClusterLoggingController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ClusterLoggingLister AddHandler(name string, handler ClusterLoggingHandlerFunc) @@ -105,6 +106,10 @@ type clusterLoggingController struct { controller.GenericController } +func (c *clusterLoggingController) Generic() controller.GenericController { + return c.GenericController +} + func (c *clusterLoggingController) Lister() ClusterLoggingLister { return &clusterLoggingLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go index 6618c48b..b13fa594 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go @@ -43,6 +43,7 @@ type ClusterRegistrationTokenLister interface { } type ClusterRegistrationTokenController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ClusterRegistrationTokenLister AddHandler(name string, handler ClusterRegistrationTokenHandlerFunc) @@ -105,6 +106,10 @@ type clusterRegistrationTokenController struct { controller.GenericController } +func (c *clusterRegistrationTokenController) Generic() controller.GenericController { + return c.GenericController +} + func (c *clusterRegistrationTokenController) Lister() ClusterRegistrationTokenLister { return &clusterRegistrationTokenLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go index 807326f1..d788b849 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go @@ -43,6 +43,7 @@ type ClusterRoleTemplateBindingLister interface { } type ClusterRoleTemplateBindingController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ClusterRoleTemplateBindingLister AddHandler(name string, handler ClusterRoleTemplateBindingHandlerFunc) @@ -105,6 +106,10 @@ type clusterRoleTemplateBindingController struct { controller.GenericController } +func (c *clusterRoleTemplateBindingController) Generic() controller.GenericController { + return c.GenericController +} + func (c *clusterRoleTemplateBindingController) Lister() ClusterRoleTemplateBindingLister { return &clusterRoleTemplateBindingLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_compose_config_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_compose_config_controller.go index d3ce34ff..33b66191 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_compose_config_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_compose_config_controller.go @@ -42,6 +42,7 @@ type ComposeConfigLister interface { } type ComposeConfigController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ComposeConfigLister AddHandler(name string, handler ComposeConfigHandlerFunc) @@ -104,6 +105,10 @@ type composeConfigController struct { controller.GenericController } +func (c *composeConfigController) Generic() controller.GenericController { + return c.GenericController +} + func (c *composeConfigController) Lister() ComposeConfigLister { return &composeConfigLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go index db40b7fc..d4e89ee4 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -1031,15 +1031,6 @@ func (in *ClusterLoggingList) DeepCopyObject() runtime.Object { func (in *ClusterLoggingSpec) DeepCopyInto(out *ClusterLoggingSpec) { *out = *in in.LoggingCommonSpec.DeepCopyInto(&out.LoggingCommonSpec) - if in.EmbeddedConfig != nil { - in, out := &in.EmbeddedConfig, &out.EmbeddedConfig - if *in == nil { - *out = nil - } else { - *out = new(EmbeddedConfig) - **out = **in - } - } return } @@ -1754,22 +1745,6 @@ func (in *ElasticsearchConfig) DeepCopy() *ElasticsearchConfig { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *EmbeddedConfig) DeepCopyInto(out *EmbeddedConfig) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EmbeddedConfig. -func (in *EmbeddedConfig) DeepCopy() *EmbeddedConfig { - if in == nil { - return nil - } - out := new(EmbeddedConfig) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ExportOutput) DeepCopyInto(out *ExportOutput) { *out = *in @@ -1861,6 +1836,43 @@ func (in *FlannelNetworkProvider) DeepCopy() *FlannelNetworkProvider { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FluentForwarderConfig) DeepCopyInto(out *FluentForwarderConfig) { + *out = *in + if in.FluentServers != nil { + in, out := &in.FluentServers, &out.FluentServers + *out = make([]FluentServer, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FluentForwarderConfig. +func (in *FluentForwarderConfig) DeepCopy() *FluentForwarderConfig { + if in == nil { + return nil + } + out := new(FluentForwarderConfig) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FluentServer) DeepCopyInto(out *FluentServer) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FluentServer. +func (in *FluentServer) DeepCopy() *FluentServer { + if in == nil { + return nil + } + out := new(FluentServer) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FreeIpaConfig) DeepCopyInto(out *FreeIpaConfig) { *out = *in @@ -2889,6 +2901,15 @@ func (in *LoggingCommonSpec) DeepCopyInto(out *LoggingCommonSpec) { **out = **in } } + if in.FluentForwarderConfig != nil { + in, out := &in.FluentForwarderConfig, &out.FluentForwarderConfig + if *in == nil { + *out = nil + } else { + *out = new(FluentForwarderConfig) + (*in).DeepCopyInto(*out) + } + } return } diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go index d302c142..9793bb90 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go @@ -42,6 +42,7 @@ type DynamicSchemaLister interface { } type DynamicSchemaController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() DynamicSchemaLister AddHandler(name string, handler DynamicSchemaHandlerFunc) @@ -104,6 +105,10 @@ type dynamicSchemaController struct { controller.GenericController } +func (c *dynamicSchemaController) Generic() controller.GenericController { + return c.GenericController +} + func (c *dynamicSchemaController) Lister() DynamicSchemaLister { return &dynamicSchemaLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go index ccb985f9..da85d1ad 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go @@ -42,6 +42,7 @@ type GlobalRoleBindingLister interface { } type GlobalRoleBindingController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() GlobalRoleBindingLister AddHandler(name string, handler GlobalRoleBindingHandlerFunc) @@ -104,6 +105,10 @@ type globalRoleBindingController struct { controller.GenericController } +func (c *globalRoleBindingController) Generic() controller.GenericController { + return c.GenericController +} + func (c *globalRoleBindingController) Lister() GlobalRoleBindingLister { return &globalRoleBindingLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_controller.go index cf5ff6cd..fe982dde 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_role_controller.go @@ -42,6 +42,7 @@ type GlobalRoleLister interface { } type GlobalRoleController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() GlobalRoleLister AddHandler(name string, handler GlobalRoleHandlerFunc) @@ -104,6 +105,10 @@ type globalRoleController struct { controller.GenericController } +func (c *globalRoleController) Generic() controller.GenericController { + return c.GenericController +} + func (c *globalRoleController) Lister() GlobalRoleLister { return &globalRoleLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_controller.go index 9f4d95ae..8f99c262 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_controller.go @@ -42,6 +42,7 @@ type GroupLister interface { } type GroupController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() GroupLister AddHandler(name string, handler GroupHandlerFunc) @@ -104,6 +105,10 @@ type groupController struct { controller.GenericController } +func (c *groupController) Generic() controller.GenericController { + return c.GenericController +} + func (c *groupController) Lister() GroupLister { return &groupLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_member_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_member_controller.go index 1b33e1ea..b20b4425 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_member_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_group_member_controller.go @@ -42,6 +42,7 @@ type GroupMemberLister interface { } type GroupMemberController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() GroupMemberLister AddHandler(name string, handler GroupMemberHandlerFunc) @@ -104,6 +105,10 @@ type groupMemberController struct { controller.GenericController } +func (c *groupMemberController) Generic() controller.GenericController { + return c.GenericController +} + func (c *groupMemberController) Lister() GroupMemberLister { return &groupMemberLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_ldap_config_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_ldap_config_controller.go index 4f0782ab..66e52a93 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_ldap_config_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_ldap_config_controller.go @@ -42,6 +42,7 @@ type LdapConfigLister interface { } type LdapConfigController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() LdapConfigLister AddHandler(name string, handler LdapConfigHandlerFunc) @@ -104,6 +105,10 @@ type ldapConfigController struct { controller.GenericController } +func (c *ldapConfigController) Generic() controller.GenericController { + return c.GenericController +} + func (c *ldapConfigController) Lister() LdapConfigLister { return &ldapConfigLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go index 30d93e5a..5d9061a1 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go @@ -42,6 +42,7 @@ type ListenConfigLister interface { } type ListenConfigController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ListenConfigLister AddHandler(name string, handler ListenConfigHandlerFunc) @@ -104,6 +105,10 @@ type listenConfigController struct { controller.GenericController } +func (c *listenConfigController) Generic() controller.GenericController { + return c.GenericController +} + func (c *listenConfigController) Lister() ListenConfigLister { return &listenConfigLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_controller.go index 7b656490..c9691faf 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_controller.go @@ -43,6 +43,7 @@ type NodeLister interface { } type NodeController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() NodeLister AddHandler(name string, handler NodeHandlerFunc) @@ -105,6 +106,10 @@ type nodeController struct { controller.GenericController } +func (c *nodeController) Generic() controller.GenericController { + return c.GenericController +} + func (c *nodeController) Lister() NodeLister { return &nodeLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go index 415a2070..7a7e1fd0 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go @@ -42,6 +42,7 @@ type NodeDriverLister interface { } type NodeDriverController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() NodeDriverLister AddHandler(name string, handler NodeDriverHandlerFunc) @@ -104,6 +105,10 @@ type nodeDriverController struct { controller.GenericController } +func (c *nodeDriverController) Generic() controller.GenericController { + return c.GenericController +} + func (c *nodeDriverController) Lister() NodeDriverLister { return &nodeDriverLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go index 88e5e2d1..acf05d3a 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go @@ -43,6 +43,7 @@ type NodePoolLister interface { } type NodePoolController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() NodePoolLister AddHandler(name string, handler NodePoolHandlerFunc) @@ -105,6 +106,10 @@ type nodePoolController struct { controller.GenericController } +func (c *nodePoolController) Generic() controller.GenericController { + return c.GenericController +} + func (c *nodePoolController) Lister() NodePoolLister { return &nodePoolLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_template_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_template_controller.go index 0001577a..83476629 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_template_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_node_template_controller.go @@ -43,6 +43,7 @@ type NodeTemplateLister interface { } type NodeTemplateController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() NodeTemplateLister AddHandler(name string, handler NodeTemplateHandlerFunc) @@ -105,6 +106,10 @@ type nodeTemplateController struct { controller.GenericController } +func (c *nodeTemplateController) Generic() controller.GenericController { + return c.GenericController +} + func (c *nodeTemplateController) Lister() NodeTemplateLister { return &nodeTemplateLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_notifier_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_notifier_controller.go index eb50c804..cdda85e7 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_notifier_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_notifier_controller.go @@ -43,6 +43,7 @@ type NotifierLister interface { } type NotifierController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() NotifierLister AddHandler(name string, handler NotifierHandlerFunc) @@ -105,6 +106,10 @@ type notifierController struct { controller.GenericController } +func (c *notifierController) Generic() controller.GenericController { + return c.GenericController +} + func (c *notifierController) Lister() NotifierLister { return ¬ifierLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go index 7029f1bc..25d46f77 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go @@ -42,6 +42,7 @@ type PodSecurityPolicyTemplateLister interface { } type PodSecurityPolicyTemplateController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() PodSecurityPolicyTemplateLister AddHandler(name string, handler PodSecurityPolicyTemplateHandlerFunc) @@ -104,6 +105,10 @@ type podSecurityPolicyTemplateController struct { controller.GenericController } +func (c *podSecurityPolicyTemplateController) Generic() controller.GenericController { + return c.GenericController +} + func (c *podSecurityPolicyTemplateController) Lister() PodSecurityPolicyTemplateLister { return &podSecurityPolicyTemplateLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go index e2ab96dd..0614e824 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go @@ -43,6 +43,7 @@ type PodSecurityPolicyTemplateProjectBindingLister interface { } type PodSecurityPolicyTemplateProjectBindingController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() PodSecurityPolicyTemplateProjectBindingLister AddHandler(name string, handler PodSecurityPolicyTemplateProjectBindingHandlerFunc) @@ -105,6 +106,10 @@ type podSecurityPolicyTemplateProjectBindingController struct { controller.GenericController } +func (c *podSecurityPolicyTemplateProjectBindingController) Generic() controller.GenericController { + return c.GenericController +} + func (c *podSecurityPolicyTemplateProjectBindingController) Lister() PodSecurityPolicyTemplateProjectBindingLister { return &podSecurityPolicyTemplateProjectBindingLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_preference_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_preference_controller.go index fdb33dbb..5e17cdce 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_preference_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_preference_controller.go @@ -43,6 +43,7 @@ type PreferenceLister interface { } type PreferenceController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() PreferenceLister AddHandler(name string, handler PreferenceHandlerFunc) @@ -105,6 +106,10 @@ type preferenceController struct { controller.GenericController } +func (c *preferenceController) Generic() controller.GenericController { + return c.GenericController +} + func (c *preferenceController) Lister() PreferenceLister { return &preferenceLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_principal_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_principal_controller.go index ea5c0443..f5cba481 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_principal_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_principal_controller.go @@ -42,6 +42,7 @@ type PrincipalLister interface { } type PrincipalController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() PrincipalLister AddHandler(name string, handler PrincipalHandlerFunc) @@ -104,6 +105,10 @@ type principalController struct { controller.GenericController } +func (c *principalController) Generic() controller.GenericController { + return c.GenericController +} + func (c *principalController) Lister() PrincipalLister { return &principalLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go index d9cf9f99..25125b3b 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go @@ -43,6 +43,7 @@ type ProjectAlertLister interface { } type ProjectAlertController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ProjectAlertLister AddHandler(name string, handler ProjectAlertHandlerFunc) @@ -105,6 +106,10 @@ type projectAlertController struct { controller.GenericController } +func (c *projectAlertController) Generic() controller.GenericController { + return c.GenericController +} + func (c *projectAlertController) Lister() ProjectAlertLister { return &projectAlertLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_controller.go index 680dd13e..7021c161 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_controller.go @@ -43,6 +43,7 @@ type ProjectLister interface { } type ProjectController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ProjectLister AddHandler(name string, handler ProjectHandlerFunc) @@ -105,6 +106,10 @@ type projectController struct { controller.GenericController } +func (c *projectController) Generic() controller.GenericController { + return c.GenericController +} + func (c *projectController) Lister() ProjectLister { return &projectLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go index e7839d44..5d712ba4 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go @@ -43,6 +43,7 @@ type ProjectLoggingLister interface { } type ProjectLoggingController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ProjectLoggingLister AddHandler(name string, handler ProjectLoggingHandlerFunc) @@ -105,6 +106,10 @@ type projectLoggingController struct { controller.GenericController } +func (c *projectLoggingController) Generic() controller.GenericController { + return c.GenericController +} + func (c *projectLoggingController) Lister() ProjectLoggingLister { return &projectLoggingLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go index 4b5e808a..4f8d1c8a 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go @@ -43,6 +43,7 @@ type ProjectNetworkPolicyLister interface { } type ProjectNetworkPolicyController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ProjectNetworkPolicyLister AddHandler(name string, handler ProjectNetworkPolicyHandlerFunc) @@ -105,6 +106,10 @@ type projectNetworkPolicyController struct { controller.GenericController } +func (c *projectNetworkPolicyController) Generic() controller.GenericController { + return c.GenericController +} + func (c *projectNetworkPolicyController) Lister() ProjectNetworkPolicyLister { return &projectNetworkPolicyLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go index c2ca6c60..45bad8c0 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go @@ -43,6 +43,7 @@ type ProjectRoleTemplateBindingLister interface { } type ProjectRoleTemplateBindingController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ProjectRoleTemplateBindingLister AddHandler(name string, handler ProjectRoleTemplateBindingHandlerFunc) @@ -105,6 +106,10 @@ type projectRoleTemplateBindingController struct { controller.GenericController } +func (c *projectRoleTemplateBindingController) Generic() controller.GenericController { + return c.GenericController +} + func (c *projectRoleTemplateBindingController) Lister() ProjectRoleTemplateBindingLister { return &projectRoleTemplateBindingLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_role_template_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_role_template_controller.go index 3c688c74..e36ecaca 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_role_template_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_role_template_controller.go @@ -42,6 +42,7 @@ type RoleTemplateLister interface { } type RoleTemplateController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() RoleTemplateLister AddHandler(name string, handler RoleTemplateHandlerFunc) @@ -104,6 +105,10 @@ type roleTemplateController struct { controller.GenericController } +func (c *roleTemplateController) Generic() controller.GenericController { + return c.GenericController +} + func (c *roleTemplateController) Lister() RoleTemplateLister { return &roleTemplateLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_setting_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_setting_controller.go index a528a8bb..8388c43d 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_setting_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_setting_controller.go @@ -42,6 +42,7 @@ type SettingLister interface { } type SettingController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() SettingLister AddHandler(name string, handler SettingHandlerFunc) @@ -104,6 +105,10 @@ type settingController struct { controller.GenericController } +func (c *settingController) Generic() controller.GenericController { + return c.GenericController +} + func (c *settingController) Lister() SettingLister { return &settingLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_content_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_content_controller.go index 604449da..ebc4a14c 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_content_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_content_controller.go @@ -42,6 +42,7 @@ type TemplateContentLister interface { } type TemplateContentController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() TemplateContentLister AddHandler(name string, handler TemplateContentHandlerFunc) @@ -104,6 +105,10 @@ type templateContentController struct { controller.GenericController } +func (c *templateContentController) Generic() controller.GenericController { + return c.GenericController +} + func (c *templateContentController) Lister() TemplateContentLister { return &templateContentLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_controller.go index 0511728f..79c4af9b 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_controller.go @@ -42,6 +42,7 @@ type TemplateLister interface { } type TemplateController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() TemplateLister AddHandler(name string, handler TemplateHandlerFunc) @@ -104,6 +105,10 @@ type templateController struct { controller.GenericController } +func (c *templateController) Generic() controller.GenericController { + return c.GenericController +} + func (c *templateController) Lister() TemplateLister { return &templateLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_version_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_version_controller.go index 9e447685..1aaec1d5 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_version_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_template_version_controller.go @@ -42,6 +42,7 @@ type TemplateVersionLister interface { } type TemplateVersionController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() TemplateVersionLister AddHandler(name string, handler TemplateVersionHandlerFunc) @@ -104,6 +105,10 @@ type templateVersionController struct { controller.GenericController } +func (c *templateVersionController) Generic() controller.GenericController { + return c.GenericController +} + func (c *templateVersionController) Lister() TemplateVersionLister { return &templateVersionLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_token_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_token_controller.go index 16df0178..ed4c1fd5 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_token_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_token_controller.go @@ -42,6 +42,7 @@ type TokenLister interface { } type TokenController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() TokenLister AddHandler(name string, handler TokenHandlerFunc) @@ -104,6 +105,10 @@ type tokenController struct { controller.GenericController } +func (c *tokenController) Generic() controller.GenericController { + return c.GenericController +} + func (c *tokenController) Lister() TokenLister { return &tokenLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_attribute_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_attribute_controller.go index b165babb..bfed1cb9 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_attribute_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_attribute_controller.go @@ -42,6 +42,7 @@ type UserAttributeLister interface { } type UserAttributeController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() UserAttributeLister AddHandler(name string, handler UserAttributeHandlerFunc) @@ -104,6 +105,10 @@ type userAttributeController struct { controller.GenericController } +func (c *userAttributeController) Generic() controller.GenericController { + return c.GenericController +} + func (c *userAttributeController) Lister() UserAttributeLister { return &userAttributeLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_controller.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_controller.go index b21df566..f791059a 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_controller.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_user_controller.go @@ -42,6 +42,7 @@ type UserLister interface { } type UserController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() UserLister AddHandler(name string, handler UserHandlerFunc) @@ -104,6 +105,10 @@ type userController struct { controller.GenericController } +func (c *userController) Generic() controller.GenericController { + return c.GenericController +} + func (c *userController) Lister() UserLister { return &userLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/pipeline_types.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/pipeline_types.go index 1056c4c9..3a909d03 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/pipeline_types.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/pipeline_types.go @@ -149,7 +149,7 @@ type PipelineSpec struct { TriggerWebhookTag bool `json:"triggerWebhookTag,omitempty" yaml:"triggerWebhookTag,omitempty"` RepositoryURL string `json:"repositoryUrl,omitempty" yaml:"repositoryUrl,omitempty"` - SourceCodeCredentialName string `json:"sourceCodeCredentialName,omitempty" yaml:"sourceCodeCredentialName,omitempty" norman:"type=reference[sourceCodeCredential]"` + SourceCodeCredentialName string `json:"sourceCodeCredentialName,omitempty" yaml:"sourceCodeCredentialName,omitempty" norman:"type=reference[sourceCodeCredential],noupdate"` } type PipelineConfig struct { @@ -336,12 +336,13 @@ type PipelineSystemImages struct { PluginsDocker string `json:"pluginsDocker,omitempty"` Minio string `json:"minio,omitempty"` Registry string `json:"registry,omitempty"` + RegistryProxy string `json:"registryProxy,omitempty"` KubeApply string `json:"kubeApply,omitempty"` } type GithubPipelineConfigApplyInput struct { InheritAuth bool `json:"inheritAuth,omitempty"` - GithubConfig GithubPipelineConfig `json:"githubConfig, omitempty"` + GithubConfig GithubPipelineConfig `json:"githubConfig,omitempty"` Code string `json:"code,omitempty"` } @@ -350,7 +351,7 @@ type GithubLoginInput struct { } type GitlabPipelineConfigApplyInput struct { - GitlabConfig GitlabPipelineConfig `json:"gitlabConfig, omitempty"` + GitlabConfig GitlabPipelineConfig `json:"gitlabConfig,omitempty"` Code string `json:"code,omitempty"` } diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_app_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_app_controller.go index fb67b623..6dfb716b 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_app_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_app_controller.go @@ -43,6 +43,7 @@ type AppLister interface { } type AppController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() AppLister AddHandler(name string, handler AppHandlerFunc) @@ -105,6 +106,10 @@ type appController struct { controller.GenericController } +func (c *appController) Generic() controller.GenericController { + return c.GenericController +} + func (c *appController) Lister() AppLister { return &appLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_app_revision_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_app_revision_controller.go index a66b400c..d3208544 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_app_revision_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_app_revision_controller.go @@ -43,6 +43,7 @@ type AppRevisionLister interface { } type AppRevisionController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() AppRevisionLister AddHandler(name string, handler AppRevisionHandlerFunc) @@ -105,6 +106,10 @@ type appRevisionController struct { controller.GenericController } +func (c *appRevisionController) Generic() controller.GenericController { + return c.GenericController +} + func (c *appRevisionController) Lister() AppRevisionLister { return &appRevisionLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go index 7d9794ed..b261d6d3 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go @@ -43,6 +43,7 @@ type BasicAuthLister interface { } type BasicAuthController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() BasicAuthLister AddHandler(name string, handler BasicAuthHandlerFunc) @@ -105,6 +106,10 @@ type basicAuthController struct { controller.GenericController } +func (c *basicAuthController) Generic() controller.GenericController { + return c.GenericController +} + func (c *basicAuthController) Lister() BasicAuthLister { return &basicAuthLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_certificate_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_certificate_controller.go index dea6b39a..f0db988b 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_certificate_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_certificate_controller.go @@ -43,6 +43,7 @@ type CertificateLister interface { } type CertificateController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() CertificateLister AddHandler(name string, handler CertificateHandlerFunc) @@ -105,6 +106,10 @@ type certificateController struct { controller.GenericController } +func (c *certificateController) Generic() controller.GenericController { + return c.GenericController +} + func (c *certificateController) Lister() CertificateLister { return &certificateLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go index b8678a0a..6587c6a3 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go @@ -43,6 +43,7 @@ type DockerCredentialLister interface { } type DockerCredentialController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() DockerCredentialLister AddHandler(name string, handler DockerCredentialHandlerFunc) @@ -105,6 +106,10 @@ type dockerCredentialController struct { controller.GenericController } +func (c *dockerCredentialController) Generic() controller.GenericController { + return c.GenericController +} + func (c *dockerCredentialController) Lister() DockerCredentialLister { return &dockerCredentialLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go index 9b293917..071fd194 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go @@ -43,6 +43,7 @@ type NamespacedBasicAuthLister interface { } type NamespacedBasicAuthController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() NamespacedBasicAuthLister AddHandler(name string, handler NamespacedBasicAuthHandlerFunc) @@ -105,6 +106,10 @@ type namespacedBasicAuthController struct { controller.GenericController } +func (c *namespacedBasicAuthController) Generic() controller.GenericController { + return c.GenericController +} + func (c *namespacedBasicAuthController) Lister() NamespacedBasicAuthLister { return &namespacedBasicAuthLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go index cf544669..f61995d0 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go @@ -43,6 +43,7 @@ type NamespacedCertificateLister interface { } type NamespacedCertificateController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() NamespacedCertificateLister AddHandler(name string, handler NamespacedCertificateHandlerFunc) @@ -105,6 +106,10 @@ type namespacedCertificateController struct { controller.GenericController } +func (c *namespacedCertificateController) Generic() controller.GenericController { + return c.GenericController +} + func (c *namespacedCertificateController) Lister() NamespacedCertificateLister { return &namespacedCertificateLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go index 37246069..99e1984f 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go @@ -43,6 +43,7 @@ type NamespacedDockerCredentialLister interface { } type NamespacedDockerCredentialController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() NamespacedDockerCredentialLister AddHandler(name string, handler NamespacedDockerCredentialHandlerFunc) @@ -105,6 +106,10 @@ type namespacedDockerCredentialController struct { controller.GenericController } +func (c *namespacedDockerCredentialController) Generic() controller.GenericController { + return c.GenericController +} + func (c *namespacedDockerCredentialController) Lister() NamespacedDockerCredentialLister { return &namespacedDockerCredentialLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go index 89d48d3c..7f53a756 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go @@ -43,6 +43,7 @@ type NamespacedServiceAccountTokenLister interface { } type NamespacedServiceAccountTokenController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() NamespacedServiceAccountTokenLister AddHandler(name string, handler NamespacedServiceAccountTokenHandlerFunc) @@ -105,6 +106,10 @@ type namespacedServiceAccountTokenController struct { controller.GenericController } +func (c *namespacedServiceAccountTokenController) Generic() controller.GenericController { + return c.GenericController +} + func (c *namespacedServiceAccountTokenController) Lister() NamespacedServiceAccountTokenLister { return &namespacedServiceAccountTokenLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go index b3498000..af86aad6 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go @@ -43,6 +43,7 @@ type NamespacedSSHAuthLister interface { } type NamespacedSSHAuthController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() NamespacedSSHAuthLister AddHandler(name string, handler NamespacedSSHAuthHandlerFunc) @@ -105,6 +106,10 @@ type namespacedSshAuthController struct { controller.GenericController } +func (c *namespacedSshAuthController) Generic() controller.GenericController { + return c.GenericController +} + func (c *namespacedSshAuthController) Lister() NamespacedSSHAuthLister { return &namespacedSshAuthLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go index 45d3b03b..6266bcf7 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go @@ -43,6 +43,7 @@ type PipelineLister interface { } type PipelineController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() PipelineLister AddHandler(name string, handler PipelineHandlerFunc) @@ -105,6 +106,10 @@ type pipelineController struct { controller.GenericController } +func (c *pipelineController) Generic() controller.GenericController { + return c.GenericController +} + func (c *pipelineController) Lister() PipelineLister { return &pipelineLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_execution_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_execution_controller.go index f8bb04c1..83d3e357 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_execution_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_execution_controller.go @@ -43,6 +43,7 @@ type PipelineExecutionLister interface { } type PipelineExecutionController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() PipelineExecutionLister AddHandler(name string, handler PipelineExecutionHandlerFunc) @@ -105,6 +106,10 @@ type pipelineExecutionController struct { controller.GenericController } +func (c *pipelineExecutionController) Generic() controller.GenericController { + return c.GenericController +} + func (c *pipelineExecutionController) Lister() PipelineExecutionLister { return &pipelineExecutionLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_setting_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_setting_controller.go index de57d1e3..199640e1 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_setting_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_pipeline_setting_controller.go @@ -43,6 +43,7 @@ type PipelineSettingLister interface { } type PipelineSettingController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() PipelineSettingLister AddHandler(name string, handler PipelineSettingHandlerFunc) @@ -105,6 +106,10 @@ type pipelineSettingController struct { controller.GenericController } +func (c *pipelineSettingController) Generic() controller.GenericController { + return c.GenericController +} + func (c *pipelineSettingController) Lister() PipelineSettingLister { return &pipelineSettingLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go index f24f4541..7896535e 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go @@ -43,6 +43,7 @@ type ServiceAccountTokenLister interface { } type ServiceAccountTokenController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() ServiceAccountTokenLister AddHandler(name string, handler ServiceAccountTokenHandlerFunc) @@ -105,6 +106,10 @@ type serviceAccountTokenController struct { controller.GenericController } +func (c *serviceAccountTokenController) Generic() controller.GenericController { + return c.GenericController +} + func (c *serviceAccountTokenController) Lister() ServiceAccountTokenLister { return &serviceAccountTokenLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_credential_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_credential_controller.go index f4c1be93..c1f5e9a1 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_credential_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_credential_controller.go @@ -43,6 +43,7 @@ type SourceCodeCredentialLister interface { } type SourceCodeCredentialController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() SourceCodeCredentialLister AddHandler(name string, handler SourceCodeCredentialHandlerFunc) @@ -105,6 +106,10 @@ type sourceCodeCredentialController struct { controller.GenericController } +func (c *sourceCodeCredentialController) Generic() controller.GenericController { + return c.GenericController +} + func (c *sourceCodeCredentialController) Lister() SourceCodeCredentialLister { return &sourceCodeCredentialLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_controller.go index 94ac38e4..86fbfa52 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_controller.go @@ -43,6 +43,7 @@ type SourceCodeProviderConfigLister interface { } type SourceCodeProviderConfigController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() SourceCodeProviderConfigLister AddHandler(name string, handler SourceCodeProviderConfigHandlerFunc) @@ -105,6 +106,10 @@ type sourceCodeProviderConfigController struct { controller.GenericController } +func (c *sourceCodeProviderConfigController) Generic() controller.GenericController { + return c.GenericController +} + func (c *sourceCodeProviderConfigController) Lister() SourceCodeProviderConfigLister { return &sourceCodeProviderConfigLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_provider_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_provider_controller.go index 1e998afa..7abc8f2f 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_provider_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_provider_controller.go @@ -42,6 +42,7 @@ type SourceCodeProviderLister interface { } type SourceCodeProviderController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() SourceCodeProviderLister AddHandler(name string, handler SourceCodeProviderHandlerFunc) @@ -104,6 +105,10 @@ type sourceCodeProviderController struct { controller.GenericController } +func (c *sourceCodeProviderController) Generic() controller.GenericController { + return c.GenericController +} + func (c *sourceCodeProviderController) Lister() SourceCodeProviderLister { return &sourceCodeProviderLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_repository_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_repository_controller.go index 5a5fd02e..acee39ca 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_repository_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_source_code_repository_controller.go @@ -43,6 +43,7 @@ type SourceCodeRepositoryLister interface { } type SourceCodeRepositoryController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() SourceCodeRepositoryLister AddHandler(name string, handler SourceCodeRepositoryHandlerFunc) @@ -105,6 +106,10 @@ type sourceCodeRepositoryController struct { controller.GenericController } +func (c *sourceCodeRepositoryController) Generic() controller.GenericController { + return c.GenericController +} + func (c *sourceCodeRepositoryController) Lister() SourceCodeRepositoryLister { return &sourceCodeRepositoryLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go index 51529806..a627f000 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go @@ -43,6 +43,7 @@ type SSHAuthLister interface { } type SSHAuthController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() SSHAuthLister AddHandler(name string, handler SSHAuthHandlerFunc) @@ -105,6 +106,10 @@ type sshAuthController struct { controller.GenericController } +func (c *sshAuthController) Generic() controller.GenericController { + return c.GenericController +} + func (c *sshAuthController) Lister() SSHAuthLister { return &sshAuthLister{ controller: c, diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_workload_controller.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_workload_controller.go index 738bda51..5a1ad065 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_workload_controller.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_workload_controller.go @@ -43,6 +43,7 @@ type WorkloadLister interface { } type WorkloadController interface { + Generic() controller.GenericController Informer() cache.SharedIndexInformer Lister() WorkloadLister AddHandler(name string, handler WorkloadHandlerFunc) @@ -105,6 +106,10 @@ type workloadController struct { controller.GenericController } +func (c *workloadController) Generic() controller.GenericController { + return c.GenericController +} + func (c *workloadController) Lister() WorkloadLister { return &workloadLister{ controller: c, diff --git a/vendor/github.com/rancher/types/go.mod b/vendor/github.com/rancher/types/go.mod new file mode 100644 index 00000000..1543ded8 --- /dev/null +++ b/vendor/github.com/rancher/types/go.mod @@ -0,0 +1,12 @@ +module github.com/rancher/types + +require ( + github.com/pkg/errors v0.8.0 + github.com/rancher/norman v0.0.0-20180925184916-d675dc79491f + github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2 + k8s.io/api v0.0.0-20180621150657-6c0bbc3e58fa + k8s.io/apiextensions-apiserver v0.0.0-20180621165922-80db67131e8d + k8s.io/apimachinery v0.0.0-20180619225948-e386b2658ed2 + k8s.io/client-go v2.0.0-alpha.0.0.20180621152933-b0722d92a7c1+incompatible + k8s.io/gengo v0.0.0-20180223161844-01a732e01d00 +) diff --git a/vendor/github.com/rancher/types/go.sum b/vendor/github.com/rancher/types/go.sum new file mode 100644 index 00000000..99d9679c --- /dev/null +++ b/vendor/github.com/rancher/types/go.sum @@ -0,0 +1,87 @@ +github.com/davecgh/go-spew v1.1.1-0.20170626231645-782f4967f2dc h1:NlbIJbqL8zjb55Vdrsr5uqyVC6/NoUUd2YrLojfE2zI= +github.com/davecgh/go-spew v1.1.1-0.20170626231645-782f4967f2dc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680 h1:ZktWZesgun21uEDrwW7iEV1zPCGQldM2atlJZ3TdvVM= +github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gogo/protobuf v0.0.0-20170330071051-c0656edd0d9e h1:ago6fNuQ6IhszPsXkeU7qRCyfsIX7L67WDybsAPkLl8= +github.com/gogo/protobuf v0.0.0-20170330071051-c0656edd0d9e/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20141105023935-44145f04b68c h1:CbdkBQ1/PiAo0FYJhQGwASD8wrgNvTdf01g6+O9tNuA= +github.com/golang/glog v0.0.0-20141105023935-44145f04b68c/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/protobuf v0.0.0-20171021043952-1643683e1b54 h1:nRNJXiJvemchkOTn0V4U11TZkvacB94gTzbTZbSA7Rw= +github.com/golang/protobuf v0.0.0-20171021043952-1643683e1b54/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367 h1:ScAXWS+TR6MZKex+7Z8rneuSJH+FSDqd6ocQyl+ZHo4= +github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d h1:7XGaL1e6bYS1yIonGp9761ExpPPV1ui0SAC59Yube9k= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/gorilla/websocket v0.0.0-20150714140627-6eb6ad425a89 h1:f3M+RTnIGEhCF8ynRezzgqxlQ+VBfer6kL61+4/W+v4= +github.com/gorilla/websocket v0.0.0-20150714140627-6eb6ad425a89/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/hashicorp/golang-lru v0.0.0-20160207214719-a0d98a5f2880 h1:OaRuzt9oCKNui8cCskZijoKUwe+aCuuCwvx1ox8FNyw= +github.com/hashicorp/golang-lru v0.0.0-20160207214719-a0d98a5f2880/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= +github.com/imdario/mergo v0.0.0-20141206190957-6633656539c1/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3 h1:/UewZcckqhvnnS0C6r3Sher2hSEbVmM6Ogpcjen08+Y= +github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/kr/pretty v0.0.0-20140812000539-f31442d60e51 h1:kGEU5h0EzkNa+B8Q3e0GlaIocJYB1G6ZpefcceXhfgc= +github.com/kr/pretty v0.0.0-20140812000539-f31442d60e51/go.mod h1:Bvhd+E3laJ0AVkG0c9rmtZcnhV0HQ3+c3YxxqTvc/gA= +github.com/kr/text v0.0.0-20130911015532-6807e777504f h1:JaNmHIV9Eby6srQVWuiQ6n8ko2o/lG6udSRCbFZe1fs= +github.com/kr/text v0.0.0-20130911015532-6807e777504f/go.mod h1:sjUstKUATFIcff4qlB53Kml0wQPtJVc/3fWrmuUmcfA= +github.com/maruel/panicparse v1.1.1/go.mod h1:nty42YY5QByNC5MM7q/nj938VbgPU7avs45z6NClpxI= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da h1:ZQGIPjr1iTtUPXZFk8WShqb5G+Qg65VHFLtSvmHh+Mw= +github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/onsi/ginkgo v1.2.1-0.20170318221715-67b9df7f55fe h1:d3gNxYlRvgsR9X/YxcYc0e0wsFAhC6u5zM51TC+o+EA= +github.com/onsi/ginkgo v1.2.1-0.20170318221715-67b9df7f55fe/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v0.0.0-20160911051023-d59fa0ac68bb h1:myDTJUQm/UVMeOHuw47rGP+3Id5b0s0T7EVl71ZweuI= +github.com/onsi/gomega v0.0.0-20160911051023-d59fa0ac68bb/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0 h1:GD+A8+e+wFkqje55/2fOVnZPkoDIu1VooBWfNrnY8Uo= +github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rancher/norman v0.0.0-20180925184916-d675dc79491f h1:HFqoOtSaJM2IV0W0MeqvmA0GUyWlO1AKQZm14K4GN8M= +github.com/rancher/norman v0.0.0-20180925184916-d675dc79491f/go.mod h1:RG+lnsTkAH0hpXtWUsBSmrgPrPccC2z6d7M1m/grjO0= +github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2 h1:a07zp0wovcAE2jH+wlD22JLqUH6Rdl8Aon+NiyPxE+0= +github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/stretchr/testify v1.1.5-0.20170601210322-f6abca593680 h1:oAXco1Ts88F75L1qvG3BAa4ChXI3EZDfxbB+p+y8+gE= +github.com/stretchr/testify v1.1.5-0.20170601210322-f6abca593680/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +golang.org/x/crypto v0.0.0-20170825220121-81e90905daef h1:R8ubLIilYRXIXpgjOg2l/ECVs3HzVKIjJEhxSsQ91u4= +golang.org/x/crypto v0.0.0-20170825220121-81e90905daef/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/net v0.0.0-20170809000501-1c05540f6879 h1:0rFa7EaCGdQPmZVbo9F7MNF65b8dyzS6EUnXjs9Cllk= +golang.org/x/net v0.0.0-20170809000501-1c05540f6879/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20171031081856-95c657629925 h1:nCH33NboKIsT4HoXBsXTWX8ul303HxWgkc5s2Ezwacg= +golang.org/x/sys v0.0.0-20171031081856-95c657629925/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.0.0-20170810154203-b19bf474d317 h1:WKW+OPdYPlvOTVGHuMfjnIC6yY2SI93yFB0pZ7giBmQ= +golang.org/x/text v0.0.0-20170810154203-b19bf474d317/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/time v0.0.0-20161028155119-f51c12702a4d h1:TnM+PKb3ylGmZvyPXmo9m/wktg7Jn/a/fNmr33HSj8g= +golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20170428054726-2382e3994d48 h1:Al/HKLBwsMBsWhxa71LOWO8MeCbD21L+x5rHb83JHjI= +golang.org/x/tools v0.0.0-20170428054726-2382e3994d48/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo= +gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/inf.v0 v0.9.0 h1:3zYtXIO92bvsdS3ggAdA8Gb4Azj0YU+TVY1uGYNFA8o= +gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= +gopkg.in/yaml.v2 v2.0.0-20170721113624-670d4cfef054 h1:ROF+R/wHHruzF40n5DfPv2jwm7rCJwvs8fz+RTZWjLE= +gopkg.in/yaml.v2 v2.0.0-20170721113624-670d4cfef054/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +k8s.io/api v0.0.0-20180621150657-6c0bbc3e58fa h1:FdiZyyrmQXY7AWCNUfAJrx9UCjMF/oBNZP8CmKoc2aU= +k8s.io/api v0.0.0-20180621150657-6c0bbc3e58fa/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= +k8s.io/apiextensions-apiserver v0.0.0-20180621165922-80db67131e8d h1:QYxqxjF8LG0fEp4lhpDj4zGXaO1EAbt97/3vqVL0dpk= +k8s.io/apiextensions-apiserver v0.0.0-20180621165922-80db67131e8d/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= +k8s.io/apimachinery v0.0.0-20180619225948-e386b2658ed2 h1:NJEj7o7SKxpURej3uJ1QZJZCeRlRj21EatnCK65nrB4= +k8s.io/apimachinery v0.0.0-20180619225948-e386b2658ed2/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= +k8s.io/client-go v2.0.0-alpha.0.0.20180621152933-b0722d92a7c1+incompatible h1:lph8g2o3QoQdw5W+fKHD/+Td4MEN2dmXgAjoOH5aISo= +k8s.io/client-go v2.0.0-alpha.0.0.20180621152933-b0722d92a7c1+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= +k8s.io/gengo v0.0.0-20180223161844-01a732e01d00 h1:vt4Sh/+HFnLoTScgFLNoMjNqOg0sQgAzViarcz+UX3Q= +k8s.io/gengo v0.0.0-20180223161844-01a732e01d00/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 h1:gW+EUB2I96nbxVenV/8ctfbACsHP+yxlT2dhMCsiy+s= +k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= +k8s.io/kubernetes v1.10.5/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= diff --git a/vendor/github.com/rancher/types/vendor.conf b/vendor/github.com/rancher/types/vendor.conf deleted file mode 100644 index 55cfe29c..00000000 --- a/vendor/github.com/rancher/types/vendor.conf +++ /dev/null @@ -1,8 +0,0 @@ -# package -github.com/rancher/types - -k8s.io/kubernetes v1.10.5 transitive=true,staging=true -bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git -golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5 - -github.com/rancher/norman 12c3f92bed31fe8f49f699aabecdc79725b08bb6