Merge pull request #3578 from planetf1/fiximage

Release 2.2 - Fix egeria docker image to work with graph repo (fixes regression)
odpi · Sep 7, 2020 · d41ccaa · d41ccaa
2 parents 2e28a78 + 8e68281
commit d41ccaa
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 3 deletions.
diff --git a/...data-resources/open-metadata-deployment/charts/odpi-egeria-lab/templates/egeria-core.yaml b/...data-resources/open-metadata-deployment/charts/odpi-egeria-lab/templates/egeria-core.yaml
@@ -18,6 +18,12 @@ spec:
     - port: 9443
       targetPort: 9443
       nodePort: {{ .Values.service.nodeport.core }}
+  {{ if .Values.debug.egeriaJVM }}
+    - name: debug
+      port: 5005
+      targetPort: 5005
+      nodePort: {{ .Values.service.nodeport.debug.core }}
+  {{ end }}
   selector:
     app.kubernetes.io/name: {{ include "myapp.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -62,8 +68,16 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "myapp.fullname" . }}-configmap
+          env:
+            {{ if .Values.debug.egeriaJVM }}
+            - name: JAVA_DEBUG
+              value:  "true"
+            {{ end }}
           ports:
             - containerPort: 9443
+          {{ if .Values.debug.egeriaJVM }}
+            - containerPort: 5005
+          {{ end }}
           readinessProbe:
             tcpSocket:
               port: 9443

diff --git a/...-resources/open-metadata-deployment/charts/odpi-egeria-lab/templates/egeria-datalake.yaml b/...-resources/open-metadata-deployment/charts/odpi-egeria-lab/templates/egeria-datalake.yaml
@@ -18,6 +18,12 @@ spec:
     - port: 9443
       targetPort: 9443
       nodePort: {{ .Values.service.nodeport.datalake }}
+    {{ if .Values.debug.egeriaJVM }}
+    - name: debug
+      port: 5005
+      targetPort: 5005
+      nodePort: {{ .Values.service.nodeport.debug.datalake }}
+    {{ end }}
   selector:
     app.kubernetes.io/name: {{ include "myapp.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -62,8 +68,16 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "myapp.fullname" . }}-configmap
+          env:
+            {{ if .Values.debug.egeriaJVM }}
+            - name: JAVA_DEBUG
+              value:  "true"
+            {{ end }}
           ports:
             - containerPort: 9443
+          {{ if .Values.debug.egeriaJVM }}
+            - containerPort: 5005
+          {{ end }}
           readinessProbe:
             tcpSocket:
               port: 9443

diff --git a/...adata-resources/open-metadata-deployment/charts/odpi-egeria-lab/templates/egeria-dev.yaml b/...adata-resources/open-metadata-deployment/charts/odpi-egeria-lab/templates/egeria-dev.yaml
@@ -15,9 +15,16 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: 9443
+    - name: https
+      port: 9443
       targetPort: 9443
       nodePort: {{ .Values.service.nodeport.dev }}
+    {{ if .Values.debug.egeriaJVM }}
+    - name: debug
+      port: 5005
+      targetPort: 5005
+      nodePort: {{ .Values.service.nodeport.debug.dev }}
+    {{ end }}
   selector:
     app.kubernetes.io/name: {{ include "myapp.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -62,8 +69,16 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "myapp.fullname" . }}-configmap
+          env:
+            {{ if .Values.debug.egeriaJVM }}
+             - name: JAVA_DEBUG
+               value:  "true"
+            {{ end }}
           ports:
             - containerPort: 9443
+            {{ if .Values.debug.egeriaJVM }}
+            - containerPort: 5005
+            {{ end }}
           readinessProbe:
             tcpSocket:
               port: 9443

diff --git a/...a-resources/open-metadata-deployment/charts/odpi-egeria-lab/templates/egeria-factory.yaml b/...a-resources/open-metadata-deployment/charts/odpi-egeria-lab/templates/egeria-factory.yaml
@@ -15,9 +15,16 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: 9443
+    - name: https
+      port: 9443
       targetPort: 9443
       nodePort: {{ .Values.service.nodeport.factory }}
+    {{ if .Values.debug.egeriaJVM }}
+    - name: debug
+      port: 5005
+      targetPort: 5005
+      nodePort: {{ .Values.service.nodeport.debug.factory }}
+  {{ end }}
   selector:
     app.kubernetes.io/name: {{ include "myapp.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -62,8 +69,16 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "myapp.fullname" . }}-configmap
+          env:
+            {{ if .Values.debug.egeriaJVM }}
+            - name: JAVA_DEBUG
+              value:  "true"
+          {{ end }}
           ports:
             - containerPort: 9443
+            {{ if .Values.debug.egeriaJVM }}
+            - containerPort: 5005
+            {{ end }}
           readinessProbe:
             tcpSocket:
               port: 9443

diff --git a/...tadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/templates/egeria-ui.yaml b/...tadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/templates/egeria-ui.yaml
@@ -18,6 +18,12 @@ spec:
     - port: 8443
       targetPort: 8443
       nodePort: {{ .Values.service.nodeport.ui }}
+  {{ if .Values.debug.egeriaJVM }}
+    - name: debug
+      port: 5005
+      targetPort: 5005
+      nodePort: {{ .Values.service.nodeport.debug.ui }}
+  {{ end }}
   selector:
     app.kubernetes.io/name: {{ include "myapp.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -68,6 +74,9 @@ spec:
             - "java -jar /opt/egeria/user-interface/ui-chassis-spring-{{ .Values.egeria.version}}.jar"
           ports:
             - containerPort: 8443
+            {{ if .Values.debug.egeriaJVM }}
+            - containerPort: 5005
+            {{ end }}
           readinessProbe:
             tcpSocket:
               port: 8443
@@ -86,6 +95,10 @@ spec:
               value: "open-lineage"
             - name: "OPEN_LINEAGE_GRAPH_SOURCE"
               value: "MAIN"
+            {{ if .Values.debug.egeriaJVM }}
+            - name: JAVA_DEBUG
+              value:  "true"
+            {{ end }}
       restartPolicy: Always
 
 status: {}

diff --git a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/values.yaml b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/values.yaml
@@ -11,12 +11,21 @@ service:
     dev: 30082
     factory: 30083
     ui: 30443
+    debug:
+      core: 31005
+      datalake: 31006
+      dev: 31007
+      factory: 31008
+      ui: 31009
 
 egeria:
   #logging: OFF
   development: true
   version: "2.2"
 
+debug:
+  egeriaJVM: false
+
 # Defaults for the images (can be overridden here or individually, see comment below)
 # Note for egeria provided images we use the version specified above
 imageDefaults:

diff --git a/open-metadata-resources/open-metadata-deployment/docker/egeria/Dockerfile b/open-metadata-resources/open-metadata-deployment/docker/egeria/Dockerfile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright Contributors to the Egeria project.
 
-FROM openjdk:8-jre-alpine
+FROM openjdk:14-alpine
 ARG version=2.2
 ARG VCS_REF=unknown
 ARG VCS_ORIGIN=unknown