diff --git a/charts/cala/templates/cala-deployment.yaml b/charts/cala/templates/cala-deployment.yaml index 14686e869..05b6008ed 100644 --- a/charts/cala/templates/cala-deployment.yaml +++ b/charts/cala/templates/cala-deployment.yaml @@ -81,10 +81,12 @@ spec: apiVersion: v1 fieldPath: spec.nodeName startupProbe: - grpc: + httpGet: + path: /graphql port: {{ .Values.cala.server.service.port }} livenessProbe: - grpc: + httpGet: + path: /graphql port: {{ .Values.cala.server.service.port }} resources: {{- toYaml .Values.cala.resources | nindent 10 }} diff --git a/dev/Makefile b/dev/Makefile index 3b6db738f..10daa3e1e 100644 --- a/dev/Makefile +++ b/dev/Makefile @@ -7,7 +7,7 @@ create-cluster: --k3s-arg "--disable=servicelb@server:0" delete-cluster: - k3d cluster delete && rm terraform.tfstate + k3d cluster delete all: create-cluster init deploy-services deploy diff --git a/dev/Tiltfile b/dev/Tiltfile index c965684bf..d6ca0673b 100644 --- a/dev/Tiltfile +++ b/dev/Tiltfile @@ -2,6 +2,7 @@ include('./galoy-deps/Tiltfile') include('./bitcoin/Tiltfile') include('./monitoring/Tiltfile') include('./galoy/Tiltfile') +include('./cala/Tiltfile') include('./addons/Tiltfile') include('./stablesats/Tiltfile') include('./kafka-connect/Tiltfile') diff --git a/dev/cala/Tiltfile b/dev/cala/Tiltfile new file mode 100644 index 000000000..341c63d38 --- /dev/null +++ b/dev/cala/Tiltfile @@ -0,0 +1,38 @@ +load('ext://helm_resource', 'helm_resource') +load('ext://namespace', 'namespace_create') +load('ext://secret', 'secret_from_dict') +load('../common/Tiltfile', 'helm_release') +update_settings(k8s_upsert_timeout_secs=120) + +name_prefix = 'galoy-dev' +cala_namespace = '{}-cala'.format(name_prefix) +smoketest_namespace = '{}-smoketest'.format(name_prefix) + +namespace_create(cala_namespace) + +k8s_yaml(secret_from_dict( + name='cala-smoketest', + namespace=cala_namespace, + inputs={ + 'key': 'value' + }, +)) + +k8s_yaml(secret_from_dict( + name='cala', + namespace=cala_namespace, + inputs={ + 'pg-con': 'postgres://cala:cala@cala-postgresql:5432/cala', + }, +)) + +helm_release( + '../../charts/cala', + name='cala', + namespace=cala_namespace, + values=['./cala-values.yml'], + dependency_build=True, + add_repos=True +) + +k8s_resource(workload='cala', labels='cala') diff --git a/dev/cala/cala-values.yml b/dev/cala/cala-values.yml new file mode 100644 index 000000000..d4b21866d --- /dev/null +++ b/dev/cala/cala-values.yml @@ -0,0 +1,8 @@ +cala: + secrets: + create: false + +postgresql: + primary: + persistence: + enabled: false