rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-04 16:30:02 +00:00
Code Issues Releases Wiki Activity

Vendor Update

Browse Source
This commit is contained in:
galal-hussein
2018-12-21 00:01:50 +02:00
committed by Alena Prokharchyk
parent 3c6c7f1b7b
commit 30d8c8a30f
5 changed files with 87 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,12 +78,12 @@ var (
PipelineSystemImages: projectv3.PipelineSystemImages{
Jenkins: m("rancher/pipeline-jenkins-server:v0.1.0"),
JenkinsJnlp: m("jenkins/jnlp-slave:3.10-1-alpine"),
AlpineGit: m("rancher/pipeline-tools:v0.1.0"),
AlpineGit: m("rancher/pipeline-tools:v0.1.2"),
PluginsDocker: m("plugins/docker:17.12"),
Minio: m("minio/minio:RELEASE.2018-05-25T19-49-13Z"),
Registry: m("registry:2"),
RegistryProxy: m("rancher/pipeline-tools:v0.1.0"),
KubeApply: m("rancher/pipeline-tools:v0.1.0"),
RegistryProxy: m("rancher/pipeline-tools:v0.1.2"),
KubeApply: m("rancher/pipeline-tools:v0.1.2"),
},
LoggingSystemImages: LoggingSystemImages{
Fluentd: m("rancher/fluentd:v0.1.11"),
@@ -579,10 +579,10 @@ var (
"v1.11.6-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.18"),
Kubernetes: m("rancher/hyperkube:v1.11.6-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.16"),
NginxProxy: m("rancher/rke-tools:v0.1.16"),
CertDownloader: m("rancher/rke-tools:v0.1.16"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16"),
Alpine: m("rancher/rke-tools:v0.1.18"),
NginxProxy: m("rancher/rke-tools:v0.1.18"),
CertDownloader: m("rancher/rke-tools:v0.1.18"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.18"),
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"),
@@ -657,10 +657,10 @@ var (
"v1.12.3-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.12.3-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.16"),
NginxProxy: m("rancher/rke-tools:v0.1.16"),
CertDownloader: m("rancher/rke-tools:v0.1.16"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16"),
Alpine: m("rancher/rke-tools:v0.1.18"),
NginxProxy: m("rancher/rke-tools:v0.1.18"),
CertDownloader: m("rancher/rke-tools:v0.1.18"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.18"),
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"),

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

@@ -42,7 +42,7 @@ type RancherKubernetesEngineConfig struct {
// Monitoring Config
Monitoring MonitoringConfig `yaml:"monitoring" json:"monitoring,omitempty"`
// Rotating Certificates Option
RotateCertificates *RotateCertificates `yaml:"-" json:"rotateCertificates,omitempty"`
RotateCertificates *RotateCertificates `yaml:"rotate_certificates,omitempty" json:"rotateCertificates,omitempty"`
}
type BastionHost struct {

28
vendor/github.com/rancher/types/apis/project.cattle.io/v3/pipeline_types.go generated vendored
View File

@@ -226,10 +226,12 @@ type Stage struct {
}
type Step struct {
SourceCodeConfig *SourceCodeConfig `json:"sourceCodeConfig,omitempty" yaml:"sourceCodeConfig,omitempty"`
RunScriptConfig *RunScriptConfig `json:"runScriptConfig,omitempty" yaml:"runScriptConfig,omitempty"`
PublishImageConfig *PublishImageConfig `json:"publishImageConfig,omitempty" yaml:"publishImageConfig,omitempty"`
ApplyYamlConfig *ApplyYamlConfig `json:"applyYamlConfig,omitempty" yaml:"applyYamlConfig,omitempty"`
SourceCodeConfig *SourceCodeConfig `json:"sourceCodeConfig,omitempty" yaml:"sourceCodeConfig,omitempty"`
RunScriptConfig *RunScriptConfig `json:"runScriptConfig,omitempty" yaml:"runScriptConfig,omitempty"`
PublishImageConfig *PublishImageConfig `json:"publishImageConfig,omitempty" yaml:"publishImageConfig,omitempty"`
ApplyYamlConfig *ApplyYamlConfig `json:"applyYamlConfig,omitempty" yaml:"applyYamlConfig,omitempty"`
PublishCatalogConfig *PublishCatalogConfig `json:"publishCatalogConfig,omitempty" yaml:"publishCatalogConfig,omitempty"`
ApplyAppConfig *ApplyAppConfig `json:"applyAppConfig,omitempty" yaml:"applyAppConfig,omitempty"`
Env map[string]string `json:"env,omitempty" yaml:"env,omitempty"`
EnvFrom []EnvFrom `json:"envFrom,omitempty" yaml:"envFrom,omitempty"`
@@ -269,6 +271,24 @@ type ApplyYamlConfig struct {
Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
}
type PublishCatalogConfig struct {
Path string `json:"path,omitempty" yaml:"path,omitempty"`
Catalog string `json:"catalog,omitempty" yaml:"catalog,omitempty"`
Version string `json:"version,omitempty" yaml:"version,omitempty"`
GitURL string `json:"gitUrl,omitempty" yaml:"gitUrl,omitempty"`
GitBranch string `json:"gitBranch,omitempty" yaml:"gitBranch,omitempty"`
GitAuthor string `json:"gitAuthor,omitempty" yaml:"gitAuthor,omitempty"`
GitEmail string `json:"gitEmail,omitempty" yaml:"gitEmail,omitempty"`
}
type ApplyAppConfig struct {
Catalog string `json:"catalog,omitempty" yaml:"catalog,omitempty"`
Version string `json:"version,omitempty" yaml:"version,omitempty"`
Answers map[string]string `json:"answers,omitempty" yaml:"answers,omitempty"`
Name string `json:"name,omitempty" yaml:"name,omitempty"`
TargetNamespace string `json:"targetNamespace,omitempty" yaml:"targetNamespace,omitempty"`
}
type PipelineExecutionSpec struct {
ProjectName string `json:"projectName" yaml:"projectName" norman:"required,type=reference[project]"`

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

@@ -264,6 +264,29 @@ func (in *AppUpgradeConfig) DeepCopy() *AppUpgradeConfig {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ApplyAppConfig) DeepCopyInto(out *ApplyAppConfig) {
*out = *in
if in.Answers != nil {
in, out := &in.Answers, &out.Answers
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplyAppConfig.
func (in *ApplyAppConfig) DeepCopy() *ApplyAppConfig {
if in == nil {
return nil
}
out := new(ApplyAppConfig)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ApplyYamlConfig) DeepCopyInto(out *ApplyYamlConfig) {
*out = *in
@@ -1628,6 +1651,22 @@ func (in *PublicEndpoint) DeepCopy() *PublicEndpoint {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *PublishCatalogConfig) DeepCopyInto(out *PublishCatalogConfig) {
*out = *in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PublishCatalogConfig.
func (in *PublishCatalogConfig) DeepCopy() *PublishCatalogConfig {
if in == nil {
return nil
}
out := new(PublishCatalogConfig)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *PublishImageConfig) DeepCopyInto(out *PublishImageConfig) {
*out = *in
@@ -2279,6 +2318,16 @@ func (in *Step) DeepCopyInto(out *Step) {
*out = new(ApplyYamlConfig)
**out = **in
}
if in.PublishCatalogConfig != nil {
in, out := &in.PublishCatalogConfig, &out.PublishCatalogConfig
*out = new(PublishCatalogConfig)
**out = **in
}
if in.ApplyAppConfig != nil {
in, out := &in.ApplyAppConfig, &out.ApplyAppConfig
*out = new(ApplyAppConfig)
(*in).DeepCopyInto(*out)
}
if in.Env != nil {
in, out := &in.Env, &out.Env
*out = make(map[string]string, len(*in))