truecharts/library-charts
1
0
Fork 0
mirror of https://github.com/truecharts/library-charts.git synced 2026-07-06 04:26:22 -03:00
Code Issues Packages Projects Releases Wiki Activity

initial work for volumeMounts for extra contaienrs

Browse Source
This commit is contained in:
Stavros kois
2023-01-04 15:36:44 +02:00
parent c233f81cc8
commit 5c8da7d0b2
4 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/common/1.0.0/templates/lib/container/_ports.tpl
View File

@@ -7,6 +7,7 @@ can be dynamically configured via an env var.
{{- define "ix.v1.common.container.ports" -}}
{{- $defaultPortProtocol := .Values.global.defaults.portProtocol -}}
{{- $ports := list -}}
{{- range $svcName, $svc := .Values.service -}}
{{- if $svc.enabled -}}
{{- if not $svc.ports -}}
@@ -50,6 +51,7 @@ can be dynamically configured via an env var.
{{- end -}}
{{- end -}}
{{/* This is called by init/install/upgrade/additional containers only */}}
{{- define "ix.v1.common.container.extraContainerPorts" -}}
{{- $containerName := .containerName -}}
{{- $ports := .ports -}}

26
library/common/1.0.0/templates/lib/container/_volumeMounts.tpl
View File

@@ -1,18 +1,26 @@
{{/* Volume Mounts included by the container. */}}
{{- define "ix.v1.common.container.volumeMounts" -}}
{{- range $name, $item := .Values.persistence -}}
{{- if $item.enabled -}}
{{- if not $item.noMount -}}
{{- include "ix.v1.common.container.volumeMount" (dict "root" $ "item" $item "name" $name) | nindent 0 -}}
{{- $isMainContainer := .isMainContainer -}}
{{- $root := .root -}}
{{- $extraContainerVolMounts := .extraContainerVolMouts -}}
{{- if $isMainContainer -}}
{{- range $name, $item := $root.Values.persistence -}}
{{- if $item.enabled -}}
{{- if not $item.noMount -}}
{{- include "ix.v1.common.container.volumeMount" (dict "root" $root "item" $item "name" $name) | nindent 0 -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/* TODO: write tests when statefulset is ready */}}
{{- if eq .Values.controller.type "statefulset" -}}
{{- range $index, $vct := .Values.volumeClaimTemplates -}}
{{- include "ix.v1.common.container.volumeMount" (dict "root" $ "item" $vct "name" (toString $index)) | nindent 0 -}}
{{/* TODO: write tests when statefulset is ready */}}
{{- if eq $root.Values.controller.type "statefulset" -}}
{{- range $index, $vct := $root.Values.volumeClaimTemplates -}}
{{- include "ix.v1.common.container.volumeMount" (dict "root" $root "item" $vct "name" (toString $index)) | nindent 0 -}}
{{- end -}}
{{- end -}}
{{- else if not $isMainContainer -}}
{{/* range themounts of extra contaienrs */}}
{{- end -}}
{{- end -}}

6
library/common/1.0.0/templates/lib/pod/_extraContainers.tpl
View File

@@ -90,6 +90,12 @@
ports:
{{- . | nindent 4 }}
{{- end -}}
{{- with (include "ix.v1.common.container.volumeMounts" (dict "root" $root
"extraContaienrVolMounts" $container.volumeMounts
"isMainContainer" false) | trim) }}
volumeMounts:
{{- . | nindent 4 }}
{{- end -}}
{{- with (include "ix.v1.common.container.resources" (dict "resources" $container.resources
"gpu" $container.scaleGPU
"isMainContainer" false

3
library/common/1.0.0/templates/lib/pod/_mainContainer.tpl
View File

@@ -54,7 +54,8 @@ So it can work on multiple places, like additional containers and not only the m
ports:
{{- . | nindent 4 }}
{{- end -}}
{{- with (include "ix.v1.common.container.volumeMounts" . | trim) }}
{{- with (include "ix.v1.common.container.volumeMounts" (dict "root" .
"isMainContainer" true) | trim) }}
volumeMounts:
{{- . | nindent 4 }}
{{- end -}}