Compare commits

..

2 Commits

11 changed files with 103 additions and 49 deletions

View File

@@ -15,10 +15,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.0.0 version: 1.0.2
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to # incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using. # follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes. # It is recommended to use it with quotes.
appVersion: "1.0.0" appVersion: "1.0.2"

View File

@@ -38,7 +38,7 @@ spec:
name: {{ .Values.s3.secretName | quote }} name: {{ .Values.s3.secretName | quote }}
key: {{ required "secret-key-ref!" .Values.s3.secretKeyRef | quote }} key: {{ required "secret-key-ref!" .Values.s3.secretKeyRef | quote }}
- name: TESTING_MODULE_URL - name: TESTING_MODULE_URL
value: http://{{ .Release.Name }}-queue-service:8080/ value: http://{{ .Release.Name }}-testing-module-gateway-service:8080/
- name: PG_URI - name: PG_URI
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View File

@@ -14,11 +14,13 @@ spec:
metadata: metadata:
labels: labels:
app: {{ .Release.Name }}-frontend app: {{ .Release.Name }}-frontend
annotations:
redeploy-timestamp: "{{ now | unixEpoch }}"
spec: spec:
containers: containers:
- name: {{ .Release.Name }}-frontend - name: {{ .Release.Name }}-frontend
image: ghcr.io/nullptroma/liquid-frontend:latest image: git.nullptr.top/liquidcode/liquidcode-frontend:latest
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8000 - containerPort: 3000
{{ end }} {{ end }}

View File

@@ -1,26 +0,0 @@
{{ if .Values.queue.enable }}
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Release.Name }}-queue-deployment
labels:
app: {{ .Release.Name }}-queue
spec:
replicas: 1
selector:
matchLabels:
app: {{ .Release.Name }}-queue
template:
metadata:
labels:
app: {{ .Release.Name }}-queue
spec:
containers:
- name: {{ .Release.Name }}-queue
image: ghcr.io/nullptroma/liquid-queue:latest
imagePullPolicy: Always
ports:
- containerPort: 8080
securityContext:
privileged: true
{{ end }}

View File

@@ -0,0 +1,37 @@
{{ if .Values.testingModule.enable }}
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Release.Name }}-testing-module-gateway-deployment
labels:
app: {{ .Release.Name }}-testing-module-gateway
spec:
replicas: 1
selector:
matchLabels:
app: {{ .Release.Name }}-testing-module-gateway
template:
metadata:
labels:
app: {{ .Release.Name }}-testing-module-gateway
annotations:
redeploy-timestamp: "{{ now | unixEpoch }}"
spec:
containers:
- name: {{ .Release.Name }}-testing-module-gateway
image: git.nullptr.top/liquidcode/liquidcode-tester-gateway:latest
imagePullPolicy: Always
ports:
- containerPort: 8080
env:
- name: Workers__Cpp
value: http://{{ .Release.Name }}-testing-module-worker-service:8080
- name: Workers__Java
value: http://{{ .Release.Name }}-testing-module-worker-service:8080
- name: Workers__Kotlin
value: http://{{ .Release.Name }}-testing-module-worker-service:8080
- name: Workers__CSharp
value: http://{{ .Release.Name }}-testing-module-worker-service:8080
- name: Workers__Python
value: http://{{ .Release.Name }}-testing-module-worker-service:8080
{{ end }}

View File

@@ -0,0 +1,26 @@
{{ if .Values.testingModule.enable }}
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Release.Name }}-testing-module-worker-deployment
labels:
app: {{ .Release.Name }}-testing-module-worker
spec:
replicas: 1
selector:
matchLabels:
app: {{ .Release.Name }}-testing-module-worker
template:
metadata:
labels:
app: {{ .Release.Name }}-testing-module-worker
annotations:
redeploy-timestamp: "{{ now | unixEpoch }}"
spec:
containers:
- name: {{ .Release.Name }}-testing-module-worker
image: git.nullptr.top/liquidcode/liquidcode-tester-worker:latest
imagePullPolicy: Always
ports:
- containerPort: 8080
{{ end }}

View File

@@ -9,6 +9,6 @@ spec:
ports: ports:
- protocol: TCP - protocol: TCP
port: 80 port: 80
targetPort: 8000 targetPort: 3000
{{ end }} {{ end }}

View File

@@ -1,13 +0,0 @@
{{ if .Values.queue.enable }}
apiVersion: v1
kind: Service
metadata:
name: {{ .Release.Name }}-queue-service
spec:
selector:
app: {{ .Release.Name }}-queue
ports:
- protocol: TCP
port: 8080
targetPort: 8080
{{ end }}

View File

@@ -0,0 +1,14 @@
{{ if .Values.testingModule.enable }}
apiVersion: v1
kind: Service
metadata:
name: {{ .Release.Name }}-testing-module-gateway-service
spec:
selector:
app: {{ .Release.Name }}-testing-module-gateway
ports:
- name: http
protocol: TCP
port: 8080
targetPort: 8080
{{ end }}

View File

@@ -0,0 +1,14 @@
{{ if .Values.testingModule.enable }}
apiVersion: v1
kind: Service
metadata:
name: {{ .Release.Name }}-testing-module-worker-service
spec:
selector:
app: {{ .Release.Name }}-testing-module-worker
ports:
- name: http
protocol: TCP
port: 8080
targetPort: 8080
{{ end }}

View File

@@ -9,8 +9,8 @@ jwt:
database: database:
secretName: liquid-db-app secretName: liquid-db-app
migrateDb: true migrateDb: true
dropDb: false dropDb: true
frontend: frontend:
enable: false enable: true
queue: testingModule:
enable: false enable: true