working opal

charts/opal/templates/deployment.yaml

@@ -31,20 +31,10 @@ spec:
           image: {{ .image.repository }}/{{ .image.name }}:{{ .image.tag }}
           imagePullPolicy: {{ .image.pullPolicy }}
           env:
-            - name: opal.home
-              value: /home/opal
-            - name: db_uri
-              value: jdbc:postgresql://localhost/opal
-            - name: db_user
-              value: opal
-            - name: db_password
-              value: opal
-            - name: admin.password
+            - name: OPAL_ADMINISTRATOR_PASSWORD
               value: "{{ .adminPassword }}"
-            - name: CATALINA_OPTS
-              value: "-Xmx{{ .javaOpts.maxHeapSpace }} -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
           ports:
-            - containerPort: 8080
+            - containerPort: {{ $.Values.service.port }}
           {{- if $.Values.persistence.enabled }}
           volumeMounts:
           - name: opal-nfs
@@ -53,19 +43,21 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: 8080
+              port: {{ $.Values.service.port }}
             initialDelaySeconds: 60
             periodSeconds: 5
             failureThreshold: 25
             successThreshold: 1
-          readinessProbe:
-            httpGet:
-              path: /api/v2/version
-              port: 8080
-            initialDelaySeconds: 120
-            periodSeconds: 30
-            failureThreshold: 3
-            successThreshold: 1
+          resources:
+{{ toYaml .resources | indent 12 }}
+        {{- end }}
+        - name: rserver
+        {{- with .Values.rserver }}
+          image: {{ .image.repository }}/{{ .image.name }}:{{ .image.tag }}
+          imagePullPolicy: {{ .image.pullPolicy }}
+          ports:
+            - containerPort: 6612
+            - containerPort: 6311
           resources:
 {{ toYaml .resources | indent 12 }}
         {{- end }}

charts/opal/templates/ingress.yaml

@@ -6,10 +6,10 @@ kind: Ingress
 metadata:
   name: "{{ $.Release.Name }}-ingress"
   labels:
-    app: {{ template "opal.name" . }}
-    chart: {{ template "opal.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app: {{ $.Values.service.name }}
+    chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
 {{- with .Values.ingress.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -33,7 +33,7 @@ spec:
         paths:
           - path: {{ $ingressPath }}
             backend:
-              serviceName: {{ $fullName }}
+              serviceName: {{ $.Values.service.name }}
               servicePort: {{ $.Values.service.port }}
   {{- end }}
   {{- end }}

charts/opal/templates/service.yaml

@@ -1,16 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "opal.fullname" . }}
+  name: {{ .Values.service.name }}
   labels:
-    app: {{ template "opal.name" . }}
+    app: {{ .Values.service.name }}
     chart: {{ template "opal.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - name: opal
+    - name: {{ .Values.service.name }}
       port: {{ .Values.service.port }}
   selector:
     app: {{ template "opal.name" . }}