fix hive-metastore configuration problem

Author: cgiraldo

charts/hive-metastore/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "hive.name" -}}
+{{- define "hiveMetastore.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -12,7 +12,7 @@ We truncate at 54 chars because some Kubernetes name fields are limited to 63 (b
 as we append -datanode or -namenode to the names
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "hive.fullname" -}}
+{{- define "hiveMetastore.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 54 | trimSuffix "-" -}}
 {{- else -}}
@@ -29,7 +29,7 @@ If release name contains chart name it will be used as a full name.
 Standard Labels from Helm documentation https://helm.sh/docs/chart_best_practices/#labels-and-annotations
 */}}
 
-{{- define "hive.labels" -}}
+{{- define "hiveMetastore.labels" -}}
 helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
 app.kubernetes.io/instance: {{ .Release.Name | quote }}

charts/hive-metastore/templates/mestastore-configmap.yaml renamed to charts/hive-metastore/templates/configmap.yaml

@@ -1,35 +1,41 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "hive.fullname" . }}
+  name: {{ include "hiveMetastore.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "hive.name" . }}
-    {{- include "hive.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "hiveMetastore.name" . }}
+    {{- include "hiveMetastore.labels" . | nindent 4 }}
 data:
   hive-site.xml: |
     <?xml version="1.0"?>
     <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
     <configuration>
         <property>
-          <name>javax_jdo_option_ConnectionURL</name>
-          <value>jdbc:postgresql://{{ .Release.Name }}-postgresql/metastore </value>
+          <name>javax.jdo.option.ConnectionURL</name>
+          <value>jdbc:postgresql://{{ .Release.Name }}-postgresql/metastore</value>
         </property>
         <property>
-          <name>javax_jdo_option_ConnectionDriverName</name>
+          <name>javax.jdo.option.ConnectionDriverName</name>
           <value>org.postgresql.Driver</value>
         </property>
         <property>
-          <name>javax_jdo_option_ConnectionUserName</name>
+          <name>javax.jdo.option.ConnectionUserName</name>
           <value>{{ .Values.postgresql.postgresqlUsername }}</value>
         </property>
         <property>
-          <name> javax_jdo_option_ConnectionPassword</name>
-          <value> {{ .Values.postgresql.postgresqlPassword }} </value>
+          <name> javax.jdo.option.ConnectionPassword</name>
+          <value>{{ .Values.postgresql.postgresqlPassword }}</value>
         </property>
         <property>
-          <name>datanucleus_autoCreateSchema</name>
+          <name>datanucleus.autoCreateSchema</name>
           <value>false</value>
         </property>
+        {{- if not (index .Values.conf "hiveSite" "hive.metastore.uris")  }}
+        <property>
+          <name>hive.metastore.uris</name>
+          <value>thrift://{{ include "hiveMetastore.fullname" . }}:9083</value>
+        </property>
+      {{- end }}
       {{- if index .Values.conf "hiveSite" }}
       {{- range $key, $value := index .Values.conf "hiveSite" }}
       <property><name>{{ $key }}</name><value>{{ $value }}</value></property>

charts/hive-metastore/templates/metastore-postgresql-init.yaml renamed to charts/hive-metastore/templates/postgresql-init.yaml

@@ -3,8 +3,8 @@ kind: ConfigMap
 metadata:
   name: hive-metastore-postgresql-init
   labels:
-    app.kubernetes.io/name: {{ include "hive.name" . }}
-    {{- include "hive.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "hiveMetastore.name" . }}
+    {{- include "hiveMetastore.labels" . | nindent 4 }}
 data:
   00-hive-schema-2.3.0.postgres.sql: |-
 {{ tpl (.Files.Get "files/hive-schema-2.3.0.postgres.sql") . | indent 4 }}

charts/hive-metastore/templates/metastore-statefulset.yaml renamed to charts/hive-metastore/templates/statefulset.yaml

@@ -1,25 +1,25 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ include "hive.fullname" . }}-metastore
+  name: {{ include "hiveMetastore.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "hive.name" . }}
+    app.kubernetes.io/name: {{ include "hiveMetastore.name" . }}
     app.kubernetes.io/component: metastore
-    {{- include "hive.labels" . | nindent 4 }}
+    {{- include "hiveMetastore.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "hive.name" . }}
+      app.kubernetes.io/name: {{ include "hiveMetastore.name" . }}
       app.kubernetes.io/component: metastore
-      {{- include "hive.labels" . | nindent 6 }}
-  serviceName: {{ include "hive.fullname" . }}-metastore
+      {{- include "hiveMetastore.labels" . | nindent 6 }}
+  serviceName: {{ include "hiveMetastore.fullname" . }}
   replicas: 1
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "hive.name" . }}
+        app.kubernetes.io/name: {{ include "hiveMetastore.name" . }}
         app.kubernetes.io/component: metastore
-        {{- include "hive.labels" . | nindent 8 }}
+        {{- include "hiveMetastore.labels" . | nindent 8 }}
     spec:
       containers:
       - name: metastore
@@ -28,8 +28,7 @@ spec:
         command:
         - "/bin/sh"
         - "-c"
-        - "while true; do sleep 10; done"
-        #- "/opt/hive/bin/hive --service metastore"
+        - "/opt/hive/bin/hive --service metastore"
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         # readinessProbe:
@@ -50,4 +49,4 @@ spec:
       volumes:
       - name: hive-config
         configMap:
-          name: {{ include "hive.fullname" . }}
+          name: {{ include "hiveMetastore.fullname" . }}

charts/hive-metastore/templates/metastore-svc.yaml renamed to charts/hive-metastore/templates/svc.yaml

@@ -2,17 +2,17 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "hive.fullname" . }}-metastore
+  name: {{ include "hiveMetastore.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "hive.name" . }}
+    app.kubernetes.io/name: {{ include "hiveMetastore.name" . }}
     app.kubernetes.io/component: metastore
-    {{- include "hive.labels" . | nindent 4 }}
+    {{- include "hiveMetastore.labels" . | nindent 4 }}
 spec:
   ports:
   - name: thrift
     port: 9083
     protocol: TCP
   selector:
-    app.kubernetes.io/name: {{ include "hive.name" . }}
+    app.kubernetes.io/name: {{ include "hiveMetastore.name" . }}
     app.kubernetes.io/component: metastore
     app.kubernetes.io/instance: {{ .Release.Name }}