Skip to content

Commit

Permalink
configure core with env variables
Browse files Browse the repository at this point in the history
Signed-off-by: Mikko Murto <mikko.murto@doubleopen.org>
  • Loading branch information
mmurto committed Aug 29, 2024
1 parent 8b906b7 commit c854b64
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 270 deletions.
20 changes: 1 addition & 19 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@ helm_resource(

helm_repo('bitnami', 'https://charts.bitnami.com/bitnami', labels=['helm_repos'])

secret_create_generic('keycloak-master-realm',
namespace='ort-server',
secret_type='generic',
from_file='./scripts/docker/keycloak/master-realm.json')

configmap_create('keycloak-init',
namespace='ort-server',
from_file=['master-realm.json=./scripts/docker/keycloak/master-realm.json'])

configmap_create('ort-core-secrets',
namespace='ort-server',
from_file=['secrets.properties=./scripts/compose/secrets.properties'])
Expand Down Expand Up @@ -84,11 +75,6 @@ k8s_resource(
extra_pod_selectors={'statefulset.kubernetes.io/pod-name': 'keycloak-0'},
discovery_strategy='selectors-only')

secret_create_generic('rabbitmq-load-definition',
namespace='ort-server',
secret_type='generic',
from_file='load_definition.json=./scripts/docker/rabbitmq/load_definition.json')

helm_resource(
'rabbitmq',
'bitnami/rabbitmq',
Expand Down Expand Up @@ -124,17 +110,13 @@ helm_resource(
labels=['monitoring'],
)

configmap_create('ort-core-config',
namespace='ort-server',
from_file=['application.conf=./scripts/kubernetes/core.application.conf'])

custom_build(
'core',
'./gradlew :core:jibDockerBuild --image $EXPECTED_REF',
live_update= [
sync('./core/build/classes/kotlin/main', '/app/classes')
],
deps=['./core/build/classes', './core/build.gradle.kts', './scripts/kubernetes/core.application.conf'],
deps=['./core/build/classes', './core/build.gradle.kts',],
)

k8s_resource(
Expand Down
137 changes: 0 additions & 137 deletions scripts/kubernetes/core.application.conf

This file was deleted.

41 changes: 37 additions & 4 deletions scripts/kubernetes/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,40 @@ spec:
app: ort-server
component: core
---
apiVersion: v1
kind: ConfigMap
metadata:
name: core-configuration
namespace: ort-server
data:
PUBLIC_SCHEME: http
PUBLIC_FQDN: localhost
PUBLIC_PORT: "8080"
PORT: "8080"
UI_HOSTS: localhost:5173
DB_HOST: postgresql
DB_PORT: "5432"
DB_NAME: ort
DB_SCHEMA: ort_server
DB_USERNAME: postgres
DB_PASSWORD: postgres
DB_SSL_MODE: disable
JWT_URI: "http://keycloak.ort-server.svc.cluster.local/realms/ort-server/protocol/openid-connect/certs"
JWT_ISSUER: "http://localhost:8081/realms/ort-server"
JWT_REALM: "ort-server"
KEYCLOAK_ACCESS_TOKEN_URL: "http://keycloak.ort-server.svc.cluster.local/realms/ort-server/protocol/openid-connect/token"
KEYCLOAK_API_URL: "http://keycloak.ort-server.svc.cluster.local/admin/realms/ort-server"
KEYCLOAK_API_USER: "keycloak-admin"
KEYCLOAK_API_SECRET: "keycloak-admin"
ORCHESTRATOR_SENDER_TRANSPORT_TYPE: rabbitMQ
ORCHESTRATOR_SENDER_TRANSPORT_SERVER_URI: amqp://rabbitmq-headless.ort-server.svc.cluster.local:5672
ORCHESTRATOR_SENDER_TRANSPORT_QUEUE_NAME: orchestrator_queue
GRAPHITE_HOST: graphite
GRAPHITE_PORT: "2003"
CORE_SECRET_PROVIDER: secret-file
CORE_SECRET_FILES: "/app/resources/secrets.properties"
ALLOW_SECRETS_FROM_CONFIG: "true"
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -51,11 +85,10 @@ spec:
image: core
ports:
- containerPort: 8080
envFrom:
- configMapRef:
name: core-configuration
volumeMounts:
- name: ort-core-config-volume
mountPath: /app/resources/application.conf
subPath: application.conf
readOnly: true
- name: ort-core-config-secrets
mountPath: /app/resources/secrets.properties
subPath: secrets.properties
Expand Down
110 changes: 0 additions & 110 deletions scripts/kubernetes/rabbitmq-load-definition-secret.yaml

This file was deleted.

0 comments on commit c854b64

Please sign in to comment.