rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-19 10:26:20 +00:00
Code Issues Releases Wiki Activity

Vendor update

Browse Source
This commit is contained in:
galal-hussein
2018-07-25 00:31:59 +02:00
committed by Alena Prokharchyk
parent b71fd3ba35
commit c161a56740
5 changed files with 79 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@@ -25,4 +25,4 @@ github.com/Microsoft/go-winio ab35fc04b6365e8fcb18e6e9e41ea4a02b10b17
github.com/go-ini/ini 06f5f3d67269ccec1fe5fe4134ba6e982984f7f5
github.com/rancher/norman c032c4611f2eec1652ef37d254f0e8ccf90c80aa
github.com/rancher/types 556fa1f61dfa7fb20b449a0fadf8d45e341acb9b
github.com/rancher/types 9898f6e9aa967559963ddf13e411e665456d1870

12
vendor/github.com/rancher/types/apis/management.cattle.io/v3/authn_types.go generated vendored
View File

@@ -285,10 +285,18 @@ type SamlConfig struct {
RancherAPIHost string `json:"rancherApiHost" norman:"required"`
}
type SamlConfigTestInput struct {
FinalRedirectURL string `json:"finalRedirectUrl"`
}
type SamlConfigTestOutput struct {
IdpRedirectURL string `json:"idpRedirectUrl"`
}
type PingConfig struct {
SamlConfig `json:",inline" mapstructure:",squash"`
}
type SamlConfigTestInput struct {
FinalRedirectURL string `json:"finalRedirectUrl"`
type ADFSConfig struct {
SamlConfig `json:",inline" mapstructure:",squash"`
}

8
vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go generated vendored
View File

@@ -111,7 +111,7 @@ var (
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.0"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
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"),
},
@@ -241,7 +241,7 @@ var (
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"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
@@ -293,7 +293,7 @@ var (
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.10.2-rancher2"),
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"),
},
@@ -334,7 +334,7 @@ var (
PluginsDocker: m("plugins/docker:17.12"),
},
LoggingSystemImages: LoggingSystemImages{
Fluentd: m("rancher/fluentd:v0.1.9"),
Fluentd: m("rancher/fluentd:v0.1.10"),
FluentdHelper: m("rancher/fluentd-helper:v0.1.2"),
LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.3"),
Elaticsearch: m("quay.io/pires/docker-elasticsearch-kubernetes:5.6.2"),

41
vendor/github.com/rancher/types/apis/management.cattle.io/v3/logging_types.go generated vendored
View File

@@ -98,23 +98,23 @@ type ElasticsearchConfig struct {
DateFormat string `json:"dateFormat,omitempty" norman:"required,type=enum,options=YYYY-MM-DD|YYYY-MM|YYYY,default=YYYY-MM-DD"`
AuthUserName string `json:"authUsername,omitempty"` //secret
AuthPassword string `json:"authPassword,omitempty"` //secret
Certificate string `json:"certificate"`
ClientCert string `json:"clientCert"`
ClientKey string `json:"clientKey"`
ClientKeyPass string `json:"clientKeyPass"`
SSLVerify bool `json:"sslVerify"`
Certificate string `json:"certificate,omitempty"`
ClientCert string `json:"clientCert,omitempty"`
ClientKey string `json:"clientKey,omitempty"`
ClientKeyPass string `json:"clientKeyPass,omitempty"`
SSLVerify bool `json:"sslVerify,omitempty"`
}
type SplunkConfig struct {
Endpoint string `json:"endpoint,omitempty" norman:"required"`
Source string `json:"source,omitempty"`
Token string `json:"token,omitempty" norman:"required"` //secret
Certificate string `json:"certificate"`
ClientCert string `json:"clientCert"`
ClientKey string `json:"clientKey"`
ClientKeyPass string `json:"clientKeyPass"`
SSLVerify bool `json:"sslVerify"`
Index string `json:"index"`
Certificate string `json:"certificate,omitempty"`
ClientCert string `json:"clientCert,omitempty"`
ClientKey string `json:"clientKey,omitempty"`
ClientKeyPass string `json:"clientKeyPass,omitempty"`
SSLVerify bool `json:"sslVerify,omitempty"`
Index string `json:"index,omitempty"`
}
type EmbeddedConfig struct {
@@ -132,16 +132,21 @@ type KafkaConfig struct {
ZookeeperEndpoint string `json:"zookeeperEndpoint,omitempty"`
BrokerEndpoints []string `json:"brokerEndpoints,omitempty"`
Topic string `json:"topic,omitempty" norman:"required"`
Certificate string `json:"certificate"`
ClientCert string `json:"clientCert"`
ClientKey string `json:"clientKey"`
Certificate string `json:"certificate,omitempty"`
ClientCert string `json:"clientCert,omitempty"`
ClientKey string `json:"clientKey,omitempty"`
}
type SyslogConfig struct {
Endpoint string `json:"endpoint,omitempty" norman:"required"`
Severity string `json:"severity,omitempty" norman:"default=notice,type=enum,options=emerg|alert|crit|err|warning|notice|info|debug"`
Program string `json:"program,omitempty"`
Protocol string `json:"protocol,omitempty" norman:"default=udp,type=enum,options=udp|tcp"`
Endpoint string `json:"endpoint,omitempty" norman:"required"`
Severity string `json:"severity,omitempty" norman:"default=notice,type=enum,options=emerg|alert|crit|err|warning|notice|info|debug"`
Program string `json:"program,omitempty"`
Protocol string `json:"protocol,omitempty" norman:"default=udp,type=enum,options=udp|tcp"`
Token string `json:"token,omitempty"`
Certificate string `json:"certificate,omitempty"`
ClientCert string `json:"clientCert,omitempty"`
ClientKey string `json:"clientKey,omitempty"`
SSLVerify bool `json:"sslVerify,omitempty"`
}
type LoggingSystemImages struct {

41
vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go generated vendored
View File

@@ -7,6 +7,31 @@ import (
version "k8s.io/apimachinery/pkg/version"
)
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ADFSConfig) DeepCopyInto(out *ADFSConfig) {
*out = *in
in.SamlConfig.DeepCopyInto(&out.SamlConfig)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ADFSConfig.
func (in *ADFSConfig) DeepCopy() *ADFSConfig {
if in == nil {
return nil
}
out := new(ADFSConfig)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *ADFSConfig) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSCloudProvider) DeepCopyInto(out *AWSCloudProvider) {
*out = *in
@@ -5713,6 +5738,22 @@ func (in *SamlConfigTestInput) DeepCopy() *SamlConfigTestInput {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *SamlConfigTestOutput) DeepCopyInto(out *SamlConfigTestOutput) {
*out = *in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SamlConfigTestOutput.
func (in *SamlConfigTestOutput) DeepCopy() *SamlConfigTestOutput {
if in == nil {
return nil
}
out := new(SamlConfigTestOutput)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *SchedulerService) DeepCopyInto(out *SchedulerService) {
*out = *in