diff --git a/charts/nebulous-gui/Chart.yaml b/charts/nebulous-gui/Chart.yaml index 8754aac..bb47248 100644 --- a/charts/nebulous-gui/Chart.yaml +++ b/charts/nebulous-gui/Chart.yaml @@ -15,7 +15,7 @@ type: application # 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. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.2.0 # 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 diff --git a/charts/nebulous-gui/templates/deployment.yaml b/charts/nebulous-gui/templates/deployment.yaml index e06499e..0c8c9b3 100644 --- a/charts/nebulous-gui/templates/deployment.yaml +++ b/charts/nebulous-gui/templates/deployment.yaml @@ -27,35 +27,18 @@ spec: serviceAccountName: {{ include "nebulous-gui.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} - initContainers: - - name: {{ .Chart.Name }}-builder + containers: + - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.builderImage.repository }}:{{ .Values.builderImage.tag | default .Chart.AppVersion }}" 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: - name: http containerPort: 80 protocol: TCP env: - {{- toYaml .Values.env | nindent 12 }} + {{- toYaml .Values.builderEnv | nindent 12 }} livenessProbe: httpGet: path: / @@ -66,9 +49,6 @@ spec: port: http resources: {{- toYaml .Values.resources | nindent 12 }} - volumeMounts: - - name: static-files - mountPath: /usr/share/nginx/html {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -81,6 +61,3 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - volumes: - - name: static-files - emptyDir: {} diff --git a/charts/nebulous-gui/values.yaml b/charts/nebulous-gui/values.yaml index f7f0f46..ad33335 100644 --- a/charts/nebulous-gui/values.yaml +++ b/charts/nebulous-gui/values.yaml @@ -4,11 +4,6 @@ replicaCount: 1 -serverImage: - repository: "docker.io/library/nginx" - pullPolicy: IfNotPresent - tag: "latest" - builderImage: repository: "quay.io/nebulous/gui-builder" pullPolicy: IfNotPresent @@ -87,5 +82,3 @@ nodeSelector: {} tolerations: [] affinity: {} - -env: []