Merge pull request #41 from galal-hussein/ssh_key_per_host

Add ssh key and path per rke node

apis/cluster.cattle.io/v1/types.go

@@ -120,8 +120,6 @@ type RancherKubernetesEngineConfig struct {
 	Authentication AuthConfig `yaml:"auth" json:"auth,omitempty"`
 	// YAML manifest for user provided addons to be deployed on the cluster
 	Addons string `yaml:"addons" json:"addons,omitempty"`
-	// SSH Private Key Path
-	SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"`
 	// List of images used internally for proxy, cert downlaod and kubedns
 	RKEImages map[string]string `yaml:"rke_images" json:"rke_images,omitempty"`
 }
@@ -139,6 +137,10 @@ type RKEConfigNode struct {
 	User string `yaml:"user" json:"user,omitempty"`
 	// Optional - Docker socket on the node that will be used in tunneling
 	DockerSocket string `yaml:"docker_socket" json:"dockerSocket,omitempty"`
+	// SSH Private Key
+	SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty"`
+	// SSH Private Key Path
+	SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"`
 }
 
 type RKEConfigServices struct {

client/cluster/v1/zz_generated_rancher_kubernetes_engine_config.go

@@ -7,7 +7,6 @@ const (
 	RancherKubernetesEngineConfigFieldNetwork        = "network"
 	RancherKubernetesEngineConfigFieldNodes          = "nodes"
 	RancherKubernetesEngineConfigFieldRKEImages      = "rke_images"
-	RancherKubernetesEngineConfigFieldSSHKeyPath     = "sshKeyPath"
 	RancherKubernetesEngineConfigFieldServices       = "services"
 )
 
@@ -17,6 +16,5 @@ type RancherKubernetesEngineConfig struct {
 	Network        *NetworkConfig     `json:"network,omitempty"`
 	Nodes          []RKEConfigNode    `json:"nodes,omitempty"`
 	RKEImages      map[string]string  `json:"rke_images,omitempty"`
-	SSHKeyPath     string             `json:"sshKeyPath,omitempty"`
 	Services       *RKEConfigServices `json:"services,omitempty"`
 }

client/cluster/v1/zz_generated_rke_config_node.go

@@ -7,6 +7,8 @@ const (
 	RKEConfigNodeFieldHostnameOverride = "hostnameOverride"
 	RKEConfigNodeFieldInternalAddress  = "internalAddress"
 	RKEConfigNodeFieldRole             = "role"
+	RKEConfigNodeFieldSSHKey           = "sshKey"
+	RKEConfigNodeFieldSSHKeyPath       = "sshKeyPath"
 	RKEConfigNodeFieldUser             = "user"
 )
 
@@ -16,5 +18,7 @@ type RKEConfigNode struct {
 	HostnameOverride string   `json:"hostnameOverride,omitempty"`
 	InternalAddress  string   `json:"internalAddress,omitempty"`
 	Role             []string `json:"role,omitempty"`
+	SSHKey           string   `json:"sshKey,omitempty"`
+	SSHKeyPath       string   `json:"sshKeyPath,omitempty"`
 	User             string   `json:"user,omitempty"`
 }