Rename SSHConfig to NodeGroupSSH

eksctl-io · Apr 8, 2019 · 5a7df58 · 5a7df58
1 parent 92ce14d
commit 5a7df58
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/pkg/apis/eksctl.io/v1alpha4/defaults.go b/pkg/apis/eksctl.io/v1alpha4/defaults.go
@@ -25,7 +25,7 @@ func SetNodeGroupDefaults(_ int, ng *NodeGroup) error {
 	}
 
 	if ng.SSH == nil {
-		ng.SSH = &SSHConfig{
+		ng.SSH = &NodeGroupSSH{
 			Allow: NewBoolFalse(),
 		}
 	}

diff --git a/pkg/apis/eksctl.io/v1alpha4/defaults_test.go b/pkg/apis/eksctl.io/v1alpha4/defaults_test.go
@@ -14,7 +14,7 @@ var _ = Describe("Default settings", func() {
 
 		It("Providing an SSH key enables SSH", func() {
 			testNodeGroup := NodeGroup{
-				SSH: &SSHConfig{
+				SSH: &NodeGroupSSH{
 					Allow:         NewBoolFalse(),
 					PublicKeyPath: &testKeyPath,
 				},
@@ -27,7 +27,7 @@ var _ = Describe("Default settings", func() {
 
 		It("Enabling SSH without a key uses default key", func() {
 			testNodeGroup := NodeGroup{
-				SSH: &SSHConfig{
+				SSH: &NodeGroupSSH{
 					Allow: NewBoolTrue(),
 				},
 			}

diff --git a/pkg/apis/eksctl.io/v1alpha4/types.go b/pkg/apis/eksctl.io/v1alpha4/types.go
@@ -336,7 +336,7 @@ func (c *ClusterConfig) NewNodeGroup() *NodeGroup {
 				ALBIngress:   NewBoolFalse(),
 			},
 		},
-		SSH: &SSHConfig{
+		SSH: &NodeGroupSSH{
 			Allow:         NewBoolFalse(),
 			PublicKeyPath: &DefaultNodeSSHPublicKeyPath,
 		},
@@ -387,7 +387,7 @@ type NodeGroup struct {
 	// +optional
 	Taints map[string]string `json:"taints,omitempty"`
 
-	SSH *SSHConfig `json:"ssh"`
+	SSH *NodeGroupSSH `json:"ssh"`
 
 	// +optional
 	IAM *NodeGroupIAM `json:"iam"`
@@ -451,8 +451,8 @@ type (
 		ALBIngress *bool `json:"albIngress"`
 	}
 
-	// SSHConfig holds all the ssh access configuration to a NodeGroup
-	SSHConfig struct {
+	// NodeGroupSSH holds all the ssh access configuration to a NodeGroup
+	NodeGroupSSH struct {
 		// +optional
 		Allow *bool `json:"allow"`
 		// +optional

diff --git a/pkg/apis/eksctl.io/v1alpha4/zz_generated.deepcopy.go b/pkg/apis/eksctl.io/v1alpha4/zz_generated.deepcopy.go
diff --git a/pkg/cfn/builder/api_test.go b/pkg/cfn/builder/api_test.go
@@ -349,7 +349,7 @@ var _ = Describe("CloudFormation template builder API", func() {
 							ALBIngress:   api.NewBoolFalse(),
 						},
 					},
-					SSH: &api.SSHConfig{
+					SSH: &api.NodeGroupSSH{
 						Allow:         api.NewBoolFalse(),
 						PublicKeyPath: &defaultSSHKeyPath,
 					},

diff --git a/pkg/utils/kubeconfig/kubeconfig_test.go b/pkg/utils/kubeconfig/kubeconfig_test.go
@@ -145,7 +145,7 @@ var _ = Describe("Kubeconfig", func() {
 					InstanceType:      "m5.large",
 					AvailabilityZones: []string{"us-west-2b", "us-west-2a", "us-west-2c"},
 					PrivateNetworking: false,
-					SSH: &eksctlapi.SSHConfig{
+					SSH: &eksctlapi.NodeGroupSSH{
 						Allow:         eksctlapi.NewBoolFalse(),
 						PublicKeyPath: &exampleSSHKeyPath,
 						PublicKey:     []uint8(nil),