Working solr implementation (#246)

* Remove remote-solr profile

* Remove remote-solr profile

* Add enviornment variables

* Fix inbound application

* Deploy solr

* Correct inbound name

* Changing url

* Redeploy klass solr

* Test with solr-remote profile

* Changed docker-compose to use a tagged image

* Add solr group

* Disable read only filesystem

* Change deploy image

* Remove async

* Increase memory

* Increase memory

* Revert memory increase

* Increase memory

* Change solr port

* Remove async indexing

* Make SearchIndexPopulator transactional

* Revert search changes

* Change solr url

* Remove unused url

* Change url

* Change url

* Change url

* Fix typo

* Increase memory

* Remove memory set by env

* Change log level

* Manual deploy for solr, and skip indexing

---------

Co-authored-by: Jorgen-5 <rlj@ssb.no>

Author: Jorgen-5

…rkflows/klass-solr-build-and-deploy.yaml .github/workflows/klass-solr-deploy.yaml.github/workflows/klass-solr-build-and-deploy.yaml renamed to .github/workflows/klass-solr-deploy.yaml .github/workflows/klass-solr-build-and-deploy.yaml renamed to .github/workflows/klass-solr-deploy.yaml

@@ -1,12 +1,7 @@
 name: Klass-solr deploy
 
 on:
-  push:
-    branches:
-      - nais-migration
-    paths:
-      - "klass-solr/**"
-
+  workflow_dispatch:
 
 jobs:
   deploy:
@@ -26,5 +21,5 @@ jobs:
         env:
           CLUSTER: test
           RESOURCE: .nais/test/klass-solr.yaml # same list as in changed-files step above
-          WORKLOAD_IMAGE: europe-north1-docker.pkg.dev/${{ secrets.NAIS_MANAGEMENT_PROJECT_ID }}/dapla-metadata/klass-solr:5.5.2-custom
-          VAR: image=europe-north1-docker.pkg.dev/${{ secrets.NAIS_MANAGEMENT_PROJECT_ID }}/dapla-metadata/klass-solr:5.5.2-custom
+          WORKLOAD_IMAGE: europe-north1-docker.pkg.dev/${{ secrets.NAIS_MANAGEMENT_PROJECT_ID }}/dapla-metadata/klass-solr:5.5.2
+          VAR: image=europe-north1-docker.pkg.dev/${{ secrets.NAIS_MANAGEMENT_PROJECT_ID }}/dapla-metadata/klass-solr:5.5.2

.nais/test/klass-api.yaml

@@ -18,8 +18,10 @@ spec:
     max: 1
   resources:
     requests:
-      cpu: 20m
-      memory: 400Mi
+      cpu: 400m
+      memory: 1024Mi
+    limits:
+      memory: 2048Mi
   gcp:
     sqlInstances:
       - type: POSTGRES_17
@@ -28,9 +30,10 @@ spec:
           - name: klass
   env:
     - name: SPRING_PROFILES_ACTIVE
-      value:  api, postgres, remote-solr
+      value:  api, postgres, solr-remote, skip-indexing
     - name: SPRING_DATA_SOLR_HOST
-      value: http://klass-solr:8983/solr
+      value: http://klass-solr/solr
+
 
 
   accessPolicy:

.nais/test/klass-solr.yaml

@@ -6,6 +6,10 @@ metadata:
   namespace: dapla-metadata
   labels:
     team: dapla-metadata
+  annotations:
+    nais.io/read-only-file-system: "false"
+    nais.io/run-as-user: "8983"
+    nais.io/run-as-group: "8983"
 spec:
   image: "{{ image }}"
   port: 8983
@@ -15,13 +19,15 @@ spec:
     max: 1
   resources:
     requests:
-      cpu: 20m
-      memory: 400Mi
+      cpu: 400m
+      memory: 1024Mi
+    limits:
+      memory: 2048Mi
 
   accessPolicy:
     inbound:
       rules:
-        - application: klass-solr
+        - application: klass
 
   liveness:
     path: /solr/admin/cores?action=STATUS
@@ -36,4 +42,4 @@ spec:
   startup:
     path: /solr/admin/cores?action=STATUS
     port: 8983
-    initialDelay: 60
+    initialDelay: 60

klass-api/src/main/resources/application-postgres.properties

@@ -13,7 +13,5 @@ spring.datasource.hikari.validation-timeout=3000
 
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
-logging.level.org.hibernate.SQL=DEBUG
-logging.level.org.hibernate.type.descriptor.sql=TRACE
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 

klass-api/src/main/resources/application-remote-solr.properties

@@ -1,2 +1,2 @@
-klass.env.search.solr.url=http://${klass.env.search.solr.instance}:${klass.env.search.solr.port}/solr/Klass
+klass.env.search.solr.url=http://klass-solr/solr/Klass
 klass.env.search.solr.core=Klass

klass-shared/docker-compose.yaml

@@ -109,15 +109,11 @@ services:
       POSTGRES_USER: klass
       POSTGRES_INSTANCE: postgresql
   solr:
-    build:
-      context: .
-      dockerfile: ../klass-solr/Dockerfile
+    image: klass-shared-solr:5.5.2
     container_name: solr
-    profiles: [ search ]
+    profiles: [search]
     ports:
       - "8983:8983"
-    volumes:
-      - solr_data:/opt/solr/server/solr
     mem_limit: 4g
 volumes:
   pgdata:

klass-solr/Dockerfile

@@ -1,5 +1,12 @@
 FROM solr:5.5.2
 
+USER root
+
 COPY src/main/resources/solr/embedded/Klass /opt/solr/server/solr/mycores/Klass
 
-CMD ["solr-precreate", "Klass"]
+RUN rm -rf /opt/solr/server/solr/mycores/Klass/data/index/* && \
+    chown -R solr:solr /opt/solr/server/solr/mycores/Klass
+
+USER solr
+
+CMD ["solr-precreate", "Klass"]