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

Added extra_args type map[string]string to ingress-controller. Added rancher-minimal-ssl.yml and rancher-minimal-passthrough.yml to deploy rancher v2.0 using rke. Updated README.md

Browse Source
This commit is contained in:
rawmind0
2018-04-13 18:06:09 +02:00
committed by Darren Shepherd
parent b3f457426c
commit 14c239c598
13 changed files with 305 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,16 +52,17 @@ type Cluster struct {
}
type ClusterSpec struct {
DisplayName string `json:"displayName"`
Description string `json:"description"`
Internal bool `json:"internal" norman:"nocreate,noupdate"`
DesiredAgentImage string `json:"desiredAgentImage"`
ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" norman:"nocreate,noupdate"`
GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"`
AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty"`
RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty"`
DefaultPodSecurityPolicyTemplateName string `json:"defaultPodSecurityPolicyTemplateName,omitempty" norman:"type=reference[podSecurityPolicyTemplate]"`
DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" norman:"type=reference[roleTemplate]"`
DisplayName string `json:"displayName"`
Description string `json:"description"`
Internal bool `json:"internal" norman:"nocreate,noupdate"`
DesiredAgentImage string `json:"desiredAgentImage"`
ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" norman:"nocreate,noupdate"`
GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"`
AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty"`
RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty"`
AmazonElasticContainerServiceConfig *AmazonElasticContainerServiceConfig `json:"amazonElasticContainerServiceConfig,omitempty"`
DefaultPodSecurityPolicyTemplateName string `json:"defaultPodSecurityPolicyTemplateName,omitempty" norman:"type=reference[podSecurityPolicyTemplate]"`
DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" norman:"type=reference[roleTemplate]"`
}
type ImportedConfig struct {
@@ -193,6 +194,11 @@ type AzureKubernetesServiceConfig struct {
ClientSecret string `json:"clientSecret,omitempty" norman:"required,type=password"`
}
type AmazonElasticContainerServiceConfig struct {
AccessKey string `json:"accessKey" norman:"required"`
SecretKey string `json:"secretKey" norman:"required,type=password"`
}
type ClusterEvent struct {
types.Namespaced
v1.Event

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

@@ -43,11 +43,12 @@ var (
PluginsDocker: "plugins/docker",
},
LoggingSystemImages: LoggingSystemImages{
Fluentd: "rancher/fluentd:v0.1.4",
FluentdHelper: "rancher/fluentd-helper:v0.1.1",
Elaticsearch: "rancher/docker-elasticsearch-kubernetes:5.6.2",
Kibana: "kibana:5.6.4",
Busybox: "busybox",
Fluentd: "rancher/fluentd:v0.1.6",
FluentdHelper: "rancher/fluentd-helper:v0.1.2",
LogAggregatorFlexVolumeDriver: "rancher/log-aggregator:v0.1.2",
Elaticsearch: "rancher/docker-elasticsearch-kubernetes:5.6.2",
Kibana: "kibana:5.6.4",
Busybox: "busybox",
},
}

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

@@ -125,9 +125,10 @@ type SyslogConfig struct {
}
type LoggingSystemImages struct {
Fluentd string `json:"fluentd,omitempty"`
FluentdHelper string `json:"fluentdHelper,omitempty"`
Elaticsearch string `json:"elaticsearch,omitempty"`
Kibana string `json:"kibana,omitempty"`
Busybox string `json:"busybox,omitempty"`
Fluentd string `json:"fluentd,omitempty"`
FluentdHelper string `json:"fluentdHelper,omitempty"`
Elaticsearch string `json:"elaticsearch,omitempty"`
Kibana string `json:"kibana,omitempty"`
Busybox string `json:"busybox,omitempty"`
LogAggregatorFlexVolumeDriver string `json:"logAggregatorFlexVolumeDriver,omitempty"`
}

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

@@ -72,6 +72,28 @@ type NodeStatus struct {
NodeAnnotations map[string]string `json:"nodeAnnotations,omitempty"`
NodeLabels map[string]string `json:"nodeLabels,omitempty"`
NodeTaints []v1.Taint `json:"nodeTaints,omitempty"`
DockerInfo *DockerInfo `json:"dockerInfo,omitempty"`
}
type DockerInfo struct {
ID string
Driver string
Debug bool
LoggingDriver string
CgroupDriver string
KernelVersion string
OperatingSystem string
OSType string
Architecture string
IndexServerAddress string
DockerRootDir string
HTTPProxy string
HTTPSProxy string
NoProxy string
Name string
Labels []string
ExperimentalBuild bool
ServerVersion string
}
var (

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

@@ -250,6 +250,8 @@ type IngressConfig struct {
Options map[string]string `yaml:"options" json:"options,omitempty"`
// NodeSelector key pair
NodeSelector map[string]string `yaml:"node_selector" json:"nodeSelector,omitempty"`
// Ingress controller extra arguments
ExtraArgs map[string]string `yaml:"extra_args" json:"extraArgs,omitempty"`
}
type RKEPlan struct {

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

@@ -48,6 +48,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
in.(*AlertSystemImages).DeepCopyInto(out.(*AlertSystemImages))
return nil
}, InType: reflect.TypeOf(&AlertSystemImages{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*AmazonElasticContainerServiceConfig).DeepCopyInto(out.(*AmazonElasticContainerServiceConfig))
return nil
}, InType: reflect.TypeOf(&AmazonElasticContainerServiceConfig{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*AuthAppInput).DeepCopyInto(out.(*AuthAppInput))
return nil
@@ -248,6 +252,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
in.(*CustomConfig).DeepCopyInto(out.(*CustomConfig))
return nil
}, InType: reflect.TypeOf(&CustomConfig{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*DockerInfo).DeepCopyInto(out.(*DockerInfo))
return nil
}, InType: reflect.TypeOf(&DockerInfo{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*DynamicSchema).DeepCopyInto(out.(*DynamicSchema))
return nil
@@ -1062,6 +1070,22 @@ func (in *AlertSystemImages) DeepCopy() *AlertSystemImages {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AmazonElasticContainerServiceConfig) DeepCopyInto(out *AmazonElasticContainerServiceConfig) {
*out = *in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AmazonElasticContainerServiceConfig.
func (in *AmazonElasticContainerServiceConfig) DeepCopy() *AmazonElasticContainerServiceConfig {
if in == nil {
return nil
}
out := new(AmazonElasticContainerServiceConfig)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AuthAppInput) DeepCopyInto(out *AuthAppInput) {
*out = *in
@@ -2231,6 +2255,15 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
(*in).DeepCopyInto(*out)
}
}
if in.AmazonElasticContainerServiceConfig != nil {
in, out := &in.AmazonElasticContainerServiceConfig, &out.AmazonElasticContainerServiceConfig
if *in == nil {
*out = nil
} else {
*out = new(AmazonElasticContainerServiceConfig)
**out = **in
}
}
return
}
@@ -2404,6 +2437,27 @@ func (in *CustomConfig) DeepCopy() *CustomConfig {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DockerInfo) DeepCopyInto(out *DockerInfo) {
*out = *in
if in.Labels != nil {
in, out := &in.Labels, &out.Labels
*out = make([]string, len(*in))
copy(*out, *in)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerInfo.
func (in *DockerInfo) DeepCopy() *DockerInfo {
if in == nil {
return nil
}
out := new(DockerInfo)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DynamicSchema) DeepCopyInto(out *DynamicSchema) {
*out = *in
@@ -3162,6 +3216,13 @@ func (in *IngressConfig) DeepCopyInto(out *IngressConfig) {
(*out)[key] = val
}
}
if in.ExtraArgs != nil {
in, out := &in.ExtraArgs, &out.ExtraArgs
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
return
}
@@ -4065,6 +4126,15 @@ func (in *NodeStatus) DeepCopyInto(out *NodeStatus) {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
if in.DockerInfo != nil {
in, out := &in.DockerInfo, &out.DockerInfo
if *in == nil {
*out = nil
} else {
*out = new(DockerInfo)
(*in).DeepCopyInto(*out)
}
}
return
}