rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-06-29 06:56:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #289 from dahendel/addons_include

Browse Source 
Adding support for urls and paths for addons
This commit is contained in:
Alena Prokharchyk 2018-03-21 11:06:35 -07:00 committed by GitHub
commit c45cf4584e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/management.cattle.io/v3/rke_types.go
View File

@ -11,6 +11,8 @@ type RancherKubernetesEngineConfig struct {
Authentication AuthnConfig `yaml:"authentication" json:"authentication,omitempty"`
// YAML manifest for user provided addons to be deployed on the cluster
Addons string `yaml:"addons" json:"addons,omitempty"`
// List of urls or paths for addons
AddonsInclude []string `yaml:"addons_include" json:"addonsInclude,omitempty"`
// List of images used internally for proxy, cert downlaod and kubedns
SystemImages RKESystemImages `yaml:"system_images" json:"systemImages,omitempty"`
// SSH Private Key Path

5
apis/management.cattle.io/v3/zz_generated_deepcopy.go
View File

@ -5242,6 +5242,11 @@ func (in *RancherKubernetesEngineConfig) DeepCopyInto(out *RancherKubernetesEngi
in.Services.DeepCopyInto(&out.Services)
in.Network.DeepCopyInto(&out.Network)
in.Authentication.DeepCopyInto(&out.Authentication)
if in.AddonsInclude != nil {
in, out := &in.AddonsInclude, &out.AddonsInclude
*out = make([]string, len(*in))
copy(*out, *in)
}
out.SystemImages = in.SystemImages
in.Authorization.DeepCopyInto(&out.Authorization)
if in.PrivateRegistries != nil {

2
client/management/v3/zz_generated_rancher_kubernetes_engine_config.go
View File

@ -3,6 +3,7 @@ package client
const (
RancherKubernetesEngineConfigType = "rancherKubernetesEngineConfig"
RancherKubernetesEngineConfigFieldAddons = "addons"
RancherKubernetesEngineConfigFieldAddonsInclude = "addonsInclude"
RancherKubernetesEngineConfigFieldAuthentication = "authentication"
RancherKubernetesEngineConfigFieldAuthorization = "authorization"
RancherKubernetesEngineConfigFieldIgnoreDockerVersion = "ignoreDockerVersion"
@ -18,6 +19,7 @@ const (
type RancherKubernetesEngineConfig struct {
Addons string `json:"addons,omitempty" yaml:"addons,omitempty"`
AddonsInclude []string `json:"addonsInclude,omitempty" yaml:"addonsInclude,omitempty"`
Authentication *AuthnConfig `json:"authentication,omitempty" yaml:"authentication,omitempty"`
Authorization *AuthzConfig `json:"authorization,omitempty" yaml:"authorization,omitempty"`
IgnoreDockerVersion bool `json:"ignoreDockerVersion,omitempty" yaml:"ignoreDockerVersion,omitempty"`