Merge pull request #115 from upmc-enterprises/addClusterNameLabel

Added clustername label
upmc-enterprises · Oct 25, 2017 · 6a593f4 · 6a593f4
2 parents 3b8a66e + b5d88f2
commit 6a593f4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/pkg/k8sutil/deployments.go b/pkg/k8sutil/deployments.go
@@ -122,6 +122,7 @@ func (k *K8sutil) CreateClientDeployment(baseImage string, replicas *int32, java
 					"component": component,
 					"role":      role,
 					"name":      deploymentName,
+					"cluster":   clusterName,
 				},
 			},
 			Spec: v1beta1.DeploymentSpec{
@@ -132,6 +133,7 @@ func (k *K8sutil) CreateClientDeployment(baseImage string, replicas *int32, java
 							"component": component,
 							"role":      role,
 							"name":      deploymentName,
+							"cluster":   clusterName,
 						},
 						Annotations: map[string]string{
 							"pod.beta.kubernetes.io/init-containers": "[ { \"name\": \"sysctl\", \"image\": \"busybox\", \"imagePullPolicy\": \"IfNotPresent\", \"command\": [\"sysctl\", \"-w\", \"vm.max_map_count=262144\"], \"securityContext\": { \"privileged\": true } }]",

diff --git a/pkg/k8sutil/k8sutil.go b/pkg/k8sutil/k8sutil.go
@@ -396,6 +396,7 @@ func (k *K8sutil) CreateDataNodeDeployment(deploymentType string, replicas *int3
 					"component": component,
 					"role":      role,
 					"name":      statefulSetName,
+					"cluster":   clusterName,
 				},
 			},
 			Spec: apps.StatefulSetSpec{
@@ -407,6 +408,7 @@ func (k *K8sutil) CreateDataNodeDeployment(deploymentType string, replicas *int3
 							"component": component,
 							"role":      role,
 							"name":      statefulSetName,
+							"cluster":   clusterName,
 						},
 						Annotations: map[string]string{
 							"pod.beta.kubernetes.io/init-containers": "[ { \"name\": \"sysctl\", \"image\": \"busybox\", \"imagePullPolicy\": \"IfNotPresent\", \"command\": [\"sysctl\", \"-w\", \"vm.max_map_count=262144\"], \"securityContext\": { \"privileged\": true } }]",
@@ -543,6 +545,7 @@ func (k *K8sutil) CreateDataNodeDeployment(deploymentType string, replicas *int3
 								"component": "elasticsearch",
 								"role":      role,
 								"name":      statefulSetName,
+								"cluster":   clusterName,
 							},
 						},
 						Spec: v1.PersistentVolumeClaimSpec{

diff --git a/pkg/k8sutil/storage.go b/pkg/k8sutil/storage.go
@@ -47,6 +47,7 @@ func (k *K8sutil) CreateStorageClass(zone, storageClassProvisioner, storageType
 				Name: zone,
 				Labels: map[string]string{
 					"component": component,
+					"cluster":   clusterName,
 				},
 			},
 			Provisioner: storageClassProvisioner,