Merge pull request #3 from picodata/add-support-of-vshard-groups

Add ability to specify in values.yml vshard Group for each role

Author: Kasen

controllers/role_controller.go

@@ -278,7 +278,10 @@ func CreateStatefulSetFromTemplate(ctx context.Context, replicasetNumber int, na
 	sts.Spec.ServiceName = role.GetAnnotations()["tarantool.io/cluster-id"]
 	replicasetUUID := uuid.NewSHA1(space, []byte(sts.GetName()))
 	sts.ObjectMeta.Labels["tarantool.io/replicaset-uuid"] = replicasetUUID.String()
-	sts.ObjectMeta.Labels["tarantool.io/vshardGroupName"] = role.GetLabels()["tarantool.io/role"]
+	if name, ok := sts.ObjectMeta.Labels["tarantool.io/vshardGroupName"]; ok {
+		sts.ObjectMeta.Labels["tarantool.io/vshardGroupName"] = name
+		sts.ObjectMeta.Labels["tarantool.io/useVshardGroups"] = "1"
+	}
 
 	if sts.ObjectMeta.Annotations == nil {
 		sts.ObjectMeta.Annotations = make(map[string]string)
@@ -288,7 +291,10 @@ func CreateStatefulSetFromTemplate(ctx context.Context, replicasetNumber int, na
 	sts.ObjectMeta.Annotations["tarantool.io/replicaset-weight"] = "100"
 
 	sts.Spec.Template.Labels["tarantool.io/replicaset-uuid"] = replicasetUUID.String()
-	sts.Spec.Template.Labels["tarantool.io/vshardGroupName"] = role.GetLabels()["tarantool.io/role"]
+	if name, ok := sts.ObjectMeta.Labels["tarantool.io/vshardGroupName"]; ok {
+		sts.Spec.Template.Labels["tarantool.io/vshardGroupName"] = name
+		sts.Spec.Template.Labels["tarantool.io/useVshardGroups"] = "1"
+	}
 
 	return sts
 }

helm-charts/tarantool-cartridge/templates/deployment.yaml

@@ -32,7 +32,12 @@ metadata:
     tarantool.io/cluster-id: {{ $.Values.ClusterName }}
     tarantool.io/replicaset-template: "{{ .RoleName }}-template"
     tarantool.io/role: {{ .RoleName }}
+    {{ if  .VshardGroup }}
+    tarantool.io/useVshardGroups: "1"
+    tarantool.io/vshardGroupName: {{ .VshardGroup }}
+    {{ else }}
     tarantool.io/useVshardGroups: "0"
+    {{ end }}
   annotations:
     tarantool.io/rolesToAssign: {{ $r }}
 spec:
@@ -55,7 +60,12 @@ spec:
         tarantool.io/cluster-id: "{{ $.Values.ClusterName }}"
         tarantool.io/cluster-domain-name: "{{ $.Values.ClusterDomainName }}"
         tarantool.io/pod-template: "{{ .RoleName }}-pod-template"
+        {{ if .VshardGroup }}
+        tarantool.io/useVshardGroups: "1"
+        tarantool.io/vshardGroupName: {{ .VshardGroup }}
+        {{ else }}
         tarantool.io/useVshardGroups: "0"
+        {{ end }}
       annotations:
         tarantool.io/rolesToAssign: {{ $r }}
         prometheus.io/path: "{{ $.Values.Prometheus.path }}"