From 693aa3ecf4bd1261ea9c489105d80bc0e2f3420e Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Mon, 24 Jun 2024 12:31:11 -0400 Subject: [PATCH 01/10] Initial attempt at a ReShare dev environment using Kubernetes PR-1624 --- .../reshare-dev-k8s/00-reshare-namespace.yaml | 7 ++ tools/reshare-dev-k8s/README.md | 60 ++++++++++ tools/reshare-dev-k8s/db-secrets.yaml | 20 ++++ tools/reshare-dev-k8s/dockerhub-cred.yaml | 8 ++ tools/reshare-dev-k8s/enable-modules.sh | 33 ++++++ .../mod-authtoken-2.12.0/deployment.yaml | 45 ++++++++ .../mod-authtoken-2.12.0/service.yaml | 13 +++ .../mod-configuration-5.9.0/deployment.yaml | 43 ++++++++ .../mod-configuration-5.9.0/service.yaml | 13 +++ .../mod-email-1.15.3/deployment.yaml | 43 ++++++++ .../mod-email-1.15.3/service.yaml | 13 +++ .../deployment.yaml | 57 ++++++++++ .../mod-inventory-storage-25.0.4/service.yaml | 12 ++ .../mod-login-7.8.0/deployment.yaml | 43 ++++++++ .../mod-login-7.8.0/service.yaml | 13 +++ .../mod-login-saml-2.5.1/deployment.yaml | 40 +++++++ .../mod-login-saml-2.5.1/service.yaml | 12 ++ .../mod-notes-4.0.0/deployment.yaml | 43 ++++++++ .../mod-notes-4.0.0/service.yaml | 13 +++ .../deployment.yaml | 43 ++++++++ .../mod-password-validator-2.5.0/service.yaml | 13 +++ .../mod-permissions-6.2.0/deployment.yaml | 43 ++++++++ .../mod-permissions-6.2.0/service.yaml | 13 +++ .../mod-tags-1.3.0/deployment.yaml | 43 ++++++++ .../folio-modules/mod-tags-1.3.0/service.yaml | 13 +++ .../mod-users-19.0.0/deployment.yaml | 43 ++++++++ .../mod-users-19.0.0/service.yaml | 13 +++ .../mod-users-bl-7.4.0/deployment.yaml | 40 +++++++ .../mod-users-bl-7.4.0/service.yaml | 13 +++ .../inventory-storage-log4j.yaml | 45 ++++++++ tools/reshare-dev-k8s/k3d-asdf.md | 29 +++++ tools/reshare-dev-k8s/kafka-cardinal.yaml | 103 ++++++++++++++++++ .../mod-authtoken-signing-key.yaml | 9 ++ tools/reshare-dev-k8s/okapi.yaml | 40 +++++++ tools/reshare-dev-k8s/pg.yaml | 74 +++++++++++++ tools/reshare-dev-k8s/zookeeper-cardinal.yaml | 99 +++++++++++++++++ 36 files changed, 1207 insertions(+) create mode 100644 tools/reshare-dev-k8s/00-reshare-namespace.yaml create mode 100644 tools/reshare-dev-k8s/README.md create mode 100644 tools/reshare-dev-k8s/db-secrets.yaml create mode 100644 tools/reshare-dev-k8s/dockerhub-cred.yaml create mode 100755 tools/reshare-dev-k8s/enable-modules.sh create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/service.yaml create mode 100644 tools/reshare-dev-k8s/inventory-storage-log4j.yaml create mode 100644 tools/reshare-dev-k8s/k3d-asdf.md create mode 100644 tools/reshare-dev-k8s/kafka-cardinal.yaml create mode 100644 tools/reshare-dev-k8s/mod-authtoken-signing-key.yaml create mode 100644 tools/reshare-dev-k8s/okapi.yaml create mode 100644 tools/reshare-dev-k8s/pg.yaml create mode 100644 tools/reshare-dev-k8s/zookeeper-cardinal.yaml diff --git a/tools/reshare-dev-k8s/00-reshare-namespace.yaml b/tools/reshare-dev-k8s/00-reshare-namespace.yaml new file mode 100644 index 000000000..ce083e130 --- /dev/null +++ b/tools/reshare-dev-k8s/00-reshare-namespace.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + labels: + name: reshare + name: reshare diff --git a/tools/reshare-dev-k8s/README.md b/tools/reshare-dev-k8s/README.md new file mode 100644 index 000000000..b45deddd6 --- /dev/null +++ b/tools/reshare-dev-k8s/README.md @@ -0,0 +1,60 @@ +You'll need to have the `kubectl` context set to some sort of Kubernetes +cluster, I prefer KinD and k3d as they eschew VMs. To create a cluster that +forwards the necessary ports with k3d use something like: + +``` +k3d cluster create rsdev -p "9130:30130@server:0" -p "54321:30543@server:0" -p"29092:30092@server:0" -p"2181:32181@server:0" +``` + +Then you can spin up the necessary containers via the manifests in this directory: + +``` +kubectl apply -R -f . +``` + +You'll need to wait until all the deployments are available, which you can check via: + +``` +kubectl get deployment -n reshare +``` + +While you're waiting you can get some port forwarding running to make Okapi and +Postgres available where the ReShare scripts/configs expect it (on localhost +and ports 9130 and 54321 respectively). Your k8s environment may have some way +to persist this or set it while creating the cluster (as above) or you can have +a few terminals running these: + +``` +kubectl port-forward -n reshare svc/postgres 54321:5432 +kubectl port-forward -n reshare svc/okapi 9130:9130 +kubectl port-forward -n reshare svc/reshare-kafka-dbz 29092:29092 +``` + +Once everything is up and forwarded you can create a tenant and enable the +modules we have manifests for: + +``` +ls folio-modules | ./enable-modules.sh +``` + +To create a superuser for now we can use an existing Perl script. NB. it needs +the JSON and UUID::Tiny modules which, on a Debian based Linux system, are also +available via system packges `libjson-perl` and `libuuid-tiny-perl`. It can be +found here: +https://raw.githubusercontent.com/folio-org/folio-install/master/runbooks/single-server/scripts/bootstrap-superuser.pl + +``` +perl ./bootstrap-superuser.pl +``` + +(You might consider changing the username and password in the above script.) + +Finally, you'll need to update +`service/src/main/okapi/DeploymentDescriptor-template.json` in both +mod-directory and mod-rs to point at your workstation via `host.k3d.internal` +(or however you reach it via your k8s environment) rather than `10.0.2.2`. You +may also need to make that change in mod-rs' +`service/grails-app/conf/application.yml` as it explicitly lists that ip there. + +At that point you should be able to use `register_and_enable.sh` and other +ReShare scripts to configure the dev environment per usual. diff --git a/tools/reshare-dev-k8s/db-secrets.yaml b/tools/reshare-dev-k8s/db-secrets.yaml new file mode 100644 index 000000000..93f7e105b --- /dev/null +++ b/tools/reshare-dev-k8s/db-secrets.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Secret +metadata: + name: folio-db-connect + namespace: reshare +type: Opaque +stringData: + DB_DATABASE: "okapi_modules" + DB_HOST: "postgres" + DB_MAXPOOLSIZE: "20" + DB_PASSWORD: "folio_admin" + DB_PORT: "5432" + DB_USERNAME: "folio_admin" + DATASOURCE_URL: "jdbc:postgresql://postgres:5432/okapi_modules" + DATASOURCE_USERNAME: "folio_admin" + DATASOURCE_PASSWORD: "folio_admin" + EVENTS_PUBLISHER_BOOTSTRAP_SERVERS: "reshare-kafka:9092" + EVENTS_CONSUMER_BOOTSTRAP_SERVERS: "reshare-kafka:9092" + EVENTS_PUBLISHER_ZK_CONNECT: "reshare-zookeeper:2181" + EVENTS_CONSUMER_ZK_CONNECT: "reshare-zookeeper:2181" diff --git a/tools/reshare-dev-k8s/dockerhub-cred.yaml b/tools/reshare-dev-k8s/dockerhub-cred.yaml new file mode 100644 index 000000000..73d0d1ba8 --- /dev/null +++ b/tools/reshare-dev-k8s/dockerhub-cred.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +data: + .dockerconfigjson: ***REMOVED*** +kind: Secret +metadata: + name: dockerhub-cred + namespace: reshare +type: kubernetes.io/dockerconfigjson diff --git a/tools/reshare-dev-k8s/enable-modules.sh b/tools/reshare-dev-k8s/enable-modules.sh new file mode 100755 index 000000000..38df8eaa6 --- /dev/null +++ b/tools/reshare-dev-k8s/enable-modules.sh @@ -0,0 +1,33 @@ +#!/bin/bash -e + +# Loads module descriptors to Okapi at $OKAPI, creates tenant $OKAPI_TENANT, +# then deploys modules passed on STDIN and installs them for that tenant. + +OKAPI="localhost:9130" +OKAPI_TENANT=diku + +INSTALLJSON='[ ' + +echo Loading descriptors +curl -X POST -d '{ "urls": ["https://folio-registry.dev.folio.org"] }' http://${OKAPI}/_/proxy/pull/modules +echo + +echo Creating tenant +curl -X POST -d '{ "id": "'"${OKAPI_TENANT}"'", "name": "ReShare Dev Tenant" }' http://${OKAPI}/_/proxy/tenants + +while read MODULE; do + MODULE_DOMAIN=`echo ${MODULE} | tr . -` + echo Enabling ${MODULE} + curl -X POST -d '{ "instId":"'"${MODULE}"'-inst", "srvcId":"'"${MODULE}"'", "url":"http://'"${MODULE_DOMAIN}"':8081" }' http://${OKAPI}/_/discovery/modules + echo + echo + INSTALLJSON+='{ "id":"'"${MODULE}"'", "action":"enable" }, ' +done + +INSTALLJSON=${INSTALLJSON::-2} +INSTALLJSON+=' ]' + +echo Installing the following modules for tenant ${OKAPI_TENANT}: ${INSTALLJSON} +echo +curl -X POST -d "${INSTALLJSON}" http://${OKAPI}/_/proxy/tenants/${OKAPI_TENANT}/install?tenantParameters=loadSample%3Dtrue,loadReference%3Dtrue +echo diff --git a/tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/deployment.yaml new file mode 100644 index 000000000..a6339ae98 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/deployment.yaml @@ -0,0 +1,45 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-authtoken-2-12-0" + labels: + app: "mod-authtoken-2-12-0" + module: "mod-authtoken" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-authtoken-2-12-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-authtoken-2-12-0" + module: "mod-authtoken" + folio_role: "backend-module" + spec: + containers: + - name: "mod-authtoken-2-12-0" + image: "folioorg/mod-authtoken:2.12.0" + envFrom: + - secretRef: + name: mod-authtoken-signing-key + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dcache.permissions=true -Djwt.signing.key=$(SIGNING_KEY) -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/service.yaml new file mode 100644 index 000000000..48bddab69 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-authtoken-2-12-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-authtoken-2-12-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/deployment.yaml new file mode 100644 index 000000000..906814413 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-configuration-5-9-0" + labels: + app: "mod-configuration-5-9-0" + module: "mod-configuration" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-configuration-5-9-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-configuration-5-9-0" + module: "mod-configuration" + folio_role: "backend-module" + spec: + containers: + - name: "mod-configuration-5-9-0" + image: "folioorg/mod-configuration:5.9.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/service.yaml new file mode 100644 index 000000000..958764b90 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-configuration-5-9-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-configuration-5-9-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/deployment.yaml new file mode 100644 index 000000000..16ea3f285 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-email-1-15-3" + labels: + app: "mod-email-1-15-3" + module: "mod-email" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-email-1-15-3" + replicas: 1 + template: + metadata: + labels: + app: "mod-email-1-15-3" + module: "mod-email" + folio_role: "backend-module" + spec: + containers: + - name: "mod-email-1-15-3" + image: "folioorg/mod-email:1.15.3" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/service.yaml new file mode 100644 index 000000000..300afe37e --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-email-1-15-3" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-email-1-15-3" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml new file mode 100644 index 000000000..d3f8a1f86 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml @@ -0,0 +1,57 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-inventory-storage-25-0-4" + labels: + app: "mod-inventory-storage-25-0-4" + module: "mod-inventory-storage" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-inventory-storage-25-0-4" + replicas: 1 + template: + metadata: + labels: + app: "mod-inventory-storage-25-0-4" + module: "mod-inventory-storage" + folio_role: "backend-module" + spec: + containers: + - name: "mod-inventory-storage-25-0-4" + image: "folioorg/mod-inventory-storage:25.0.4" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j.configuration=file:/etc/log4j2.properties -Dlog4j2.formatMsgNoLookups=true" + - name: "KAFKA_HOST" + value: "reshare-kafka-cardinal" + - name: "KAFKA_PORT" + value: "9092" + - name: "REPLICATION_FACTOR" + value: "1" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 715827883 + volumeMounts: + - name: inventory-storage-log4j-config + mountPath: "/etc/log4j.properties" + subPath: "log4j.properties" + volumes: + - name: "inventory-storage-log4j-config" + configMap: + name: "inventory-storage-log4j-config" + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/service.yaml new file mode 100644 index 000000000..77ab4cd0a --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/service.yaml @@ -0,0 +1,12 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-inventory-storage-25-0-4" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-inventory-storage-25-0-4" + ports: + - port: 8081 diff --git a/tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/deployment.yaml new file mode 100644 index 000000000..5d866b162 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-login-7-8-0" + labels: + app: "mod-login-7-8-0" + module: "mod-login" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-login-7-8-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-login-7-8-0" + module: "mod-login" + folio_role: "backend-module" + spec: + containers: + - name: "mod-login-7-8-0" + image: "folioorg/mod-login:7.8.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/service.yaml new file mode 100644 index 000000000..884e061c7 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-login-7-8-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-login-7-8-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/deployment.yaml new file mode 100644 index 000000000..b0a721588 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/deployment.yaml @@ -0,0 +1,40 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-login-saml-2-5-1" + labels: + app: "mod-login-saml-2-5-1" + module: "mod-login-saml" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-login-saml-2-5-1" + replicas: 1 + template: + metadata: + labels: + app: "mod-login-saml-2-5-1" + module: "mod-login-saml" + folio_role: "backend-module" + spec: + containers: + - name: "mod-login-saml-2-5-1" + image: "folioorg/mod-login-saml:2.5.1" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/service.yaml new file mode 100644 index 000000000..c41f35579 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/service.yaml @@ -0,0 +1,12 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-login-saml-2-5-1" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-login-saml-2-5-1" + ports: + - port: 8081 diff --git a/tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/deployment.yaml new file mode 100644 index 000000000..c1ae9bcae --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-notes-4-0-0" + labels: + app: "mod-notes-4-0-0" + module: "mod-notes" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-notes-4-0-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-notes-4-0-0" + module: "mod-notes" + folio_role: "backend-module" + spec: + containers: + - name: "mod-notes-4-0-0" + image: "folioorg/mod-notes:4.0.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 542293850 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/service.yaml new file mode 100644 index 000000000..76910b753 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-notes-4-0-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-notes-4-0-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/deployment.yaml new file mode 100644 index 000000000..0ad62236d --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-password-validator-2-5-0" + labels: + app: "mod-password-validator-2-5-0" + module: "mod-password-validator" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-password-validator-2-5-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-password-validator-2-5-0" + module: "mod-password-validator" + folio_role: "backend-module" + spec: + containers: + - name: "mod-password-validator-2-5-0" + image: "folioorg/mod-password-validator:2.5.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=85.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 536870912 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/service.yaml new file mode 100644 index 000000000..02d8ebd55 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-password-validator-2-5-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-password-validator-2-5-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/deployment.yaml new file mode 100644 index 000000000..4f06f8fdf --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-permissions-6-2-0" + labels: + app: "mod-permissions-6-2-0" + module: "mod-permissions" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-permissions-6-2-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-permissions-6-2-0" + module: "mod-permissions" + folio_role: "backend-module" + spec: + containers: + - name: "mod-permissions-6-2-0" + image: "folioorg/mod-permissions:6.2.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 715827883 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/service.yaml new file mode 100644 index 000000000..9b8b50d19 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-permissions-6-2-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-permissions-6-2-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/deployment.yaml new file mode 100644 index 000000000..161e69b94 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-tags-1-3-0" + labels: + app: "mod-tags-1-3-0" + module: "mod-tags" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-tags-1-3-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-tags-1-3-0" + module: "mod-tags" + folio_role: "backend-module" + spec: + containers: + - name: "mod-tags-1-3-0" + image: "folioorg/mod-tags:1.3.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=85.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 542293850 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/service.yaml new file mode 100644 index 000000000..9ee36f6d1 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-tags-1-3-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-tags-1-3-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/deployment.yaml new file mode 100644 index 000000000..7439858a4 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-users-19-0-0" + labels: + app: "mod-users-19-0-0" + module: "mod-users" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-users-19-0-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-users-19-0-0" + module: "mod-users" + folio_role: "backend-module" + spec: + containers: + - name: "mod-users-19-0-0" + image: "folioorg/mod-users:19.0.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 536870912 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/service.yaml new file mode 100644 index 000000000..045105559 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-users-19-0-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-users-19-0-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/deployment.yaml new file mode 100644 index 000000000..87099717b --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/deployment.yaml @@ -0,0 +1,40 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-users-bl-7-4-0" + labels: + app: "mod-users-bl-7-4-0" + module: "mod-users-bl" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-users-bl-7-4-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-users-bl-7-4-0" + module: "mod-users-bl" + folio_role: "backend-module" + spec: + containers: + - name: "mod-users-bl-7-4-0" + image: "folioorg/mod-users-bl:7.4.0" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 536870912 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/service.yaml b/tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/service.yaml new file mode 100644 index 000000000..6bd8fc341 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-users-bl-7-4-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-users-bl-7-4-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/inventory-storage-log4j.yaml b/tools/reshare-dev-k8s/inventory-storage-log4j.yaml new file mode 100644 index 000000000..936a7db18 --- /dev/null +++ b/tools/reshare-dev-k8s/inventory-storage-log4j.yaml @@ -0,0 +1,45 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: inventory-storage-log4j-config + namespace: reshare +data: + log4j.properties: | + status = error + name = PropertiesConfig + packages = org.folio.okapi.common.logging + + filters = threshold + + filter.threshold.type = ThresholdFilter + filter.threshold.level = warn + + appenders = console + + appender.console.type = Console + appender.console.name = STDOUT + appender.console.layout.type = JSONLayout + appender.console.layout.compact = true + appender.console.layout.eventEol = true + appender.console.layout.stacktraceAsString = true + + ## Folio fields + appender.console.layout.requestId.type = KeyValuePair + appender.console.layout.requestId.key = requestId + appender.console.layout.requestId.value = $${FolioLoggingContext:requestid} + + appender.console.layout.tenantId.type = KeyValuePair + appender.console.layout.tenantId.key = tenantId + appender.console.layout.tenantId.value = $${FolioLoggingContext:tenantid} + + appender.console.layout.userId.type = KeyValuePair + appender.console.layout.userId.key = userId + appender.console.layout.userId.value = $${FolioLoggingContext:userid} + + appender.console.layout.moduleId.type = KeyValuePair + appender.console.layout.moduleId.key = moduleId + appender.console.layout.moduleId.value = $${FolioLoggingContext:moduleid} + + rootLogger.level = warn + rootLogger.appenderRefs = warn + rootLogger.appenderRef.stdout.ref = STDOUT diff --git a/tools/reshare-dev-k8s/k3d-asdf.md b/tools/reshare-dev-k8s/k3d-asdf.md new file mode 100644 index 000000000..d43628302 --- /dev/null +++ b/tools/reshare-dev-k8s/k3d-asdf.md @@ -0,0 +1,29 @@ +A quickstart summary to installing [k3d](https://k3d.io) using the +[asdf](https://asdf-vm.com/) version manager. + +Checkout asdf into `~/.asdf`: +``` +git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.14.0 +``` + +At the end of .bashrc add: +``` +. "$HOME/.asdf/asdf.sh" +. "$HOME/.asdf/completions/asdf.bash" +``` + +Then you can install k3d: + +``` +asdf plugin-add k3d +asdf install k3d latest +asdf global k3d latest +``` + +You might also consider k9s, sort of like top for all the things kubectl shows: + +``` +asdf plugin-add k9s +asdf install k9s latest +asdf global k9s latest +``` diff --git a/tools/reshare-dev-k8s/kafka-cardinal.yaml b/tools/reshare-dev-k8s/kafka-cardinal.yaml new file mode 100644 index 000000000..66cdcf53b --- /dev/null +++ b/tools/reshare-dev-k8s/kafka-cardinal.yaml @@ -0,0 +1,103 @@ +--- +# kafka pvc +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: reshare-kafka-cardinal-data + namespace: reshare + labels: + app: reshare-kafka-cardinal +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 5Gi +--- +# kafka pvc logs +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: reshare-kafka-cardinal-logs + namespace: reshare + labels: + app: reshare-kafka-cardinal +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi +--- +# kakfa deployment +apiVersion: apps/v1 +kind: Deployment +metadata: + name: reshare-kafka-cardinal + namespace: reshare +spec: + selector: + matchLabels: + app: reshare-kafka-cardinal + strategy: + type: Recreate + template: + metadata: + labels: + app: reshare-kafka-cardinal + spec: + # allow non root user access to volume + securityContext: + fsGroup: 1001 + containers: + - image: debezium/kafka:1.7 + name: reshare-kafka-cardinal + ports: + - containerPort: 9092 + name: kafka-internal + - containerPort: 29092 + name: kafka-external + env: + - name: KAFKA_LISTENERS + value: "INTERNAL://:9092" + - name: KAFKA_ADVERTISED_LISTENERS + value: "INTERNAL://reshare-kafka-cardinal:9092" + - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP + value: "INTERNAL:PLAINTEXT" + - name: KAFKA_INTER_BROKER_LISTENER_NAME + value: "INTERNAL" + - name: ZOOKEEPER_CONNECT + value: "reshare-zookeeper-cardinal:2181" + volumeMounts: + - name: kafka-persistent-storage + mountPath: /kafka/data + - name: kafka-persistent-logs + mountPath: /kafka/logs + volumes: + - name: kafka-persistent-storage + persistentVolumeClaim: + claimName: reshare-kafka-cardinal-data + - name: kafka-persistent-logs + persistentVolumeClaim: + claimName: reshare-kafka-cardinal-logs + imagePullSecrets: + - name: "dockerhub-cred" +--- +# kafka service +apiVersion: v1 +kind: Service +metadata: + name: reshare-kafka-cardinal + namespace: reshare +spec: + type: "NodePort" + ports: + - name: reshare-kafka-cardinal-internal + port: 9092 + targetPort: 9092 + protocol: TCP + - name: reshare-kafka-cardinal-external + port: 29092 + nodePort: 30092 + selector: + app: reshare-kafka-cardinal diff --git a/tools/reshare-dev-k8s/mod-authtoken-signing-key.yaml b/tools/reshare-dev-k8s/mod-authtoken-signing-key.yaml new file mode 100644 index 000000000..12766a8d3 --- /dev/null +++ b/tools/reshare-dev-k8s/mod-authtoken-signing-key.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Secret +metadata: + name: mod-authtoken-signing-key + namespace: reshare +type: Opaque +stringData: + SIGNING_KEY: "892bner32o89cf89n" + diff --git a/tools/reshare-dev-k8s/okapi.yaml b/tools/reshare-dev-k8s/okapi.yaml new file mode 100644 index 000000000..f057e611e --- /dev/null +++ b/tools/reshare-dev-k8s/okapi.yaml @@ -0,0 +1,40 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "okapi" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "okapi" + replicas: 1 + template: + metadata: + labels: + app: "okapi" + spec: + containers: + - name: okapi + image: folioorg/okapi:4.14.1 + args: + - dev + env: + - name: JAVA_OPTIONS + value: "-Djava.awt.headless=true -Dstorage=postgres -Dpostgres_host=postgres -Dpostgres_port=5432 -Dpostgres_username=folio_admin -Dpostgres_password=folio_admin -Dpostgres_database=okapi_modules -Dhost=okapi -Dokapiurl=http://okapi:9130 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 9130 + protocol: TCP +--- +apiVersion: v1 +kind: Service +metadata: + name: "okapi" + namespace: reshare +spec: + type: "NodePort" + selector: + app: "okapi" + ports: + - name: okapi + port: 9130 + nodePort: 30130 \ No newline at end of file diff --git a/tools/reshare-dev-k8s/pg.yaml b/tools/reshare-dev-k8s/pg.yaml new file mode 100644 index 000000000..5c255c549 --- /dev/null +++ b/tools/reshare-dev-k8s/pg.yaml @@ -0,0 +1,74 @@ + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: postgres + namespace: reshare +spec: + selector: + matchLabels: + app: postgres + template: + metadata: + labels: + app: postgres + spec: + containers: + - name: postgres + image: 'postgres:14' + ports: + - containerPort: 5432 + env: + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: folio-db-connect + key: DB_PASSWORD + - name: POSTGRES_USER + valueFrom: + secretKeyRef: + name: folio-db-connect + key: DB_USERNAME + # - name: POSTGRES_DATABASE + - name: POSTGRES_DB + valueFrom: + secretKeyRef: + name: folio-db-connect + key: DB_DATABASE + volumeMounts: + - mountPath: /var/lib/postgresql/data + name: postgresdata + volumes: + - name: postgresdata + persistentVolumeClaim: + claimName: postgres-volume-claim +--- +apiVersion: v1 +kind: Service +metadata: + name: postgres + namespace: reshare + labels: + app: postgres +spec: + type: "NodePort" + selector: + app: "postgres" + ports: + - name: postgres + port: 5432 + nodePort: 30543 +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: postgres-volume-claim + namespace: reshare + labels: + app: postgres +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 2Gi \ No newline at end of file diff --git a/tools/reshare-dev-k8s/zookeeper-cardinal.yaml b/tools/reshare-dev-k8s/zookeeper-cardinal.yaml new file mode 100644 index 000000000..40f74de4f --- /dev/null +++ b/tools/reshare-dev-k8s/zookeeper-cardinal.yaml @@ -0,0 +1,99 @@ +--- +# zookeeper pvc +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: reshare-zookeeper-cardinal-pv-claim + namespace: reshare + labels: + app: reshare-zookeeper-cardinal +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 5Gi +--- +# zookeeper log +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: reshare-zookeeper-cardinal-pv-logs + namespace: reshare + labels: + app: reshare-zookeeper-cardinal +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi +--- +# zookeeper deployment +apiVersion: apps/v1 +kind: Deployment +metadata: + name: reshare-zookeeper-cardinal + namespace: reshare +spec: + selector: + matchLabels: + app: reshare-zookeeper-cardinal + strategy: + type: Recreate + template: + metadata: + labels: + app: reshare-zookeeper-cardinal + spec: + # allow non root user access to volume + securityContext: + fsGroup: 1001 + containers: + - image: debezium/zookeeper:1.7 + name: reshare-zookeeper-cardinal + ports: + - containerPort: 2181 + name: client + - containerPort: 2888 + name: election + - containerPort: 3888 + name: server + volumeMounts: + - name: reshare-zookeeper-cardinal-persistent-storage + mountPath: /zookeeper/data + - name: reshare-zookeeper-cardinal-persistent-logs + mountPath: /zookeeper/txns + volumes: + - name: reshare-zookeeper-cardinal-persistent-storage + persistentVolumeClaim: + claimName: reshare-zookeeper-cardinal-pv-claim + - name: reshare-zookeeper-cardinal-persistent-logs + persistentVolumeClaim: + claimName: reshare-zookeeper-cardinal-pv-logs + imagePullSecrets: + - name: "dockerhub-cred" +--- +# zookeeper service +apiVersion: v1 +kind: Service +metadata: + name: reshare-zookeeper-cardinal + namespace: reshare +spec: + type: "NodePort" + ports: + - port: 2181 + nodePort: 32181 + protocol: TCP + name: client + - port: 2888 + targetPort: 2888 + protocol: TCP + name: election + - port: 3888 + targetPort: 3888 + protocol: TCP + name: server + selector: + app: reshare-zookeeper-cardinal From e9c6a6adc8b18e790102791d7273243e92faee0b Mon Sep 17 00:00:00 2001 From: Ian Hardy Date: Mon, 24 Jun 2024 14:36:18 -0400 Subject: [PATCH 02/10] update dockerhub-cred.yaml --- tools/reshare-dev-k8s/dockerhub-cred.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/reshare-dev-k8s/dockerhub-cred.yaml b/tools/reshare-dev-k8s/dockerhub-cred.yaml index 73d0d1ba8..a1e1796a7 100644 --- a/tools/reshare-dev-k8s/dockerhub-cred.yaml +++ b/tools/reshare-dev-k8s/dockerhub-cred.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - .dockerconfigjson: ***REMOVED*** + .dockerconfigjson: **REMOVED** kind: Secret metadata: name: dockerhub-cred From a04cf9b1e0b17782bfb7040db6907f62a196a323 Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Mon, 24 Jun 2024 15:02:56 -0400 Subject: [PATCH 03/10] Remove dockerhub-cred.yaml entirely ...it does seem to still be able to deploy the folio-modules manifests that include it without it present --- tools/reshare-dev-k8s/dockerhub-cred.yaml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 tools/reshare-dev-k8s/dockerhub-cred.yaml diff --git a/tools/reshare-dev-k8s/dockerhub-cred.yaml b/tools/reshare-dev-k8s/dockerhub-cred.yaml deleted file mode 100644 index a1e1796a7..000000000 --- a/tools/reshare-dev-k8s/dockerhub-cred.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -data: - .dockerconfigjson: **REMOVED** -kind: Secret -metadata: - name: dockerhub-cred - namespace: reshare -type: kubernetes.io/dockerconfigjson From dec32296b35a1381d270cf98dd99827d3f04577d Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Mon, 15 Jul 2024 16:28:21 -0400 Subject: [PATCH 04/10] Properly advertise Kafka listener and clean up env --- tools/reshare-dev-k8s/README.md | 2 +- tools/reshare-dev-k8s/db-secrets.yaml | 8 ++++---- tools/reshare-dev-k8s/kafka-cardinal.yaml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/reshare-dev-k8s/README.md b/tools/reshare-dev-k8s/README.md index b45deddd6..314b5667b 100644 --- a/tools/reshare-dev-k8s/README.md +++ b/tools/reshare-dev-k8s/README.md @@ -27,7 +27,7 @@ a few terminals running these: ``` kubectl port-forward -n reshare svc/postgres 54321:5432 kubectl port-forward -n reshare svc/okapi 9130:9130 -kubectl port-forward -n reshare svc/reshare-kafka-dbz 29092:29092 +kubectl port-forward -n reshare svc/reshare-kafka-cardinal 29092:29092 ``` Once everything is up and forwarded you can create a tenant and enable the diff --git a/tools/reshare-dev-k8s/db-secrets.yaml b/tools/reshare-dev-k8s/db-secrets.yaml index 93f7e105b..dce0b7ca9 100644 --- a/tools/reshare-dev-k8s/db-secrets.yaml +++ b/tools/reshare-dev-k8s/db-secrets.yaml @@ -14,7 +14,7 @@ stringData: DATASOURCE_URL: "jdbc:postgresql://postgres:5432/okapi_modules" DATASOURCE_USERNAME: "folio_admin" DATASOURCE_PASSWORD: "folio_admin" - EVENTS_PUBLISHER_BOOTSTRAP_SERVERS: "reshare-kafka:9092" - EVENTS_CONSUMER_BOOTSTRAP_SERVERS: "reshare-kafka:9092" - EVENTS_PUBLISHER_ZK_CONNECT: "reshare-zookeeper:2181" - EVENTS_CONSUMER_ZK_CONNECT: "reshare-zookeeper:2181" + EVENTS_PUBLISHER_BOOTSTRAP_SERVERS: "reshare-kafka-cardinal:9092" + EVENTS_CONSUMER_BOOTSTRAP_SERVERS: "reshare-kafka-cardinal:9092" + EVENTS_PUBLISHER_ZK_CONNECT: "reshare-zookeeper-cardinal:2181" + EVENTS_CONSUMER_ZK_CONNECT: "reshare-zookeeper-cardinal:2181" diff --git a/tools/reshare-dev-k8s/kafka-cardinal.yaml b/tools/reshare-dev-k8s/kafka-cardinal.yaml index 66cdcf53b..42e24ea17 100644 --- a/tools/reshare-dev-k8s/kafka-cardinal.yaml +++ b/tools/reshare-dev-k8s/kafka-cardinal.yaml @@ -59,11 +59,11 @@ spec: name: kafka-external env: - name: KAFKA_LISTENERS - value: "INTERNAL://:9092" + value: "INTERNAL://:9092,EXTERNAL://:29092" - name: KAFKA_ADVERTISED_LISTENERS - value: "INTERNAL://reshare-kafka-cardinal:9092" + value: "INTERNAL://reshare-kafka-cardinal:9092,EXTERNAL://localhost:29092" - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP - value: "INTERNAL:PLAINTEXT" + value: "INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT" - name: KAFKA_INTER_BROKER_LISTENER_NAME value: "INTERNAL" - name: ZOOKEEPER_CONNECT From e606055d0a25bcb69ecbfd3a084d937ac0699e9d Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Fri, 2 Aug 2024 14:48:26 -0400 Subject: [PATCH 05/10] Upgrade okapi --- tools/reshare-dev-k8s/okapi.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/reshare-dev-k8s/okapi.yaml b/tools/reshare-dev-k8s/okapi.yaml index f057e611e..c6b70efeb 100644 --- a/tools/reshare-dev-k8s/okapi.yaml +++ b/tools/reshare-dev-k8s/okapi.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: okapi - image: folioorg/okapi:4.14.1 + image: folioorg/okapi:5.3.0 args: - dev env: @@ -37,4 +37,4 @@ spec: ports: - name: okapi port: 9130 - nodePort: 30130 \ No newline at end of file + nodePort: 30130 From a419653690e0887d9bbb6862eb4e53be88705628 Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Thu, 15 Aug 2024 15:14:36 -0400 Subject: [PATCH 06/10] Separate FOLIO module manifests by release --- tools/reshare-dev-k8s/README.md | 7 ++- .../mod-authtoken-2.12.0/deployment.yaml | 0 .../mod-authtoken-2.12.0/service.yaml | 0 .../mod-configuration-5.9.0/deployment.yaml | 0 .../mod-configuration-5.9.0/service.yaml | 0 .../mod-email-1.15.3/deployment.yaml | 0 .../mod-email-1.15.3/service.yaml | 0 .../deployment.yaml | 0 .../mod-inventory-storage-25.0.4/service.yaml | 0 .../mod-login-7.8.0/deployment.yaml | 0 .../mod-login-7.8.0/service.yaml | 0 .../mod-login-saml-2.5.1/deployment.yaml | 0 .../mod-login-saml-2.5.1/service.yaml | 0 .../mod-notes-4.0.0/deployment.yaml | 0 .../mod-notes-4.0.0/service.yaml | 0 .../deployment.yaml | 0 .../mod-password-validator-2.5.0/service.yaml | 0 .../mod-permissions-6.2.0/deployment.yaml | 0 .../mod-permissions-6.2.0/service.yaml | 0 .../mod-tags-1.3.0/deployment.yaml | 0 .../folio-modules/mod-tags-1.3.0/service.yaml | 0 .../mod-users-19.0.0/deployment.yaml | 0 .../mod-users-19.0.0/service.yaml | 0 .../mod-users-bl-7.4.0/deployment.yaml | 0 .../mod-users-bl-7.4.0/service.yaml | 0 .../mod-authtoken-2.12.0/deployment.yaml | 45 +++++++++++++++ .../mod-authtoken-2.12.0/service.yaml | 13 +++++ .../mod-configuration-5.9.0/deployment.yaml | 43 ++++++++++++++ .../mod-configuration-5.9.0/service.yaml | 13 +++++ .../mod-email-1.15.3/deployment.yaml | 43 ++++++++++++++ .../mod-email-1.15.3/service.yaml | 13 +++++ .../deployment.yaml | 57 +++++++++++++++++++ .../mod-inventory-storage-25.0.4/service.yaml | 12 ++++ .../mod-login-7.8.0/deployment.yaml | 43 ++++++++++++++ .../mod-login-7.8.0/service.yaml | 13 +++++ .../mod-login-saml-2.5.1/deployment.yaml | 40 +++++++++++++ .../mod-login-saml-2.5.1/service.yaml | 12 ++++ .../mod-notes-4.0.0/deployment.yaml | 43 ++++++++++++++ .../mod-notes-4.0.0/service.yaml | 13 +++++ .../deployment.yaml | 43 ++++++++++++++ .../mod-password-validator-2.5.0/service.yaml | 13 +++++ .../mod-permissions-6.2.0/deployment.yaml | 43 ++++++++++++++ .../mod-permissions-6.2.0/service.yaml | 13 +++++ .../mod-tags-1.3.0/deployment.yaml | 43 ++++++++++++++ .../mod-tags-1.3.0/service.yaml | 13 +++++ .../mod-users-19.0.0/deployment.yaml | 43 ++++++++++++++ .../mod-users-19.0.0/service.yaml | 13 +++++ .../mod-users-bl-7.4.0/deployment.yaml | 40 +++++++++++++ .../mod-users-bl-7.4.0/service.yaml | 13 +++++ .../{ => manifests}/00-reshare-namespace.yaml | 0 .../{ => manifests}/db-secrets.yaml | 0 .../inventory-storage-log4j.yaml | 0 .../{ => manifests}/kafka-cardinal.yaml | 0 .../mod-authtoken-signing-key.yaml | 0 .../{ => manifests}/okapi.yaml | 0 tools/reshare-dev-k8s/{ => manifests}/pg.yaml | 0 .../{ => manifests}/zookeeper-cardinal.yaml | 0 57 files changed, 684 insertions(+), 3 deletions(-) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-authtoken-2.12.0/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-authtoken-2.12.0/service.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-configuration-5.9.0/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-configuration-5.9.0/service.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-email-1.15.3/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-email-1.15.3/service.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-inventory-storage-25.0.4/service.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-login-7.8.0/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-login-7.8.0/service.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-login-saml-2.5.1/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-login-saml-2.5.1/service.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-notes-4.0.0/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-notes-4.0.0/service.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-password-validator-2.5.0/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-password-validator-2.5.0/service.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-permissions-6.2.0/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-permissions-6.2.0/service.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-tags-1.3.0/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-tags-1.3.0/service.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-users-19.0.0/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-users-19.0.0/service.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-users-bl-7.4.0/deployment.yaml (100%) rename tools/reshare-dev-k8s/{ => folio-modules-poppy}/folio-modules/mod-users-bl-7.4.0/service.yaml (100%) create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-authtoken-2.12.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-authtoken-2.12.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-configuration-5.9.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-configuration-5.9.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-email-1.15.3/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-email-1.15.3/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-login-7.8.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-login-7.8.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-login-saml-2.5.1/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-login-saml-2.5.1/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-permissions-6.2.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-permissions-6.2.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-users-bl-7.4.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/mod-users-bl-7.4.0/service.yaml rename tools/reshare-dev-k8s/{ => manifests}/00-reshare-namespace.yaml (100%) rename tools/reshare-dev-k8s/{ => manifests}/db-secrets.yaml (100%) rename tools/reshare-dev-k8s/{ => manifests}/inventory-storage-log4j.yaml (100%) rename tools/reshare-dev-k8s/{ => manifests}/kafka-cardinal.yaml (100%) rename tools/reshare-dev-k8s/{ => manifests}/mod-authtoken-signing-key.yaml (100%) rename tools/reshare-dev-k8s/{ => manifests}/okapi.yaml (100%) rename tools/reshare-dev-k8s/{ => manifests}/pg.yaml (100%) rename tools/reshare-dev-k8s/{ => manifests}/zookeeper-cardinal.yaml (100%) diff --git a/tools/reshare-dev-k8s/README.md b/tools/reshare-dev-k8s/README.md index 314b5667b..3c12f3176 100644 --- a/tools/reshare-dev-k8s/README.md +++ b/tools/reshare-dev-k8s/README.md @@ -6,10 +6,11 @@ forwards the necessary ports with k3d use something like: k3d cluster create rsdev -p "9130:30130@server:0" -p "54321:30543@server:0" -p"29092:30092@server:0" -p"2181:32181@server:0" ``` -Then you can spin up the necessary containers via the manifests in this directory: +Then you can spin up the necessary containers via the manifests (choosing FOLIO version as appropriate): ``` -kubectl apply -R -f . +kubectl apply -R -f manifests +kubectl apply -R -f folio-modules-poppy ``` You'll need to wait until all the deployments are available, which you can check via: @@ -34,7 +35,7 @@ Once everything is up and forwarded you can create a tenant and enable the modules we have manifests for: ``` -ls folio-modules | ./enable-modules.sh +ls folio-modules-poppy | ./enable-modules.sh ``` To create a superuser for now we can use an existing Perl script. NB. it needs diff --git a/tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-authtoken-2.12.0/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-configuration-5.9.0/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-email-1.15.3/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-inventory-storage-25.0.4/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-login-7.8.0/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-login-saml-2.5.1/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-notes-4.0.0/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-password-validator-2.5.0/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-permissions-6.2.0/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-tags-1.3.0/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-users-19.0.0/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/deployment.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/deployment.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/deployment.yaml diff --git a/tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/service.yaml similarity index 100% rename from tools/reshare-dev-k8s/folio-modules/mod-users-bl-7.4.0/service.yaml rename to tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-authtoken-2.12.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-authtoken-2.12.0/deployment.yaml new file mode 100644 index 000000000..a6339ae98 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-authtoken-2.12.0/deployment.yaml @@ -0,0 +1,45 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-authtoken-2-12-0" + labels: + app: "mod-authtoken-2-12-0" + module: "mod-authtoken" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-authtoken-2-12-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-authtoken-2-12-0" + module: "mod-authtoken" + folio_role: "backend-module" + spec: + containers: + - name: "mod-authtoken-2-12-0" + image: "folioorg/mod-authtoken:2.12.0" + envFrom: + - secretRef: + name: mod-authtoken-signing-key + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dcache.permissions=true -Djwt.signing.key=$(SIGNING_KEY) -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-authtoken-2.12.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-authtoken-2.12.0/service.yaml new file mode 100644 index 000000000..48bddab69 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-authtoken-2.12.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-authtoken-2-12-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-authtoken-2-12-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-configuration-5.9.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-configuration-5.9.0/deployment.yaml new file mode 100644 index 000000000..906814413 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-configuration-5.9.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-configuration-5-9-0" + labels: + app: "mod-configuration-5-9-0" + module: "mod-configuration" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-configuration-5-9-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-configuration-5-9-0" + module: "mod-configuration" + folio_role: "backend-module" + spec: + containers: + - name: "mod-configuration-5-9-0" + image: "folioorg/mod-configuration:5.9.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-configuration-5.9.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-configuration-5.9.0/service.yaml new file mode 100644 index 000000000..958764b90 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-configuration-5.9.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-configuration-5-9-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-configuration-5-9-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-email-1.15.3/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-email-1.15.3/deployment.yaml new file mode 100644 index 000000000..16ea3f285 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-email-1.15.3/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-email-1-15-3" + labels: + app: "mod-email-1-15-3" + module: "mod-email" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-email-1-15-3" + replicas: 1 + template: + metadata: + labels: + app: "mod-email-1-15-3" + module: "mod-email" + folio_role: "backend-module" + spec: + containers: + - name: "mod-email-1-15-3" + image: "folioorg/mod-email:1.15.3" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-email-1.15.3/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-email-1.15.3/service.yaml new file mode 100644 index 000000000..300afe37e --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-email-1.15.3/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-email-1-15-3" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-email-1-15-3" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/deployment.yaml new file mode 100644 index 000000000..d3f8a1f86 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/deployment.yaml @@ -0,0 +1,57 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-inventory-storage-25-0-4" + labels: + app: "mod-inventory-storage-25-0-4" + module: "mod-inventory-storage" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-inventory-storage-25-0-4" + replicas: 1 + template: + metadata: + labels: + app: "mod-inventory-storage-25-0-4" + module: "mod-inventory-storage" + folio_role: "backend-module" + spec: + containers: + - name: "mod-inventory-storage-25-0-4" + image: "folioorg/mod-inventory-storage:25.0.4" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j.configuration=file:/etc/log4j2.properties -Dlog4j2.formatMsgNoLookups=true" + - name: "KAFKA_HOST" + value: "reshare-kafka-cardinal" + - name: "KAFKA_PORT" + value: "9092" + - name: "REPLICATION_FACTOR" + value: "1" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 715827883 + volumeMounts: + - name: inventory-storage-log4j-config + mountPath: "/etc/log4j.properties" + subPath: "log4j.properties" + volumes: + - name: "inventory-storage-log4j-config" + configMap: + name: "inventory-storage-log4j-config" + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/service.yaml new file mode 100644 index 000000000..77ab4cd0a --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/service.yaml @@ -0,0 +1,12 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-inventory-storage-25-0-4" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-inventory-storage-25-0-4" + ports: + - port: 8081 diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-7.8.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-7.8.0/deployment.yaml new file mode 100644 index 000000000..5d866b162 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-7.8.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-login-7-8-0" + labels: + app: "mod-login-7-8-0" + module: "mod-login" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-login-7-8-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-login-7-8-0" + module: "mod-login" + folio_role: "backend-module" + spec: + containers: + - name: "mod-login-7-8-0" + image: "folioorg/mod-login:7.8.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-7.8.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-7.8.0/service.yaml new file mode 100644 index 000000000..884e061c7 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-7.8.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-login-7-8-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-login-7-8-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-saml-2.5.1/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-saml-2.5.1/deployment.yaml new file mode 100644 index 000000000..b0a721588 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-saml-2.5.1/deployment.yaml @@ -0,0 +1,40 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-login-saml-2-5-1" + labels: + app: "mod-login-saml-2-5-1" + module: "mod-login-saml" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-login-saml-2-5-1" + replicas: 1 + template: + metadata: + labels: + app: "mod-login-saml-2-5-1" + module: "mod-login-saml" + folio_role: "backend-module" + spec: + containers: + - name: "mod-login-saml-2-5-1" + image: "folioorg/mod-login-saml:2.5.1" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-saml-2.5.1/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-saml-2.5.1/service.yaml new file mode 100644 index 000000000..c41f35579 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-login-saml-2.5.1/service.yaml @@ -0,0 +1,12 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-login-saml-2-5-1" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-login-saml-2-5-1" + ports: + - port: 8081 diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/deployment.yaml new file mode 100644 index 000000000..c1ae9bcae --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-notes-4-0-0" + labels: + app: "mod-notes-4-0-0" + module: "mod-notes" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-notes-4-0-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-notes-4-0-0" + module: "mod-notes" + folio_role: "backend-module" + spec: + containers: + - name: "mod-notes-4-0-0" + image: "folioorg/mod-notes:4.0.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 542293850 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/service.yaml new file mode 100644 index 000000000..76910b753 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-notes-4-0-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-notes-4-0-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/deployment.yaml new file mode 100644 index 000000000..0ad62236d --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-password-validator-2-5-0" + labels: + app: "mod-password-validator-2-5-0" + module: "mod-password-validator" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-password-validator-2-5-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-password-validator-2-5-0" + module: "mod-password-validator" + folio_role: "backend-module" + spec: + containers: + - name: "mod-password-validator-2-5-0" + image: "folioorg/mod-password-validator:2.5.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=85.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 536870912 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/service.yaml new file mode 100644 index 000000000..02d8ebd55 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-password-validator-2-5-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-password-validator-2-5-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-permissions-6.2.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-permissions-6.2.0/deployment.yaml new file mode 100644 index 000000000..4f06f8fdf --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-permissions-6.2.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-permissions-6-2-0" + labels: + app: "mod-permissions-6-2-0" + module: "mod-permissions" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-permissions-6-2-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-permissions-6-2-0" + module: "mod-permissions" + folio_role: "backend-module" + spec: + containers: + - name: "mod-permissions-6-2-0" + image: "folioorg/mod-permissions:6.2.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 715827883 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-permissions-6.2.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-permissions-6.2.0/service.yaml new file mode 100644 index 000000000..9b8b50d19 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-permissions-6.2.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-permissions-6-2-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-permissions-6-2-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/deployment.yaml new file mode 100644 index 000000000..161e69b94 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-tags-1-3-0" + labels: + app: "mod-tags-1-3-0" + module: "mod-tags" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-tags-1-3-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-tags-1-3-0" + module: "mod-tags" + folio_role: "backend-module" + spec: + containers: + - name: "mod-tags-1-3-0" + image: "folioorg/mod-tags:1.3.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=85.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 542293850 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/service.yaml new file mode 100644 index 000000000..9ee36f6d1 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-tags-1-3-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-tags-1-3-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/deployment.yaml new file mode 100644 index 000000000..7439858a4 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-users-19-0-0" + labels: + app: "mod-users-19-0-0" + module: "mod-users" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-users-19-0-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-users-19-0-0" + module: "mod-users" + folio_role: "backend-module" + spec: + containers: + - name: "mod-users-19-0-0" + image: "folioorg/mod-users:19.0.0" + envFrom: + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 536870912 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/service.yaml new file mode 100644 index 000000000..045105559 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-users-19-0-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-users-19-0-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-bl-7.4.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-bl-7.4.0/deployment.yaml new file mode 100644 index 000000000..87099717b --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-bl-7.4.0/deployment.yaml @@ -0,0 +1,40 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-users-bl-7-4-0" + labels: + app: "mod-users-bl-7-4-0" + module: "mod-users-bl" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-users-bl-7-4-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-users-bl-7-4-0" + module: "mod-users-bl" + folio_role: "backend-module" + spec: + containers: + - name: "mod-users-bl-7-4-0" + image: "folioorg/mod-users-bl:7.4.0" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 536870912 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-bl-7.4.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-bl-7.4.0/service.yaml new file mode 100644 index 000000000..6bd8fc341 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-bl-7.4.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-users-bl-7-4-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-users-bl-7-4-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/00-reshare-namespace.yaml b/tools/reshare-dev-k8s/manifests/00-reshare-namespace.yaml similarity index 100% rename from tools/reshare-dev-k8s/00-reshare-namespace.yaml rename to tools/reshare-dev-k8s/manifests/00-reshare-namespace.yaml diff --git a/tools/reshare-dev-k8s/db-secrets.yaml b/tools/reshare-dev-k8s/manifests/db-secrets.yaml similarity index 100% rename from tools/reshare-dev-k8s/db-secrets.yaml rename to tools/reshare-dev-k8s/manifests/db-secrets.yaml diff --git a/tools/reshare-dev-k8s/inventory-storage-log4j.yaml b/tools/reshare-dev-k8s/manifests/inventory-storage-log4j.yaml similarity index 100% rename from tools/reshare-dev-k8s/inventory-storage-log4j.yaml rename to tools/reshare-dev-k8s/manifests/inventory-storage-log4j.yaml diff --git a/tools/reshare-dev-k8s/kafka-cardinal.yaml b/tools/reshare-dev-k8s/manifests/kafka-cardinal.yaml similarity index 100% rename from tools/reshare-dev-k8s/kafka-cardinal.yaml rename to tools/reshare-dev-k8s/manifests/kafka-cardinal.yaml diff --git a/tools/reshare-dev-k8s/mod-authtoken-signing-key.yaml b/tools/reshare-dev-k8s/manifests/mod-authtoken-signing-key.yaml similarity index 100% rename from tools/reshare-dev-k8s/mod-authtoken-signing-key.yaml rename to tools/reshare-dev-k8s/manifests/mod-authtoken-signing-key.yaml diff --git a/tools/reshare-dev-k8s/okapi.yaml b/tools/reshare-dev-k8s/manifests/okapi.yaml similarity index 100% rename from tools/reshare-dev-k8s/okapi.yaml rename to tools/reshare-dev-k8s/manifests/okapi.yaml diff --git a/tools/reshare-dev-k8s/pg.yaml b/tools/reshare-dev-k8s/manifests/pg.yaml similarity index 100% rename from tools/reshare-dev-k8s/pg.yaml rename to tools/reshare-dev-k8s/manifests/pg.yaml diff --git a/tools/reshare-dev-k8s/zookeeper-cardinal.yaml b/tools/reshare-dev-k8s/manifests/zookeeper-cardinal.yaml similarity index 100% rename from tools/reshare-dev-k8s/zookeeper-cardinal.yaml rename to tools/reshare-dev-k8s/manifests/zookeeper-cardinal.yaml From 376d40422218936255b99f8e0ab7541d0ee428f0 Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Fri, 16 Aug 2024 16:11:26 -0400 Subject: [PATCH 07/10] Delete redundant copy of dir. --- .../mod-authtoken-2.12.0/deployment.yaml | 45 --------------- .../mod-authtoken-2.12.0/service.yaml | 13 ----- .../mod-configuration-5.9.0/deployment.yaml | 43 -------------- .../mod-configuration-5.9.0/service.yaml | 13 ----- .../mod-email-1.15.3/deployment.yaml | 43 -------------- .../mod-email-1.15.3/service.yaml | 13 ----- .../deployment.yaml | 57 ------------------- .../mod-inventory-storage-25.0.4/service.yaml | 12 ---- .../mod-login-7.8.0/deployment.yaml | 43 -------------- .../mod-login-7.8.0/service.yaml | 13 ----- .../mod-login-saml-2.5.1/deployment.yaml | 40 ------------- .../mod-login-saml-2.5.1/service.yaml | 12 ---- .../mod-notes-4.0.0/deployment.yaml | 43 -------------- .../mod-notes-4.0.0/service.yaml | 13 ----- .../deployment.yaml | 43 -------------- .../mod-password-validator-2.5.0/service.yaml | 13 ----- .../mod-permissions-6.2.0/deployment.yaml | 43 -------------- .../mod-permissions-6.2.0/service.yaml | 13 ----- .../mod-tags-1.3.0/deployment.yaml | 43 -------------- .../folio-modules/mod-tags-1.3.0/service.yaml | 13 ----- .../mod-users-19.0.0/deployment.yaml | 43 -------------- .../mod-users-19.0.0/service.yaml | 13 ----- .../mod-users-bl-7.4.0/deployment.yaml | 40 ------------- .../mod-users-bl-7.4.0/service.yaml | 13 ----- 24 files changed, 680 deletions(-) delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/service.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/service.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/service.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/service.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/service.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/service.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/service.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/service.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/service.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/service.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/service.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/deployment.yaml delete mode 100644 tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/service.yaml diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/deployment.yaml deleted file mode 100644 index a6339ae98..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/deployment.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-authtoken-2-12-0" - labels: - app: "mod-authtoken-2-12-0" - module: "mod-authtoken" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-authtoken-2-12-0" - replicas: 1 - template: - metadata: - labels: - app: "mod-authtoken-2-12-0" - module: "mod-authtoken" - folio_role: "backend-module" - spec: - containers: - - name: "mod-authtoken-2-12-0" - image: "folioorg/mod-authtoken:2.12.0" - envFrom: - - secretRef: - name: mod-authtoken-signing-key - - secretRef: - name: folio-db-connect - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=66.0 -Dcache.permissions=true -Djwt.signing.key=$(SIGNING_KEY) -Dlog4j2.formatMsgNoLookups=true" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 357913941 - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/service.yaml deleted file mode 100644 index 48bddab69..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-authtoken-2.12.0/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-authtoken-2-12-0" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-authtoken-2-12-0" - ports: - - port: 8081 - name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/deployment.yaml deleted file mode 100644 index 906814413..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/deployment.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-configuration-5-9-0" - labels: - app: "mod-configuration-5-9-0" - module: "mod-configuration" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-configuration-5-9-0" - replicas: 1 - template: - metadata: - labels: - app: "mod-configuration-5-9-0" - module: "mod-configuration" - folio_role: "backend-module" - spec: - containers: - - name: "mod-configuration-5-9-0" - image: "folioorg/mod-configuration:5.9.0" - envFrom: - - secretRef: - name: folio-db-connect - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 357913941 - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/service.yaml deleted file mode 100644 index 958764b90..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-configuration-5.9.0/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-configuration-5-9-0" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-configuration-5-9-0" - ports: - - port: 8081 - name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/deployment.yaml deleted file mode 100644 index 16ea3f285..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/deployment.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-email-1-15-3" - labels: - app: "mod-email-1-15-3" - module: "mod-email" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-email-1-15-3" - replicas: 1 - template: - metadata: - labels: - app: "mod-email-1-15-3" - module: "mod-email" - folio_role: "backend-module" - spec: - containers: - - name: "mod-email-1-15-3" - image: "folioorg/mod-email:1.15.3" - envFrom: - - secretRef: - name: folio-db-connect - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 357913941 - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/service.yaml deleted file mode 100644 index 300afe37e..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-email-1.15.3/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-email-1-15-3" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-email-1-15-3" - ports: - - port: 8081 - name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml deleted file mode 100644 index d3f8a1f86..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/deployment.yaml +++ /dev/null @@ -1,57 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-inventory-storage-25-0-4" - labels: - app: "mod-inventory-storage-25-0-4" - module: "mod-inventory-storage" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-inventory-storage-25-0-4" - replicas: 1 - template: - metadata: - labels: - app: "mod-inventory-storage-25-0-4" - module: "mod-inventory-storage" - folio_role: "backend-module" - spec: - containers: - - name: "mod-inventory-storage-25-0-4" - image: "folioorg/mod-inventory-storage:25.0.4" - envFrom: - - secretRef: - name: folio-db-connect - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=66.0 -Dlog4j.configuration=file:/etc/log4j2.properties -Dlog4j2.formatMsgNoLookups=true" - - name: "KAFKA_HOST" - value: "reshare-kafka-cardinal" - - name: "KAFKA_PORT" - value: "9092" - - name: "REPLICATION_FACTOR" - value: "1" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 715827883 - volumeMounts: - - name: inventory-storage-log4j-config - mountPath: "/etc/log4j.properties" - subPath: "log4j.properties" - volumes: - - name: "inventory-storage-log4j-config" - configMap: - name: "inventory-storage-log4j-config" - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/service.yaml deleted file mode 100644 index 77ab4cd0a..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-inventory-storage-25.0.4/service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-inventory-storage-25-0-4" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-inventory-storage-25-0-4" - ports: - - port: 8081 diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/deployment.yaml deleted file mode 100644 index 5d866b162..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/deployment.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-login-7-8-0" - labels: - app: "mod-login-7-8-0" - module: "mod-login" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-login-7-8-0" - replicas: 1 - template: - metadata: - labels: - app: "mod-login-7-8-0" - module: "mod-login" - folio_role: "backend-module" - spec: - containers: - - name: "mod-login-7-8-0" - image: "folioorg/mod-login:7.8.0" - envFrom: - - secretRef: - name: folio-db-connect - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 357913941 - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/service.yaml deleted file mode 100644 index 884e061c7..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-7.8.0/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-login-7-8-0" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-login-7-8-0" - ports: - - port: 8081 - name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/deployment.yaml deleted file mode 100644 index b0a721588..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/deployment.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-login-saml-2-5-1" - labels: - app: "mod-login-saml-2-5-1" - module: "mod-login-saml" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-login-saml-2-5-1" - replicas: 1 - template: - metadata: - labels: - app: "mod-login-saml-2-5-1" - module: "mod-login-saml" - folio_role: "backend-module" - spec: - containers: - - name: "mod-login-saml-2-5-1" - image: "folioorg/mod-login-saml:2.5.1" - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 357913941 - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/service.yaml deleted file mode 100644 index c41f35579..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-login-saml-2.5.1/service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-login-saml-2-5-1" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-login-saml-2-5-1" - ports: - - port: 8081 diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/deployment.yaml deleted file mode 100644 index c1ae9bcae..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/deployment.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-notes-4-0-0" - labels: - app: "mod-notes-4-0-0" - module: "mod-notes" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-notes-4-0-0" - replicas: 1 - template: - metadata: - labels: - app: "mod-notes-4-0-0" - module: "mod-notes" - folio_role: "backend-module" - spec: - containers: - - name: "mod-notes-4-0-0" - image: "folioorg/mod-notes:4.0.0" - envFrom: - - secretRef: - name: folio-db-connect - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 542293850 - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/service.yaml deleted file mode 100644 index 76910b753..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-notes-4.0.0/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-notes-4-0-0" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-notes-4-0-0" - ports: - - port: 8081 - name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/deployment.yaml deleted file mode 100644 index 0ad62236d..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/deployment.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-password-validator-2-5-0" - labels: - app: "mod-password-validator-2-5-0" - module: "mod-password-validator" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-password-validator-2-5-0" - replicas: 1 - template: - metadata: - labels: - app: "mod-password-validator-2-5-0" - module: "mod-password-validator" - folio_role: "backend-module" - spec: - containers: - - name: "mod-password-validator-2-5-0" - image: "folioorg/mod-password-validator:2.5.0" - envFrom: - - secretRef: - name: folio-db-connect - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=85.0 -Dlog4j2.formatMsgNoLookups=true" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 536870912 - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/service.yaml deleted file mode 100644 index 02d8ebd55..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-password-validator-2.5.0/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-password-validator-2-5-0" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-password-validator-2-5-0" - ports: - - port: 8081 - name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/deployment.yaml deleted file mode 100644 index 4f06f8fdf..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/deployment.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-permissions-6-2-0" - labels: - app: "mod-permissions-6-2-0" - module: "mod-permissions" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-permissions-6-2-0" - replicas: 1 - template: - metadata: - labels: - app: "mod-permissions-6-2-0" - module: "mod-permissions" - folio_role: "backend-module" - spec: - containers: - - name: "mod-permissions-6-2-0" - image: "folioorg/mod-permissions:6.2.0" - envFrom: - - secretRef: - name: folio-db-connect - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 715827883 - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/service.yaml deleted file mode 100644 index 9b8b50d19..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-permissions-6.2.0/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-permissions-6-2-0" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-permissions-6-2-0" - ports: - - port: 8081 - name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/deployment.yaml deleted file mode 100644 index 161e69b94..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/deployment.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-tags-1-3-0" - labels: - app: "mod-tags-1-3-0" - module: "mod-tags" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-tags-1-3-0" - replicas: 1 - template: - metadata: - labels: - app: "mod-tags-1-3-0" - module: "mod-tags" - folio_role: "backend-module" - spec: - containers: - - name: "mod-tags-1-3-0" - image: "folioorg/mod-tags:1.3.0" - envFrom: - - secretRef: - name: folio-db-connect - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=85.0 -Dlog4j2.formatMsgNoLookups=true" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 542293850 - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/service.yaml deleted file mode 100644 index 9ee36f6d1..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-tags-1.3.0/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-tags-1-3-0" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-tags-1-3-0" - ports: - - port: 8081 - name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/deployment.yaml deleted file mode 100644 index 7439858a4..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/deployment.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-users-19-0-0" - labels: - app: "mod-users-19-0-0" - module: "mod-users" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-users-19-0-0" - replicas: 1 - template: - metadata: - labels: - app: "mod-users-19-0-0" - module: "mod-users" - folio_role: "backend-module" - spec: - containers: - - name: "mod-users-19-0-0" - image: "folioorg/mod-users:19.0.0" - envFrom: - - secretRef: - name: folio-db-connect - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 536870912 - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/service.yaml deleted file mode 100644 index 045105559..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-19.0.0/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-users-19-0-0" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-users-19-0-0" - ports: - - port: 8081 - name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/deployment.yaml deleted file mode 100644 index 87099717b..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/deployment.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "mod-users-bl-7-4-0" - labels: - app: "mod-users-bl-7-4-0" - module: "mod-users-bl" - folio_role: "backend-module" - namespace: "reshare" -spec: - selector: - matchLabels: - app: "mod-users-bl-7-4-0" - replicas: 1 - template: - metadata: - labels: - app: "mod-users-bl-7-4-0" - module: "mod-users-bl" - folio_role: "backend-module" - spec: - containers: - - name: "mod-users-bl-7-4-0" - image: "folioorg/mod-users-bl:7.4.0" - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: JAVA_OPTIONS - value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" - ports: - - containerPort: 8081 - protocol: TCP - resources: - limits: - memory: 536870912 - imagePullSecrets: - - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/service.yaml deleted file mode 100644 index 6bd8fc341..000000000 --- a/tools/reshare-dev-k8s/folio-modules-poppy/folio-modules/mod-users-bl-7.4.0/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -*- mode: yaml; -*- -apiVersion: v1 -kind: Service -metadata: - name: "mod-users-bl-7-4-0" - namespace: "reshare" -spec: - type: "ClusterIP" - selector: - app: "mod-users-bl-7-4-0" - ports: - - port: 8081 - name: 8081tcp From e7e5819546e1fe2b5a11e4380cbd59b604d2268d Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Tue, 17 Sep 2024 18:22:48 -0400 Subject: [PATCH 08/10] Clarify optional step --- tools/reshare-dev-k8s/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/reshare-dev-k8s/README.md b/tools/reshare-dev-k8s/README.md index 3c12f3176..2ba44bbb6 100644 --- a/tools/reshare-dev-k8s/README.md +++ b/tools/reshare-dev-k8s/README.md @@ -22,8 +22,9 @@ kubectl get deployment -n reshare While you're waiting you can get some port forwarding running to make Okapi and Postgres available where the ReShare scripts/configs expect it (on localhost and ports 9130 and 54321 respectively). Your k8s environment may have some way -to persist this or set it while creating the cluster (as above) or you can have -a few terminals running these: +to persist this or set it while creating the cluster (eg. you won't need this +step if you've used the k3d command above) or you can have a few terminals +running these: ``` kubectl port-forward -n reshare svc/postgres 54321:5432 From 10c5a7c30ff20fc8d020518d23a7bbea6ddabc1c Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Mon, 26 May 2025 09:29:45 -0400 Subject: [PATCH 09/10] Add manifests for Quesnelia --- tools/reshare-dev-k8s/broker.yaml | 41 ++++++++++++++ .../deployment.yaml | 2 +- .../mod-notes-4.0.0/deployment.yaml | 2 +- .../deployment.yaml | 2 +- .../mod-tags-1.3.0/deployment.yaml | 2 +- .../mod-users-19.0.0/deployment.yaml | 2 +- .../mod-authtoken-2.15.2/deployment.yaml | 45 ++++++++++++++++ .../mod-authtoken-2.15.2/service.yaml | 13 +++++ .../deployment.yaml | 49 +++++++++++++++++ .../service.yaml | 13 +++++ .../mod-configuration-5.10.0/deployment.yaml | 43 +++++++++++++++ .../mod-configuration-5.10.0/service.yaml | 13 +++++ .../mod-email-1.17.0/deployment.yaml | 43 +++++++++++++++ .../mod-email-1.17.0/service.yaml | 13 +++++ .../deployment.yaml | 51 ++++++++++++++++++ .../mod-inventory-storage-27.1.4/service.yaml | 13 +++++ .../mod-login-7.11.2/deployment.yaml | 43 +++++++++++++++ .../mod-login-7.11.2/service.yaml | 13 +++++ .../mod-login-saml-2.8.4/deployment.yaml | 40 ++++++++++++++ .../mod-login-saml-2.8.4/service.yaml | 13 +++++ .../mod-notes-5.2.0/deployment.yaml | 43 +++++++++++++++ .../mod-notes-5.2.0/service.yaml | 13 +++++ .../deployment.yaml | 43 +++++++++++++++ .../mod-password-validator-3.2.1/service.yaml | 13 +++++ .../mod-permissions-6.5.0/deployment.yaml | 43 +++++++++++++++ .../mod-permissions-6.5.0/service.yaml | 13 +++++ .../mod-pubsub-2.13.1/deployment.yaml | 53 +++++++++++++++++++ .../mod-pubsub-2.13.1/service.yaml | 13 +++++ .../mod-settings-1.0.3/deployment.yaml | 43 +++++++++++++++ .../mod-settings-1.0.3/service.yaml | 13 +++++ .../mod-tags-2.2.0/deployment.yaml | 43 +++++++++++++++ .../mod-tags-2.2.0/service.yaml | 13 +++++ .../mod-users-19.3.2/deployment.yaml | 49 +++++++++++++++++ .../mod-users-19.3.2/service.yaml | 13 +++++ .../mod-users-bl-7.7.5/deployment.yaml | 40 ++++++++++++++ .../mod-users-bl-7.7.5/service.yaml | 13 +++++ 36 files changed, 912 insertions(+), 5 deletions(-) create mode 100644 tools/reshare-dev-k8s/broker.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-authtoken-2.15.2/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-authtoken-2.15.2/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-circulation-storage-17.2.6/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-circulation-storage-17.2.6/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-configuration-5.10.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-configuration-5.10.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-email-1.17.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-email-1.17.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-inventory-storage-27.1.4/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-inventory-storage-27.1.4/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-login-7.11.2/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-login-7.11.2/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-login-saml-2.8.4/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-login-saml-2.8.4/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-notes-5.2.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-notes-5.2.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-password-validator-3.2.1/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-password-validator-3.2.1/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-permissions-6.5.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-permissions-6.5.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-pubsub-2.13.1/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-pubsub-2.13.1/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-settings-1.0.3/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-settings-1.0.3/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-tags-2.2.0/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-tags-2.2.0/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-users-19.3.2/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-users-19.3.2/service.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-users-bl-7.7.5/deployment.yaml create mode 100644 tools/reshare-dev-k8s/folio-modules-q/mod-users-bl-7.7.5/service.yaml diff --git a/tools/reshare-dev-k8s/broker.yaml b/tools/reshare-dev-k8s/broker.yaml new file mode 100644 index 000000000..13bd58921 --- /dev/null +++ b/tools/reshare-dev-k8s/broker.yaml @@ -0,0 +1,41 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "broker" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "broker" + replicas: 1 + template: + metadata: + labels: + app: "broker" + spec: + containers: + - name: broker + image: ghcr.io/indexdata/crosslink-broker:main + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: BROKER_MODE + value: opaque + ports: + - containerPort: 8081 + protocol: TCP +--- +apiVersion: v1 +kind: Service +metadata: + name: "broker" + namespace: reshare +spec: + type: "ClusterIP" + selector: + app: "broker" + ports: + - name: broker + port: 8081 + nodePort: 30333 diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/deployment.yaml index d3f8a1f86..36f25d0e6 100644 --- a/tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/deployment.yaml +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-inventory-storage-25.0.4/deployment.yaml @@ -44,7 +44,7 @@ spec: protocol: TCP resources: limits: - memory: 715827883 + memory: 1Gi volumeMounts: - name: inventory-storage-log4j-config mountPath: "/etc/log4j.properties" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/deployment.yaml index c1ae9bcae..b392d25d0 100644 --- a/tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/deployment.yaml +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-notes-4.0.0/deployment.yaml @@ -38,6 +38,6 @@ spec: protocol: TCP resources: limits: - memory: 542293850 + memory: 1Gi imagePullSecrets: - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/deployment.yaml index 0ad62236d..44f23138b 100644 --- a/tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/deployment.yaml +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-password-validator-2.5.0/deployment.yaml @@ -38,6 +38,6 @@ spec: protocol: TCP resources: limits: - memory: 536870912 + memory: 1Gi imagePullSecrets: - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/deployment.yaml index 161e69b94..1bbed0dc8 100644 --- a/tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/deployment.yaml +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-tags-1.3.0/deployment.yaml @@ -38,6 +38,6 @@ spec: protocol: TCP resources: limits: - memory: 542293850 + memory: 1Gi imagePullSecrets: - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/deployment.yaml index 7439858a4..a9c0ef2cb 100644 --- a/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/deployment.yaml +++ b/tools/reshare-dev-k8s/folio-modules-poppy/mod-users-19.0.0/deployment.yaml @@ -38,6 +38,6 @@ spec: protocol: TCP resources: limits: - memory: 536870912 + memory: 1Gi imagePullSecrets: - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-authtoken-2.15.2/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-authtoken-2.15.2/deployment.yaml new file mode 100644 index 000000000..5dfbee463 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-authtoken-2.15.2/deployment.yaml @@ -0,0 +1,45 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-authtoken-2-15-2" + labels: + app: "mod-authtoken-2-15-2" + module: "mod-authtoken" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-authtoken-2-15-2" + replicas: 1 + template: + metadata: + labels: + app: "mod-authtoken-2-15-2" + module: "mod-authtoken" + folio_role: "backend-module" + spec: + containers: + - name: "mod-authtoken-2-15-2" + image: "folioorg/mod-authtoken:2.15.2" + envFrom: + - secretRef: + name: mod-authtoken-signing-key + - secretRef: + name: folio-db-connect + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dcache.permissions=true -Djwt.signing.key=$(SIGNING_KEY) -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-authtoken-2.15.2/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-authtoken-2.15.2/service.yaml new file mode 100644 index 000000000..68132931e --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-authtoken-2.15.2/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-authtoken-2-15-2" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-authtoken-2-15-2" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-circulation-storage-17.2.6/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-circulation-storage-17.2.6/deployment.yaml new file mode 100644 index 000000000..7c17482e6 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-circulation-storage-17.2.6/deployment.yaml @@ -0,0 +1,49 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-circulation-storage-17-2-6" + labels: + app: "mod-circulation-storage-17-2-6" + module: "mod-circulation-storage" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-circulation-storage-17-2-6" + replicas: 1 + template: + metadata: + labels: + app: "mod-circulation-storage-17-2-6" + module: "mod-circulation-storage" + folio_role: "backend-module" + spec: + containers: + - name: "mod-circulation-storage-17-2-6" + image: "ghcr.io/indexdata/mod-circulation-storage:17.2.6-reshare" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + - name: "ENV" + value: "reshare" + - name: "KAFKA_HOST" + value: "reshare-kafka-cardinal" + - name: "KAFKA_PORT" + value: "9092" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 805306368 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-circulation-storage-17.2.6/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-circulation-storage-17.2.6/service.yaml new file mode 100644 index 000000000..795848304 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-circulation-storage-17.2.6/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-circulation-storage-17-2-6" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-circulation-storage-17-2-6" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-configuration-5.10.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-configuration-5.10.0/deployment.yaml new file mode 100644 index 000000000..64c7df971 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-configuration-5.10.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-configuration-5-10-0" + labels: + app: "mod-configuration-5-10-0" + module: "mod-configuration" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-configuration-5-10-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-configuration-5-10-0" + module: "mod-configuration" + folio_role: "backend-module" + spec: + containers: + - name: "mod-configuration-5-10-0" + image: "folioorg/mod-configuration:5.10.0" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-configuration-5.10.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-configuration-5.10.0/service.yaml new file mode 100644 index 000000000..619ce8f5f --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-configuration-5.10.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-configuration-5-10-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-configuration-5-10-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-email-1.17.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-email-1.17.0/deployment.yaml new file mode 100644 index 000000000..84e9b8eab --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-email-1.17.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-email-1-17-0" + labels: + app: "mod-email-1-17-0" + module: "mod-email" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-email-1-17-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-email-1-17-0" + module: "mod-email" + folio_role: "backend-module" + spec: + containers: + - name: "mod-email-1-17-0" + image: "folioorg/mod-email:1.17.0" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 1Gi + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-email-1.17.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-email-1.17.0/service.yaml new file mode 100644 index 000000000..7f41d7845 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-email-1.17.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-email-1-17-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-email-1-17-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-inventory-storage-27.1.4/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-inventory-storage-27.1.4/deployment.yaml new file mode 100644 index 000000000..b841b9216 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-inventory-storage-27.1.4/deployment.yaml @@ -0,0 +1,51 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-inventory-storage-27-1-4" + labels: + app: "mod-inventory-storage-27-1-4" + module: "mod-inventory-storage" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-inventory-storage-27-1-4" + replicas: 1 + template: + metadata: + labels: + app: "mod-inventory-storage-27-1-4" + module: "mod-inventory-storage" + folio_role: "backend-module" + spec: + containers: + - name: "mod-inventory-storage-27-1-4" + image: "folioorg/mod-inventory-storage:27.1.4" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + - name: "ENV" + value: "reshare" + - name: "KAFKA_HOST" + value: "reshare-kafka-cardinal" + - name: "KAFKA_PORT" + value: "9092" + - name: "REPLICATION_FACTOR" + value: "1" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 2Gi + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-inventory-storage-27.1.4/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-inventory-storage-27.1.4/service.yaml new file mode 100644 index 000000000..d248063aa --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-inventory-storage-27.1.4/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-inventory-storage-27-1-4" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-inventory-storage-27-1-4" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-login-7.11.2/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-login-7.11.2/deployment.yaml new file mode 100644 index 000000000..0bcac0d25 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-login-7.11.2/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-login-7-11-2" + labels: + app: "mod-login-7-11-2" + module: "mod-login" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-login-7-11-2" + replicas: 1 + template: + metadata: + labels: + app: "mod-login-7-11-2" + module: "mod-login" + folio_role: "backend-module" + spec: + containers: + - name: "mod-login-7-11-2" + image: "folioorg/mod-login:7.11.2" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-login-7.11.2/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-login-7.11.2/service.yaml new file mode 100644 index 000000000..2a9dfb3c2 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-login-7.11.2/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-login-7-11-2" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-login-7-11-2" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-login-saml-2.8.4/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-login-saml-2.8.4/deployment.yaml new file mode 100644 index 000000000..3fa975ee7 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-login-saml-2.8.4/deployment.yaml @@ -0,0 +1,40 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-login-saml-2-8-4" + labels: + app: "mod-login-saml-2-8-4" + module: "mod-login-saml" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-login-saml-2-8-4" + replicas: 1 + template: + metadata: + labels: + app: "mod-login-saml-2-8-4" + module: "mod-login-saml" + folio_role: "backend-module" + spec: + containers: + - name: "mod-login-saml-2-8-4" + image: "folioorg/mod-login-saml:2.8.4" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 357913941 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-login-saml-2.8.4/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-login-saml-2.8.4/service.yaml new file mode 100644 index 000000000..876f11b63 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-login-saml-2.8.4/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-login-saml-2-8-4" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-login-saml-2-8-4" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-notes-5.2.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-notes-5.2.0/deployment.yaml new file mode 100644 index 000000000..4df2cbe39 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-notes-5.2.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-notes-5-2-0" + labels: + app: "mod-notes-5-2-0" + module: "mod-notes" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-notes-5-2-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-notes-5-2-0" + module: "mod-notes" + folio_role: "backend-module" + spec: + containers: + - name: "mod-notes-5-2-0" + image: "folioorg/mod-notes:5.2.0" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 1Gi + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-notes-5.2.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-notes-5.2.0/service.yaml new file mode 100644 index 000000000..c084d15dc --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-notes-5.2.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-notes-5-2-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-notes-5-2-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-password-validator-3.2.1/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-password-validator-3.2.1/deployment.yaml new file mode 100644 index 000000000..7e1663217 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-password-validator-3.2.1/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-password-validator-3-2-1" + labels: + app: "mod-password-validator-3-2-1" + module: "mod-password-validator" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-password-validator-3-2-1" + replicas: 1 + template: + metadata: + labels: + app: "mod-password-validator-3-2-1" + module: "mod-password-validator" + folio_role: "backend-module" + spec: + containers: + - name: "mod-password-validator-3-2-1" + image: "folioorg/mod-password-validator:3.2.1" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=85.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 1Gi + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-password-validator-3.2.1/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-password-validator-3.2.1/service.yaml new file mode 100644 index 000000000..db8700c08 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-password-validator-3.2.1/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-password-validator-3-2-1" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-password-validator-3-2-1" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-permissions-6.5.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-permissions-6.5.0/deployment.yaml new file mode 100644 index 000000000..e476fd49d --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-permissions-6.5.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-permissions-6-5-0" + labels: + app: "mod-permissions-6-5-0" + module: "mod-permissions" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-permissions-6-5-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-permissions-6-5-0" + module: "mod-permissions" + folio_role: "backend-module" + spec: + containers: + - name: "mod-permissions-6-5-0" + image: "folioorg/mod-permissions:6.5.0" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 715827883 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-permissions-6.5.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-permissions-6.5.0/service.yaml new file mode 100644 index 000000000..2041872af --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-permissions-6.5.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-permissions-6-5-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-permissions-6-5-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-pubsub-2.13.1/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-pubsub-2.13.1/deployment.yaml new file mode 100644 index 000000000..256caeba1 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-pubsub-2.13.1/deployment.yaml @@ -0,0 +1,53 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-pubsub-2-13-1" + labels: + app: "mod-pubsub-2-13-1" + module: "mod-pubsub" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-pubsub-2-13-1" + replicas: 1 + template: + metadata: + labels: + app: "mod-pubsub-2-13-1" + module: "mod-pubsub" + folio_role: "backend-module" + spec: + containers: + - name: "mod-pubsub-2-13-1" + image: "folioorg/mod-pubsub:2.13.1" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -XX:+HeapDumpOnOutOfMemoryError -Dlog4j2.formatMsgNoLookups=true" + - name: "KAFKA_HOST" + value: "reshare-kafka-cardinal" + - name: "KAFKA_PORT" + value: "9092" + - name: "OKAPI_URL" + value: "http://okapi:9130" + - name: "SYSTEM_USER_NAME" + value: "pubsub_user" + - name: "SYSTEM_USER_PASSWORD" + value: "PAuY9FgSx6qlGQ8KiwJc" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 1073741824 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-pubsub-2.13.1/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-pubsub-2.13.1/service.yaml new file mode 100644 index 000000000..88ded83e5 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-pubsub-2.13.1/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-pubsub-2-13-1" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-pubsub-2-13-1" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-settings-1.0.3/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-settings-1.0.3/deployment.yaml new file mode 100644 index 000000000..a361de7d4 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-settings-1.0.3/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-settings-1-0-3" + labels: + app: "mod-settings-1-0-3" + module: "mod-settings" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-settings-1-0-3" + replicas: 1 + template: + metadata: + labels: + app: "mod-settings-1-0-3" + module: "mod-settings" + folio_role: "backend-module" + spec: + containers: + - name: "mod-settings-1-0-3" + image: "folioorg/mod-settings:1.0.3" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 2147483648 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-settings-1.0.3/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-settings-1.0.3/service.yaml new file mode 100644 index 000000000..6ce664dea --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-settings-1.0.3/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-settings-1-0-3" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-settings-1-0-3" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-tags-2.2.0/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-tags-2.2.0/deployment.yaml new file mode 100644 index 000000000..331442cba --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-tags-2.2.0/deployment.yaml @@ -0,0 +1,43 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-tags-2-2-0" + labels: + app: "mod-tags-2-2-0" + module: "mod-tags" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-tags-2-2-0" + replicas: 1 + template: + metadata: + labels: + app: "mod-tags-2-2-0" + module: "mod-tags" + folio_role: "backend-module" + spec: + containers: + - name: "mod-tags-2-2-0" + image: "folioorg/mod-tags:2.2.0" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=85.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 1Gi + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-tags-2.2.0/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-tags-2.2.0/service.yaml new file mode 100644 index 000000000..66ff99b1d --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-tags-2.2.0/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-tags-2-2-0" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-tags-2-2-0" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-users-19.3.2/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-users-19.3.2/deployment.yaml new file mode 100644 index 000000000..a83e5fbb2 --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-users-19.3.2/deployment.yaml @@ -0,0 +1,49 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-users-19-3-2" + labels: + app: "mod-users-19-3-2" + module: "mod-users" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-users-19-3-2" + replicas: 1 + template: + metadata: + labels: + app: "mod-users-19-3-2" + module: "mod-users" + folio_role: "backend-module" + spec: + containers: + - name: "mod-users-19-3-2" + image: "folioorg/mod-users:19.3.2" + envFrom: + - secretRef: + name: "folio-db-connect" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + - name: "ENV" + value: "reshare" + - name: "KAFKA_HOST" + value: "reshare-kafka-cardinal" + - name: "KAFKA_PORT" + value: "9092" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 1Gi + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-users-19.3.2/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-users-19.3.2/service.yaml new file mode 100644 index 000000000..bbd9674af --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-users-19.3.2/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-users-19-3-2" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-users-19-3-2" + ports: + - port: 8081 + name: 8081tcp diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-users-bl-7.7.5/deployment.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-users-bl-7.7.5/deployment.yaml new file mode 100644 index 000000000..4a5bcb06a --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-users-bl-7.7.5/deployment.yaml @@ -0,0 +1,40 @@ +# -*- mode: yaml; -*- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "mod-users-bl-7-7-5" + labels: + app: "mod-users-bl-7-7-5" + module: "mod-users-bl" + folio_role: "backend-module" + namespace: "reshare" +spec: + selector: + matchLabels: + app: "mod-users-bl-7-7-5" + replicas: 1 + template: + metadata: + labels: + app: "mod-users-bl-7-7-5" + module: "mod-users-bl" + folio_role: "backend-module" + spec: + containers: + - name: "mod-users-bl-7-7-5" + image: "folioorg/mod-users-bl:7.7.5" + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: JAVA_OPTIONS + value: "-XX:MaxRAMPercentage=66.0 -Dlog4j2.formatMsgNoLookups=true" + ports: + - containerPort: 8081 + protocol: TCP + resources: + limits: + memory: 536870912 + imagePullSecrets: + - name: "dockerhub-cred" diff --git a/tools/reshare-dev-k8s/folio-modules-q/mod-users-bl-7.7.5/service.yaml b/tools/reshare-dev-k8s/folio-modules-q/mod-users-bl-7.7.5/service.yaml new file mode 100644 index 000000000..d9adcf07c --- /dev/null +++ b/tools/reshare-dev-k8s/folio-modules-q/mod-users-bl-7.7.5/service.yaml @@ -0,0 +1,13 @@ +# -*- mode: yaml; -*- +apiVersion: v1 +kind: Service +metadata: + name: "mod-users-bl-7-7-5" + namespace: "reshare" +spec: + type: "ClusterIP" + selector: + app: "mod-users-bl-7-7-5" + ports: + - port: 8081 + name: 8081tcp From 50bfea7e37c9a65d87148a608b5ec67560604e5d Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Fri, 26 Sep 2025 17:22:49 -0400 Subject: [PATCH 10/10] Use k3d hostname instead of VirtualBox loopback --- service/grails-app/conf/application.yml | 2 +- service/src/main/okapi/DeploymentDescriptor-template.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/service/grails-app/conf/application.yml b/service/grails-app/conf/application.yml index bdab94582..0d92e8462 100644 --- a/service/grails-app/conf/application.yml +++ b/service/grails-app/conf/application.yml @@ -133,7 +133,7 @@ grails: - "yyyy-MM-dd'T'HH:mm:ss.SSS" - 'yyyy-MM-dd' server: - host: 10.0.2.2 + host: host.k3d.internal port: 8081 okapi: diff --git a/service/src/main/okapi/DeploymentDescriptor-template.json b/service/src/main/okapi/DeploymentDescriptor-template.json index 866c68f03..f25274338 100644 --- a/service/src/main/okapi/DeploymentDescriptor-template.json +++ b/service/src/main/okapi/DeploymentDescriptor-template.json @@ -1,5 +1,5 @@ { "srvcId": "${info.app.name}-${info.app.version}", - "instId": "10.0.2.2-${info.app.name}-${info.app.version}", - "url": "http://10.0.2.2:8081/" + "instId": "host.k3d.internal-${info.app.name}-${info.app.version}", + "url": "http://host.k3d.internal:8081/" }