Merge pull request #1531 from cedardevs/NCCF-2321

Moving forward w/ jar-based solution for now after broad discussion

client/package.json

@@ -69,6 +69,7 @@
     "@babel/plugin-syntax-import-meta": "^7.2.0",
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.0.0",
+    "@emotion/react": "^11.10.0",
     "@emotion/styled": "^11.0.0",
     "@testing-library/react-hooks": "^3.2.1",
     "@types/jest": "^27.4.1",

helm/index.yaml

@@ -2,7 +2,37 @@ apiVersion: v1
 entries:
   onestop:
   - apiVersion: v1
-    created: "2022-02-25T17:58:02.368371-07:00"
+    created: "2022-08-15T14:31:52.034645-06:00"
+    dependencies:
+    - name: onestop-client
+      repository: file://../onestop-client
+      version: 3.0.0-beta
+    - name: onestop-indexer
+      repository: file://../onestop-indexer
+      version: 3.0.0-beta
+    - name: onestop-parsalyzer
+      repository: file://../onestop-parsalyzer
+      version: 3.0.0-beta
+    - name: onestop-registry
+      repository: file://../onestop-registry
+      version: 3.0.0-beta
+    - name: onestop-search
+      repository: file://../onestop-search
+      version: 3.0.0-beta
+    - name: onestop-user
+      repository: file://../onestop-user
+      version: 3.0.0-beta
+    - name: onestop-gateway
+      repository: file://../onestop-gateway
+      version: 3.0.0-beta
+    description: A Helm chart for the OneStop system
+    digest: bfe9eec5c8b383c36b4a513a4f34d23542b47129ddb5c73421a73190df579990
+    name: onestop
+    urls:
+    - onestop-3.0.0-beta2.tgz
+    version: 3.0.0-beta2
+  - apiVersion: v1
+    created: "2022-08-15T14:31:52.030706-06:00"
     dependencies:
     - name: onestop-client
       repository: file://../onestop-client
@@ -32,7 +62,7 @@ entries:
     - onestop-3.0.0-beta.tgz
     version: 3.0.0-beta
   - apiVersion: v1
-    created: "2022-02-25T17:58:02.365386-07:00"
+    created: "2022-08-15T14:31:52.026625-06:00"
     dependencies:
     - name: onestop-client
       repository: file://../onestop-client
@@ -60,7 +90,7 @@ entries:
     version: 3.0.0-alpha
   - apiVersion: v1
     appVersion: 2.4.0
-    created: "2022-02-25T17:58:02.361166-07:00"
+    created: "2022-08-15T14:31:52.022801-06:00"
     dependencies:
     - condition: cp.enabled,global.cp.enabled
       name: cp-helm-charts
@@ -93,7 +123,7 @@ entries:
     version: 0.4.0
   - apiVersion: v1
     appVersion: 2.4.0
-    created: "2022-02-25T17:58:02.354165-07:00"
+    created: "2022-08-15T14:31:52.012148-06:00"
     dependencies:
     - condition: cp.enabled,global.cp.enabled
       name: cp-helm-charts
@@ -126,7 +156,7 @@ entries:
     version: 0.3.0
   - apiVersion: v1
     appVersion: 2.2.0
-    created: "2022-02-25T17:58:02.346158-07:00"
+    created: "2022-08-15T14:31:52.003648-06:00"
     dependencies:
     - condition: elasticsearch.enabled,global.elasticsearch.enabled
       name: elasticsearch
@@ -149,7 +179,7 @@ entries:
     version: 0.2.1
   - apiVersion: v1
     appVersion: 2.2.0
-    created: "2022-02-25T17:58:02.343831-07:00"
+    created: "2022-08-15T14:31:52.000823-06:00"
     dependencies:
     - condition: elasticsearch.enabled,global.elasticsearch.enabled
       name: elasticsearch
@@ -172,7 +202,7 @@ entries:
     version: 0.2.0
   - apiVersion: v1
     appVersion: 2.1.0
-    created: "2022-02-25T17:58:02.340656-07:00"
+    created: "2022-08-15T14:31:51.996299-06:00"
     dependencies:
     - name: api-admin
       repository: file://../api-admin
@@ -192,4 +222,4 @@ entries:
     urls:
     - onestop-0.1.0.tgz
     version: 0.1.0
-generated: "2022-02-25T17:58:02.337802-07:00"
+generated: "2022-08-15T14:31:51.993322-06:00"

helm/onestop-client/templates/autoscaler.yaml

@@ -1,6 +1,6 @@
 {{ if .Values.autoscaler.enabled -}}
 ---
-apiVersion: autoscaling/v2
+apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "onestop-client.fullname" . }}-autoscaler

helm/onestop-client/templates/ingress.yaml

@@ -11,7 +11,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  ingressClassName: nginx
+  {{- with .Values.ingress.ingressClassName }}
+  ingressClassName: {{ . | quote }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}

helm/onestop-gateway/templates/hpa.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2
+apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "onestop-gateway.fullname" . }}

helm/onestop-gateway/templates/ingress.yaml

@@ -12,7 +12,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  ingressClassName: nginx
+  {{- with .Values.ingress.ingressClassName }}
+  ingressClassName: {{ . | quote }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}

helm/onestop-indexer/templates/autoscaler.yaml

@@ -1,6 +1,6 @@
 {{ if .Values.autoscaler.enabled -}}
 ---
-apiVersion: autoscaling/v2
+apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "onestop-indexer.fullname" . }}-autoscaler

helm/onestop-parsalyzer/templates/autoscaler.yaml

@@ -1,6 +1,6 @@
 {{ if .Values.autoscaler.enabled -}}
 ---
-apiVersion: autoscaling/v2
+apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "onestop-parsalyzer.fullname" . }}-autoscaler

helm/onestop-registry/templates/autoscaler.yaml

@@ -1,6 +1,6 @@
 {{ if .Values.autoscaler.enabled -}}
 ---
-apiVersion: autoscaling/v2
+apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "onestop-registry.fullname" . }}-autoscaler

helm/onestop-registry/templates/ingress.yaml

@@ -12,7 +12,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  ingressClassName: nginx
+  {{- with .Values.ingress.ingressClassName }}
+  ingressClassName: {{ . | quote }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}

helm/onestop-search/templates/autoscaler.yaml

@@ -1,6 +1,6 @@
 {{ if .Values.autoscaler.enabled -}}
 ---
-apiVersion: autoscaling/v2
+apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "onestop-search.fullname" . }}-autoscaler

helm/onestop-search/templates/ingress.yaml

@@ -11,7 +11,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  ingressClassName: nginx
+  {{- with .Values.ingress.ingressClassName }}
+  ingressClassName: {{ . | quote }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}

helm/onestop-user-old/templates/ingress.yaml

@@ -15,7 +15,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  ingressClassName: nginx
+  {{- with .Values.ingress.ingressClassName }}
+  ingressClassName: {{ . | quote }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}

helm/onestop-user/templates/autoscaler.yaml

@@ -1,6 +1,6 @@
 {{ if .Values.autoscaler.enabled -}}
 ---
-apiVersion: autoscaling/v2
+apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "onestop-user.fullname" . }}-autoscaler

helm/onestop-user/templates/ingress.yaml

@@ -12,7 +12,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  ingressClassName: nginx
+  {{- with .Values.ingress.ingressClassName }}
+  ingressClassName: {{ . | quote }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}

helm/onestop/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for the OneStop system
 name: onestop
-version: "3.0.0-beta"
+version: "3.0.0-beta2"
 
 dependencies:
   - name: cp-helm-charts

search/build.gradle

@@ -1,7 +1,6 @@
 plugins {
   // Mostly gradle 7 updated locally in buildSrc, https://plugins.gradle.org/plugin/io.forgo.keystoreplugin
   id "io.forgo.keystoreplugin" version "1.1"
-  id 'war'
 }
 
 sourceCompatibility = 11
@@ -18,7 +17,6 @@ dependencies {
   implementation("org.codehaus.groovy:groovy-json:${Versions.GROOVY}")
   implementation("org.codehaus.groovy:groovy-xml:${Versions.GROOVY}")
 
-  implementation("org.elasticsearch:elasticsearch:${Versions.ELASTIC}")
   implementation("org.elasticsearch.client:elasticsearch-rest-client:${Versions.ELASTIC}")
   implementation("org.elasticsearch.client:elasticsearch-rest-high-level-client:${Versions.ELASTIC}")
   implementation("org.springframework.boot:spring-boot-starter-web")
@@ -176,20 +174,6 @@ bootJar {
 }
 build.dependsOn bootJar
 
-// This is what the Federal On Prem expects, a war.
-bootWar {
-  from("${buildDir}/resources/main") {
-include "onestop-request-schema.json"
-into "WEB-INF/classes"
-}
-
-// This archiveBaseName is what the war will be named. Needs to reflect the URL OneStop-search, the context path tomcat will use.
-archiveBaseName.set("${rootProject.name}-${project.name}")
-archiveBaseName.set("${rootProject.name}")
-launchScript()
-}
-build.dependsOn bootWar
-
 // these environment variables would normally be set by kubernetes objects;
 // however, this is problematic running via gradle tasks (build, test, bootRun...) -- where these environment
 // variables are not set and can require different values (e.g. - keystore path/file)
@@ -221,7 +205,7 @@ jib {
 
     from {
       // base image
-      image = 'gcr.io/distroless/java:11'
+     image = 'gcr.io/distroless/java:11'
     }
     to {
       image = publish.repository()