use pinot image for service manager in helm chart (#146)

* use pinot image for service manager

* nit

* fix

* remove storage class

* update

* empty commit

* Update helm/values.yaml

Co-authored-by: Ravi Singal <62086374+ravisingal@users.noreply.github.com>

---------

Co-authored-by: Ravi Singal <62086374+ravisingal@users.noreply.github.com>

Author: Kishan Sairam Adapa

helm/templates/_helpers.tpl

@@ -204,16 +204,16 @@ Create the name of the service account to use
 {{/*
 Docker image to use for service manager
 */}}
-{{- define "pinot.servicemanager.image" -}}
-  {{- if and .Values.servicemanager.image.repository .Values.servicemanager.image.tag -}}
-    {{- printf "%s:%s" .Values.servicemanager.image.repository .Values.servicemanager.image.tag }}
-    {{- if .Values.servicemanager.image.sha256 -}}
-      {{- printf "@sha256:%s" .Values.servicemanager.image.sha256 }}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "%s:%s" .Values.image.repository .Chart.Version }}
-  {{- end -}}
-{{- end -}}
+{{/*{{- define "pinot.servicemanager.image" -}}*/}}
+{{/*  {{- if and .Values.servicemanager.image.repository .Values.servicemanager.image.tag -}}*/}}
+{{/*    {{- printf "%s:%s" .Values.servicemanager.image.repository .Values.servicemanager.image.tag }}*/}}
+{{/*    {{- if .Values.servicemanager.image.sha256 -}}*/}}
+{{/*      {{- printf "@sha256:%s" .Values.servicemanager.image.sha256 }}*/}}
+{{/*    {{- end -}}*/}}
+{{/*  {{- else -}}*/}}
+{{/*    {{- printf "%s:%s" .Values.image.repository .Chart.Version }}*/}}
+{{/*  {{- end -}}*/}}
+{{/*{{- end -}}*/}}
 
 {{/*
 Docker image to use for controller, broker, minion and server

helm/templates/broker/configmap.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.broker.enabled }}
+{{- if or .Values.broker.enabled .Values.servicemanager.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -11,6 +11,7 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   pinot-broker.conf: |-
+    pinot.service.role = BROKER
     pinot.broker.client.queryPort={{ .Values.broker.port }}
     pinot.broker.routing.table.builder.class={{ .Values.broker.routingTable.builderClass }}
     pinot.preferHostnameInDefaultInstanceId=true

helm/templates/controller/configmap.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.controller.enabled }}
+{{- if or .Values.controller.enabled .Values.servicemanager.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -11,6 +11,7 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   pinot-controller.conf: |-
+    pinot.service.role = CONTROLLER
     controller.helix.cluster.name={{ .Values.cluster.name }}
     controller.port={{ .Values.controller.port }}
     {{- if .Values.controller.vip.enabled }}

helm/templates/minion/configmap.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.minion.enabled }}
+{{- if or .Values.minion.enabled .Values.servicemanager.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -11,6 +11,7 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   pinot-minion.conf: |-
+    pinot.service.role = MINION
     pinot.minion.port={{ .Values.minion.port }}
     pinot.set.instance.id.to.hostname=true
     {{- if .Values.minion.persistence.enabled }}

helm/templates/server/configmap.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.server.enabled }}
+{{- if or .Values.server.enabled .Values.servicemanager.enabled }}
 {{- range $name,$tierConfig := omit .Values.server.tiers "default" }}
 {{- $tier := mergeOverwrite (deepCopy (omit $.Values.server "tiers")) (deepCopy $.Values.server.tiers.default) (deepCopy $tierConfig) }}
 ---
@@ -22,6 +22,7 @@ metadata:
     heritage: {{ $.Release.Service }}
 data:
   pinot-server.conf: |-
+    pinot.service.role = SERVER
     pinot.server.netty.port={{ $tier.ports.netty }}
     pinot.server.adminapi.port={{ $tier.ports.admin }}
     pinot.server.grpc.port={{ $tier.ports.grpc }}