1
0
mirror of https://github.com/rancher/types.git synced 2025-08-24 15:08:37 +00:00

Merge pull request #365 from galal-hussein/use_prefixpath

Replace kubernetes dir path with prefix path
This commit is contained in:
Alena Prokharchyk 2018-04-11 15:31:05 -07:00 committed by GitHub
commit 574e26d2fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -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:"prefixPath,omitempty"`
}
type PrivateRegistry struct {

View File

@ -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"`