Adapt chart to use the correct images

Change-Id: Ibb29d9eaf8e35a08ac081f752aa73916ee1c734b
This commit is contained in:
Radosław Piliszek 2024-02-06 17:13:24 +01:00
parent ed439fedc5
commit b9c077c46d
2 changed files with 37 additions and 7 deletions

View File

@ -27,15 +27,32 @@ spec:
serviceAccountName: {{ include "nebulous-gui.serviceAccountName" . }} serviceAccountName: {{ include "nebulous-gui.serviceAccountName" . }}
securityContext: securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }} {{- toYaml .Values.podSecurityContext | nindent 8 }}
containers: initContainers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}-builder
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" image: "{{ .Values.builderImage.repository }}:{{ .Values.builderImage.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.builderImage.pullPolicy }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
command:
- npx
- vite
- build
volumeMounts:
- name: static-files
mountPath: /app/dist
env:
{{- toYaml .Values.builderEnv | nindent 12 }}
containers:
- name: {{ .Chart.Name }}-server
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.serverImage.repository }}:{{ .Values.serverImage.tag }}"
imagePullPolicy: {{ .Values.serverImage.pullPolicy }}
ports: ports:
- name: http - name: http
containerPort: 8080 containerPort: 80
protocol: TCP protocol: TCP
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -47,6 +64,9 @@ spec:
port: http port: http
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- name: static-files
mountPath: /usr/share/nginx/html
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
@ -59,3 +79,6 @@ spec:
tolerations: tolerations:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
volumes:
- name: static-files
emptyDir: {}

View File

@ -4,12 +4,19 @@
replicaCount: 1 replicaCount: 1
image: serverImage:
repository: "quay.io/nebulous/gui-java-spring-boot-demo" repository: "docker.io/library/nginx"
pullPolicy: IfNotPresent
tag: "latest"
builderImage:
repository: "quay.io/nebulous/gui-builder"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "" tag: ""
builderEnv: []
imagePullSecrets: [] imagePullSecrets: []
nameOverride: "" nameOverride: ""
fullnameOverride: "" fullnameOverride: ""