Skip to content

Remove newlines #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
frmadem wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove newlines #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f06dbd
Remove newlines
frmadem Sep 21, 2021
aaf616d
try removing pod empty lines
AlbertoFemenias Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 34 additions & 62 deletions templates/_renders_container.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,26 @@
{{- define "ph.container.render" -}}

- name: {{ default "container" .name }}
image: {{ .image | quote}}
imagePullPolicy: {{ default "IfNotPresent" .imagePullPolicy }}
{{ include "ph.command.render" . | nindent 2}}
{{ include "ph.args.render" . | nindent 2 }}
{{- include "ph.command.render" . | nindent 2}}
{{- include "ph.args.render" . | nindent 2 }}
env: {{ include "ph.env.render" . | nindent 2 }}
envFrom: {{ include "ph.env_from.render" . | nindent 2 }}
ports: {{ include "ph.container.ports.render" . | nindent 2 }}
{{ if .workingDir }}
ports: {{ include "ph.container.ports.render" . | nindent 2 }}
{{- if .workingDir }}
workingDir: {{ .workingDir }}
{{ end }}

{{ end -}}
{{/*Lifecycle section*/}}
{{ with .lifecycle }}
{{- with .lifecycle }}
lifecycle: {{ . | toYaml | nindent 4 }}
{{ end }}


volumeMounts: {{ include "ph.container.volume_mounts.render" . | nindent 4 }}
resources: {{ include "ph.container.resources.render" . | nindent 4 }}
{{ include "ph.container_readiness_probe.render" . | indent 2}}

{{ include "ph.container_liveness_probe.render" . | indent 2}}

{{- end -}}
{{ include "ph.container_readiness_probe.render" . | indent 2 -}}
{{ include "ph.container_liveness_probe.render" . | indent 2 -}}
{{- end }}

{{- define "ph.args.render" -}}

{{- if hasKey . "args" -}}
args: {{ range $a := .args }}
- {{ $a | quote }}
Expand All @@ -36,122 +29,104 @@ args: {{ range $a := .args }}
{{- end -}}

{{- define "ph.command.render" -}}

{{- if hasKey . "command" -}}
command: {{ range $a := .command }}
- {{ $a | quote }}
{{- end -}}
{{- end -}}

{{- end -}}


{{- define "ph.env.render" -}}

{{ range $k, $v := (default (dict) .env_literal) }}
- name: {{ $k }}
value: {{ $v | quote}}
{{ end }}
{{ include "ph.env_values_configmap.render" . }}
{{ include "ph.env_values_secret.render" . }}
{{ include "ph.env_values_from_field_ref.render" .}}
{{ include "ph.env_values_from_resource_ref.render" .}}
value: {{ $v | quote -}}
{{ end -}}
{{ include "ph.env_values_configmap.render" . -}}
{{ include "ph.env_values_secret.render" . -}}
{{ include "ph.env_values_from_field_ref.render" . -}}
{{ include "ph.env_values_from_resource_ref.render" . -}}
{{- end -}}


{{- define "ph.env_values_configmap.render" -}}

{{ range $e := (default (dict) .env_values_configmap) }}
{{ range $k, $v := $e.values }}
{{- range $e := (default (dict) .env_values_configmap) }}
{{- range $k, $v := $e.values }}
- name: {{ $k }}
valueFrom:
configMapKeyRef:
name: {{ $e.configmap }}
key: {{ $v }}
{{ end }}
{{ end }}
key: {{ $v -}}
{{ end -}}
{{ end -}}
{{- end -}}



{{- define "ph.env_values_secret.render" -}}

{{ range $e := (default (dict) .env_values_secret) }}
{{ range $k, $v := $e.values }}
- name: {{ $k }}
valueFrom:
secretKeyRef:
name: {{ $e.secret}}
key: {{ $v }}
key: {{ $v -}}
{{ end }}
{{ end }}
{{- end -}}



{{- define "ph.env_values_from_field_ref.render" -}}

{{- range $k, $v := (default (dict) .env_from_field_ref) }}
- name: {{ $k }}
valueFrom:
fieldRef:
fieldPath: {{ $v }}
fieldPath: {{ $v -}}
{{ end -}}
{{- end -}}



{{- define "ph.env_values_from_resource_ref.render" -}}

{{- range $e := (default (list) .env_from_resource_ref) }}
{{- range $k, $v := (default (list) $e.values) }}
- name: {{ $k }}
valueFrom:
resourceFieldRef:
containerName: {{ $e.container }}
resource: {{ $v }}
{{ end }}
{{- end }}
resource: {{ $v -}}
{{ end -}}
{{ end -}}
{{- end -}}



{{- define "ph.env_from.render" -}}

{{ $env_from := default (dict) .envFrom }}

{{- range $cm := default (list) $env_from.configmaps }}
- configMapRef:
name: {{ $cm }}

name: {{ $cm -}}
{{ end -}}

{{- range $sec := default (list) $env_from.secrets }}
- secretRef:
name: {{ $sec }}

name: {{ $sec -}}
{{ end -}}

{{- end -}}


{{- define "ph.container.ports.render" -}}

{{- range $port := .ports -}}
- containerPort: {{ $port.pod }}
protocol: {{ default "TCP" $port.protocol }}
{{ with $port.name }}
protocol: {{ default "TCP" $port.protocol -}}
{{- with $port.name }}
name: {{ . }}
{{ end }}
{{end -}}

{{ end -}}
{{ end -}}
{{- end -}}

{{- define "ph.container.volume_mounts.render" -}}

{{- if hasKey . "volumeMounts_dict" }}
{{- range $key := ( keys .volumeMounts_dict | sortAlpha )}}
- {{ (get $.volumeMounts_dict $key) | toYaml | nindent 2 }}
- {{ (get $.volumeMounts_dict $key) | toYaml | trim | nindent 2 }}
{{- end -}}
{{- else -}}
{{- range $vm := (default (list) .volumeMounts ) }}
Expand All @@ -164,10 +139,7 @@ command: {{ range $a := .command }}


{{- define "ph.container.resources.render" -}}

{{- $resources := (default (dict) .resources ) -}}

requests: {{ default dict $resources.requests | toYaml | nindent 4 }}
limits: {{ default dict $resources.limits | toYaml | nindent 4 }}

requests: {{ default dict $resources.requests | toYaml | trim | nindent 4 }}
limits: {{ default dict $resources.limits | toYaml | trim | nindent 4 }}
{{- end -}}
11 changes: 0 additions & 11 deletions templates/_renders_override.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,15 @@


{{- define "ph.augmenters.final" -}}

{{ $obj := . }}

{{ if kindIs "map" $obj }}

{{ range $k, $v := $obj }}

{{ if regexMatch ".final" $k }}

{{ $name := splitList ".final" $k | join "" }}

{{ $_ := unset $obj $k }}
{{ $_ := set $obj $name $v }}

{{ end }}

{{ include "ph.augmenters.final" $v }}

{{ end }}

{{ end }}

{{- end -}}
34 changes: 16 additions & 18 deletions templates/_renders_pod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ apiVersion: v1
kind: Pod
metadata:
name: {{ .name }}
{{ with .annotations }}
{{- with .annotations }}
annotations: {{ . | toYaml | nindent 4 }}
{{ end }}
{{ with .labels }}
{{- end }}
{{- with .labels }}
labels: {{ . | toYaml | nindent 4 }}
{{ end }}

{{- end }}
spec: {{ include "ph.pod.render" . | nindent 2}}

{{- end -}}
Expand All @@ -25,28 +24,27 @@ spec: {{ include "ph.pod.render" . | nindent 2}}
*/}}

{{- define "ph.pod.render" -}}

{{ include "ph.init_containers.render" . }}
{{ include "ph.init_containers.render" . -}}

containers: {{ include "ph.pod.containers.render" . | nindent 2}}
{{ if .serviceAccountName }}
{{- if .serviceAccountName }}
serviceAccountName: {{ .serviceAccountName }}
{{ end }}
{{- end }}

{{ if .restartPolicy }}
{{- if .restartPolicy }}
restartPolicy: {{ .restartPolicy }}
{{ end }}
{{- end }}

{{ if .affinity }}
{{- if .affinity }}
affinity: {{ .affinity | toYaml | nindent 2}}
{{ end }}
{{- end }}

{{ if .nodeSelector }}
{{- if .nodeSelector }}
nodeSelector: {{ .nodeSelector | toYaml | nindent 2}}
{{ end }}
{{- end }}

imagePullSecrets:
{{ range $v := default (list) .imagePullSecrets }}
{{- range $v := default (list) .imagePullSecrets }}
- name: {{ $v }}
{{ end }}

Expand All @@ -67,11 +65,11 @@ terminationGracePeriodSeconds: {{ .terminationGracePeriodSeconds }}
{{- define "ph.pod.containers.render" -}}
{{- if hasKey . "containers_dict" -}}
{{- range $k := ( keys .containers_dict | sortAlpha ) }}
{{ include "ph.container.render" (get $.containers_dict $k) | nindent 2}}
{{- include "ph.container.render" (get $.containers_dict $k) | nindent 2}}
{{- end }}
{{- else -}}
{{- range $c := .containers }}
{{ include "ph.container.render" $c | nindent 2}}
{{- include "ph.container.render" $c | nindent 2}}
{{- end }}
{{- end -}}
{{- end -}}
Expand Down