Merge pull request #60 from ethanwinograd/node_port_rebased

added optional nodeport variable
upmc-enterprises · Jun 29, 2017 · 342d0a3 · 342d0a3
2 parents 3492374 + 71bf428
commit 342d0a3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/example/example-es-cluster.json b/example/example-es-cluster.json
@@ -20,6 +20,7 @@
       "type": "gp2",
       "storage-class-provisioner": "kubernetes.io/aws-ebs"
     },
+    "nodePort": 30303,
     "resources": {
       "requests": {
          "memory": "512Mi",

diff --git a/pkg/k8sutil/k8sutil.go b/pkg/k8sutil/k8sutil.go
@@ -401,7 +401,7 @@ func (k *K8sutil) CreateDataService(clusterName string) error {
 }
 
 // CreateClientService creates the client service
-func (k *K8sutil) CreateClientService(clusterName string) error {
+func (k *K8sutil) CreateClientService(clusterName string, nodePort int32) error {
 
 	fullClientServiceName := clientServiceName + "-" + clusterName
 	component := "elasticsearch" + "-" + clusterName
@@ -434,7 +434,10 @@ func (k *K8sutil) CreateClientService(clusterName string) error {
 				},
 			},
 		}
-
+		if nodePort > 0 {
+			clientSvc.Spec.Type = v1.ServiceTypeNodePort
+			clientSvc.Spec.Ports[0].NodePort = nodePort
+		}
 		_, err := k.Kclient.Services(namespace).Create(clientSvc)
 
 		if err != nil {

diff --git a/pkg/processor/processor.go b/pkg/processor/processor.go
@@ -181,7 +181,7 @@ func (p *Processor) processElasticSearchCluster(c *myspec.ElasticsearchCluster)
 	// Create Services
 	p.k8sclient.CreateDiscoveryService(c.Metadata.Name)
 	p.k8sclient.CreateDataService(c.Metadata.Name)
-	p.k8sclient.CreateClientService(c.Metadata.Name)
+	p.k8sclient.CreateClientService(c.Metadata.Name, c.Spec.NodePort)
 
 	p.k8sclient.CreateClientMasterDeployment("client", baseImage, &c.Spec.ClientNodeReplicas, c.Spec.JavaOptions, c.Spec.Resources, c.Spec.ImagePullSecrets, c.Metadata.Name, c.Spec.Instrumentation.StatsdHost)
 	p.k8sclient.CreateClientMasterDeployment("master", baseImage, &c.Spec.MasterNodeReplicas, c.Spec.JavaOptions, c.Spec.Resources, c.Spec.ImagePullSecrets, c.Metadata.Name, c.Spec.Instrumentation.StatsdHost)

diff --git a/pkg/spec/cluster.go b/pkg/spec/cluster.go
@@ -1,3 +1,4 @@
+
 /*
 Copyright (c) 2017, UPMC Enterprises
 All rights reserved.
@@ -88,7 +89,10 @@ type ClusterSpec struct {
 
 	// Instrumentation defines metrics for the cluster
 	Instrumentation Instrumentation `json:"instrumentation"`
-
+
+	//NodePort
+	NodePort int32 `json:"nodePort"`
+
 	Scheduler *snapshot.Scheduler
 }