Merge pull request #1663 from NCEAS/feature-1623-working-tests

Feature 1623 working tests Merging, since all either docker, helm, or test code, apart from updating metacatui tag to 2.25.0 in build.xml, which I already discussed with @taojing2002
NCEAS · Jul 20, 2023 · a383197 · a383197
2 parents 6076328 + 1ce0cd4
commit a383197
Show file tree

Hide file tree

Showing 11 changed files with 901 additions and 716 deletions.
diff --git a/build.xml b/build.xml
@@ -27,7 +27,7 @@
 <project name="metacat" default="jar" basedir="."
          xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
-    <property name="metacatui-tag" value="2.23.0"/>
+    <property name="metacatui-tag" value="2.25.0"/>
     <property name="eml2-style-tag" value="RELEASE_EML_UTILS_1_1_2"/>
 
     <property environment="env"/>

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -47,6 +47,8 @@ WORKDIR "$TC_HOME"/bin
 
 EXPOSE 8080
 EXPOSE 5701
+EXPOSE 5702
+EXPOSE 5703
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
@@ -159,6 +159,12 @@ ${METACAT_ADMINISTRATOR_PASSWORD}&username=${METACAT_ADMINISTRATOR_USERNAME}" \
     if [[ $ADMIN_LOGGED_IN -eq 0 ]]; then
         echo 'FAILED - unable to log in as admin'
         echo '**************************************'
+        echo "grepping log $TC_HOME/logs/localhost*.$(date +%Y-%m-%d).log for startup conditions..."
+        exec grep -B7 -A20 "FATAL" "$TC_HOME"/logs/*
+        echo
+        echo '**************************************'
+        echo
+        echo
         if [[ "$METACAT_DEBUG" != "true" ]]; then
           echo 'Exiting...'
           exit 3

diff --git a/helm/README.md b/helm/README.md
@@ -101,7 +101,7 @@ kubectl delete pvc -l release=my-release                         ## deletes both
 | `metacat.auth.administrators`    | A colon-separated list of admin usernames or LDAP-style DN    | `admin@localhost:uid=jones,ou=Account,dc=ecoinformatics,dc=org` |
 | `metacat.database.connectionURI` | postgres DB URI (RELEASE PREFIX, or blank for sub-chart)      | `jdbc:postgresql://mc-postgresql/metacat`                       |
 | `metacat.guid.doi.enabled`       | Allow users to publish Digital Object Identifiers at doi.org? | `true`                                                          |
-| `metacat.server.httpPort`        | The http port exposed internally by the metacat container     | `8080`                                                          |
+| `metacat.server.httpPort`        | The http port exposed externally by the Ingress or Service    | `80`                                                            |
 | `metacat.server.name`            | The hostname for the server, as exposed by the ingress        | `localhost`                                                     |
 | `metacat.solr.baseURL`           | The url to access solr                                        | `http://host.docker.internal:8983/solr`                         |
 | `metacat.replication.logdir`     | Location for the replication logs                             | `/var/metacat/logs`                                             |
@@ -145,7 +145,9 @@ kubectl delete pvc -l release=my-release                         ## deletes both
 | `ingress.hosts`               | A collection of rules mapping different hosts to the backend. | `[]`             |
 | `ingress.annotations`         | Annotations for the ingress                                   | `{}`             |
 | `ingress.tls`                 | The TLS configuration                                         | `[]`             |
-| `service.type`                | Kubernetes Service type                                       | `ClusterIP`      |
+| `service.enabled`             | Enable another optional service in addition to headless svc   | `false`          |
+| `service.type`                | Kubernetes Service type. Defaults to ClusterIP if not set     | `LoadBalancer`   |
+| `service.clusterIP`           | IP address of the service. Auto-generated if not set          | `""`             |
 | `service.ports`               | The port(s) to be exposed                                     | `[]`             |
 | `livenessProbe.enabled`       | Enable livenessProbe for Metacat container                    | `true`           |
 | `livenessProbe.httpGet.path`  | The url path to probe.                                        | `/metacat/`      |

diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml
@@ -1,11 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "metacat.fullname" . -}}
-{{- $svcPort := 0 -}}
-{{- range .Values.service.ports }}
-  {{- if eq .name "metacat-svc-web" }}
-    {{- $svcPort = .port }}
-  {{- end }}
-{{- end }}
+{{- $svcPort := 8080 -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
@@ -54,11 +49,11 @@ spec:
             backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ $fullName }}-headless-svc
+                name: {{ $fullName }}-hl
                 port:
                   number: {{ $svcPort }}
               {{- else }}
-              serviceName: {{ $fullName }}-headless-svc
+              serviceName: {{ $fullName }}-hl
               servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}

diff --git a/helm/templates/service-headless.yaml b/helm/templates/service-headless.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "metacat.fullname" . }}-headless-svc
+  name: {{ include "metacat.fullname" . }}-hl
   labels:
     {{- include "metacat.labels" . | nindent 4 }}
 spec:
@@ -10,6 +10,7 @@ spec:
   clusterIP: None
   publishNotReadyAddresses: true
   ports:
-    {{- toYaml .Values.service.ports | nindent 4 }}
+    - port: 8080
+      name: metacat-svc-web
   selector:
-      {{- include "metacat.selectorLabels" . | nindent 4 }}
+    {{- include "metacat.selectorLabels" . | nindent 4 }}
diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.service.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "metacat.fullname" . }}
+  labels:
+    {{- include "metacat.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type | default "ClusterIP" }}
+  clusterIP: {{ .Values.service.clusterIP | default "" }}
+  ports:
+    {{- toYaml .Values.service.ports | nindent 4 }}
+  selector:
+    {{- include "metacat.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/helm/templates/statefulset.yaml b/helm/templates/statefulset.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     {{- include "metacat.labels" . | nindent 4 }}
 spec:
-  serviceName: {{ include "metacat.fullname" . }}-headless-svc
+  serviceName: {{ include "metacat.fullname" . }}-hl
   replicas: 1
   selector:
     matchLabels:
@@ -35,6 +35,12 @@ spec:
           ports:
             - containerPort: 8080
               name: metacat-web
+            - containerPort: 5701
+              name: hazelcast-port1
+            - containerPort: 5702
+              name: hazelcast-port2
+            - containerPort: 5703
+              name: hazelcast-port3
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -78,9 +78,12 @@ metacat:
   ##
   guid.doi.enabled: true
 
-  ## @param metacat.server.httpPort The http port exposed internally by the metacat container
-  ## 
-  server.httpPort: 8080
+  ## @param metacat.server.httpPort The http port exposed externally by the Ingress or Service
+  ## being used to allow connections from outside the k8s cluster.
+  ## Must be defined here, even if unchanged from the default value in metacat.properties, since it
+  ## is needed by the entrypoint script to populate metacatui's config.
+  ##
+  server.httpPort: 80
 
   ## @param metacat.server.name The hostname for the server, as exposed by the ingress
   ## and seen by end users outside the cluster
@@ -278,20 +281,31 @@ ingress:
   ##      secretName: ingress-nginx-tls-cert
   tls: []
 
-## Headless ClusterIP required for StatefulSet
+## Optional service in addition to the Headless ClusterIP that is required for StatefulSet
 service:
-  ## @param service.type Kubernetes Service type
+  ## @param service.enabled Enable another optional service in addition to headless svc
+  enabled: false
+
+  ## @param service.type Kubernetes Service type. Defaults to ClusterIP if not set
+  type: LoadBalancer
+
+  ## @param service.clusterIP IP address of the service. Auto-generated if not set
+  ## Valid values are "None", empty string (""), or a valid IP address. Setting this to "None"
+  ## makes a "headless service" (no virtual IP). Using empty string ("") will auto-generate an IP
   ##
-  type: ClusterIP
+  clusterIP: ""
 
   ## @param service.ports [array] The port(s) to be exposed
   ##        service.ports.port The port to expose
   ##        service.ports.name A unique name to identify this port.
-  ##        Note that the ingress will direct metacat traffic to the port named "metacat-svc-web"
   ##
   ports:
-    - port: 8080
-      name: metacat-svc-web
+    - name: http-port
+      port: 8080
+      targetPort: metacat-web
+    - name: hazelcast-test1
+      port: 5701
+      targetPort: 5701
 
 ## LivenessProbe
 ## Periodic probe of container liveness. Container will be restarted if the probe fails.