From 28cee001e4b69db11e434af283029db89c53cdd1 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Thu, 12 Apr 2018 00:20:37 +0200 Subject: [PATCH 1/3] Replace config dir with path prefix --- 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 68468584..5ff88b93 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 - KubernetesDirPath string `yaml:"kubernetes_dir_path" json:"kubernetesDirPath,omitempty"` + PrefixPath string `yaml:"prefix_path" json:"prefix_path,omitempty"` } type PrivateRegistry struct { From a9b206bf5d80167b6c8adab36fcedfe16202c3e6 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Thu, 12 Apr 2018 00:28:01 +0200 Subject: [PATCH 2/3] Replace config dir with path prefix --- 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 5ff88b93..0103952d 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 - PrefixPath string `yaml:"prefix_path" json:"prefix_path,omitempty"` + PrefixPath string `yaml:"prefix_path" json:"prefixPath,omitempty"` } type PrivateRegistry struct { From 454ca72589ab5e21404aa55afc03b02ab9071a60 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Thu, 12 Apr 2018 00:28:06 +0200 Subject: [PATCH 3/3] Replace config dir with path prefix --- .../v3/zz_generated_rancher_kubernetes_engine_config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ef49af9c..f6410953 100644 --- a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go +++ b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go @@ -10,9 +10,9 @@ const ( RancherKubernetesEngineConfigFieldClusterName = "clusterName" RancherKubernetesEngineConfigFieldIgnoreDockerVersion = "ignoreDockerVersion" RancherKubernetesEngineConfigFieldIngress = "ingress" - RancherKubernetesEngineConfigFieldKubernetesDirPath = "kubernetesDirPath" RancherKubernetesEngineConfigFieldNetwork = "network" RancherKubernetesEngineConfigFieldNodes = "nodes" + RancherKubernetesEngineConfigFieldPrefixPath = "prefixPath" RancherKubernetesEngineConfigFieldPrivateRegistries = "privateRegistries" RancherKubernetesEngineConfigFieldSSHAgentAuth = "sshAgentAuth" RancherKubernetesEngineConfigFieldSSHKeyPath = "sshKeyPath" @@ -29,9 +29,9 @@ 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"` + PrefixPath string `json:"prefixPath,omitempty" yaml:"prefixPath,omitempty"` PrivateRegistries []PrivateRegistry `json:"privateRegistries,omitempty" yaml:"privateRegistries,omitempty"` SSHAgentAuth bool `json:"sshAgentAuth,omitempty" yaml:"sshAgentAuth,omitempty"` SSHKeyPath string `json:"sshKeyPath,omitempty" yaml:"sshKeyPath,omitempty"`