From c348bf07906456766162849f0980d88204345a72 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 May 2025 22:43:45 -0400 Subject: [PATCH] deploy --- .../compose-app/{ => templates}/deploy.yaml | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) rename charts/compose-app/{ => templates}/deploy.yaml (60%) diff --git a/charts/compose-app/deploy.yaml b/charts/compose-app/templates/deploy.yaml similarity index 60% rename from charts/compose-app/deploy.yaml rename to charts/compose-app/templates/deploy.yaml index 24d319b..8d0c0c6 100644 --- a/charts/compose-app/deploy.yaml +++ b/charts/compose-app/templates/deploy.yaml @@ -15,6 +15,15 @@ spec: labels: app: {{ $name }} spec: + {{ if $data.volumes -}} + {{ range $volname, $_ := $data.volumes }} + volumes: + - name: "{{ $volname }}" + persistentVolumeClaim: + claimName: "{{ $volname }}" + {{- end }} + {{- end }} + containers: - name: {{ $name }} image: {{ $data.image | quote }} @@ -22,24 +31,17 @@ spec: {{ range $p := $data.ports }} - containerPort: {{ $p }} {{ end }} - {{ if $data.envFrom}} - envFrom: - {{ $data.envFrom | toYaml | nindent 20 }} - {{ end }} - {{ if $data.volumes }} - {{ range $volname, $mountPath := $data.volumes }} - volumeMounts: - - name: {{ $volname | quote }} - mountPath: {{ $mountPath | quote }} - {{ end }} - {{ if $data.volumes }} - {{ range $volname, $_ := $data.volumes }} - volumes: - - name: {{ $volname }} - persistentVolumeClaim: - claimName: {{ $volname }} - {{ end }} - + {{ if $data.volumes }} + {{ range $volname, $mountPath := $data.volumes }} + volumeMounts: + - name: {{ $volname | quote }} + mountPath: {{ $mountPath | quote }} + {{ end }} + {{ end }} + {{ if $data.envFrom}} + envFrom: + {{ $data.envFrom | toYaml | nindent 26 }} + {{ end }} --- kind: Service apiVersion: v1 @@ -49,11 +51,12 @@ metadata: spec: selector: app: {{ $name }} - type: {{ $data.service.type | default "ClusterIP" | quote }} + type: {{ $data.serviceType | default "ClusterIP" | quote }} ports: {{ range $port := $data.ports }} - name: {{ $port.name | default "http" | quote }} port: {{ $port.port }} targetPort: {{ $port.port }} {{ end }} + {{ end }} \ No newline at end of file