From 485e732e63d5394282dc2cdd6432df6a214e4d20 Mon Sep 17 00:00:00 2001 From: dhendel Date: Wed, 14 Mar 2018 14:36:52 -0500 Subject: [PATCH 1/2] Adding AddonsInclude for rke types RancherKubernetesEngineConfig --- apis/management.cattle.io/v3/rke_types.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index a21d65ef..bebdd768 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -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 From 634e625c5f1e42bd7bdc3454ef0f1352f9a73415 Mon Sep 17 00:00:00 2001 From: dhendel Date: Tue, 20 Mar 2018 09:17:54 -0500 Subject: [PATCH 2/2] go generate --- apis/management.cattle.io/v3/zz_generated_deepcopy.go | 5 +++++ .../v3/zz_generated_rancher_kubernetes_engine_config.go | 2 ++ 2 files changed, 7 insertions(+) diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index a763ce0a..7543df4f 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -4994,6 +4994,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 { diff --git a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go index 50b7d2de..b4feba8c 100644 --- a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go +++ b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go @@ -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"`