From 09f41cd895a86fd9a4e0a603aa60fcdd2460c852 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Mon, 9 Apr 2018 20:20:26 +0200 Subject: [PATCH 1/3] Add default k8s directory config option --- 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 5b2f7608..795b81a4 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -33,6 +33,8 @@ type RancherKubernetesEngineConfig struct { ClusterName string `yaml:"cluster_name" json:"clusterName,omitempty"` // Cloud Provider options CloudProvider CloudProvider `yaml:"cloud_provider" json:"cloudProvider,omitempty"` + // kubernetes directory path + K8sDirPath string `yaml:"k8s_dir_path" json:"k8sDirPath,omitempty"` } type PrivateRegistry struct { From 4387b086b6132909bb4f83bad68a6461202f1414 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Mon, 9 Apr 2018 22:32:38 +0200 Subject: [PATCH 2/3] Add default k8s directory config option --- apis/management.cattle.io/v3/rke_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 795b81a4..0eb3a671 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -34,7 +34,7 @@ type RancherKubernetesEngineConfig struct { // Cloud Provider options CloudProvider CloudProvider `yaml:"cloud_provider" json:"cloudProvider,omitempty"` // kubernetes directory path - K8sDirPath string `yaml:"k8s_dir_path" json:"k8sDirPath,omitempty"` + KubernetesDirPath string `yaml:"kubernetes_dir_path" json:"kubernetesDirPath,omitempty"` } type PrivateRegistry struct { From 30de675a18d3e95b6deedae2f5288f4c85853cc5 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Mon, 9 Apr 2018 22:32:46 +0200 Subject: [PATCH 3/3] go generate --- .../v3/zz_generated_rancher_kubernetes_engine_config.go | 2 ++ 1 file changed, 2 insertions(+) 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 1e9c0872..ef49af9c 100644 --- a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go +++ b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go @@ -10,6 +10,7 @@ const ( RancherKubernetesEngineConfigFieldClusterName = "clusterName" RancherKubernetesEngineConfigFieldIgnoreDockerVersion = "ignoreDockerVersion" RancherKubernetesEngineConfigFieldIngress = "ingress" + RancherKubernetesEngineConfigFieldKubernetesDirPath = "kubernetesDirPath" RancherKubernetesEngineConfigFieldNetwork = "network" RancherKubernetesEngineConfigFieldNodes = "nodes" RancherKubernetesEngineConfigFieldPrivateRegistries = "privateRegistries" @@ -28,6 +29,7 @@ type RancherKubernetesEngineConfig struct { ClusterName string `json:"clusterName,omitempty" yaml:"clusterName,omitempty"` IgnoreDockerVersion bool `json:"ignoreDockerVersion,omitempty" yaml:"ignoreDockerVersion,omitempty"` Ingress *IngressConfig `json:"ingress,omitempty" yaml:"ingress,omitempty"` + KubernetesDirPath string `json:"kubernetesDirPath,omitempty" yaml:"kubernetesDirPath,omitempty"` Network *NetworkConfig `json:"network,omitempty" yaml:"network,omitempty"` Nodes []RKEConfigNode `json:"nodes,omitempty" yaml:"nodes,omitempty"` PrivateRegistries []PrivateRegistry `json:"privateRegistries,omitempty" yaml:"privateRegistries,omitempty"`