From 08286daeb08d2116493ec3aee3b995852e06add8 Mon Sep 17 00:00:00 2001 From: Muhammad Rehan Date: Sat, 20 Nov 2021 03:45:13 +0500 Subject: [PATCH] Add deployments for additional coins --- Makefile | 4 + .../templates/lib/containers/_image.tpl | 2 +- .../templates/lib/containers/_port.tpl | 12 +++ .../templates/lib/storage/_appStorage.tpl | 12 +-- test/machinaris/1.0.11/Chart.yaml | 2 +- .../1.0.11/charts/common-2105.0.0.tgz | Bin 0 -> 4422 bytes test/machinaris/1.0.11/ix_values.yaml | 85 +++++++++++++++++- .../1.0.11/templates/coins-deployment.yaml | 51 +++++++++++ test/machinaris/1.0.11/templates/service.yaml | 1 + test/machinaris/1.0.11/test_values.yaml | 2 +- 10 files changed, 161 insertions(+), 10 deletions(-) create mode 100644 Makefile create mode 100644 library/common/2105.0.0/templates/lib/containers/_port.tpl create mode 100644 test/machinaris/1.0.11/charts/common-2105.0.0.tgz create mode 100644 test/machinaris/1.0.11/templates/coins-deployment.yaml diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000..2cd6b18b89 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ + +validate: + @helm dependency update ./test/machinaris/1.0.11 + @helm template --values ./test/machinaris/1.0.11/ix_values.yaml machinaris ./test/machinaris/1.0.11 --debug \ No newline at end of file diff --git a/library/common/2105.0.0/templates/lib/containers/_image.tpl b/library/common/2105.0.0/templates/lib/containers/_image.tpl index 4a5a368008..2b2b04561d 100644 --- a/library/common/2105.0.0/templates/lib/containers/_image.tpl +++ b/library/common/2105.0.0/templates/lib/containers/_image.tpl @@ -4,6 +4,6 @@ Retrieve image configuration for container {{- define "common.containers.imageConfig" -}} {{- $values := . -}} {{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "repository" "tag" "pullPolicy")) -}} -image: "{{ $values.repository }}:{{ $values.tag }}" +image: "{{ $values.repository }}{{- if hasKey $values "postfix" -}}-{{ $values.postfix }}{{- end -}}:{{ $values.tag }}" imagePullPolicy: {{ $values.pullPolicy }} {{- end -}} diff --git a/library/common/2105.0.0/templates/lib/containers/_port.tpl b/library/common/2105.0.0/templates/lib/containers/_port.tpl new file mode 100644 index 0000000000..7833994311 --- /dev/null +++ b/library/common/2105.0.0/templates/lib/containers/_port.tpl @@ -0,0 +1,12 @@ +{{/* +Retrieve ports configuration for container +*/}} +{{- define "common.containers.configurePorts" -}} +ports: +{{- range $index, $port := .ports -}} +{{- include "common.schema.validateKeys" (dict "values" $port "checkKeys" (list "protocol" "containerPort")) }} +- protocol: {{ $port.protocol }} + containerPort: {{ $port.containerPort }} + {{- if hasKey $port "name" }}name: {{ $port.name }}{{ end -}} +{{- end }} +{{ end -}} diff --git a/library/common/2105.0.0/templates/lib/storage/_appStorage.tpl b/library/common/2105.0.0/templates/lib/storage/_appStorage.tpl index 0651870eb1..7e83dddf0e 100644 --- a/library/common/2105.0.0/templates/lib/storage/_appStorage.tpl +++ b/library/common/2105.0.0/templates/lib/storage/_appStorage.tpl @@ -29,23 +29,23 @@ Define hostPath for appVolumes {{- $values := . -}} {{- if $values.appVolumeMounts -}} {{- range $name, $av := $values.appVolumeMounts -}} -{{ if (default true $av.enabled) }} +{{ if (default true $av.enabled) -}} - name: {{ $name }} - {{ if or $av.emptyDir $.emptyDirVolumes }} + {{- if or $av.emptyDir $.emptyDirVolumes }} emptyDir: {} {{- else -}} hostPath: - {{ if $av.hostPathEnabled }} + {{- if $av.hostPathEnabled }} path: {{ required "hostPath not set" $av.hostPath }} {{ else }} {{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "ixVolumes")) -}} {{- include "common.schema.validateKeys" (dict "values" $av "checkKeys" (list "datasetName")) -}} {{- $volDict := dict "datasetName" $av.datasetName "ixVolumes" $values.ixVolumes -}} path: {{ include "common.storage.retrieveHostPathFromiXVolume" $volDict }} - {{ end }} - {{ end }} + {{ end -}} + {{- end -}} {{ end }} -{{- end -}} +{{ end -}} {{- end -}} {{- end -}} diff --git a/test/machinaris/1.0.11/Chart.yaml b/test/machinaris/1.0.11/Chart.yaml index 2dd13f5a7f..ae80f76f96 100644 --- a/test/machinaris/1.0.11/Chart.yaml +++ b/test/machinaris/1.0.11/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: v0.6.1 +appVersion: v0.6.4 dependencies: - name: common repository: file://../../../library/common/2112.0.0 diff --git a/test/machinaris/1.0.11/charts/common-2105.0.0.tgz b/test/machinaris/1.0.11/charts/common-2105.0.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..a1defeb19596816159a9ca548ac7f7afe10ea12f GIT binary patch literal 4422 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