From 7f24040b8709e72c1e177f4feec46be8329a1af3 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Mon, 30 Jan 2023 16:03:04 +0200 Subject: [PATCH] consistent order --- library/common/1.0.0/templates/classes/_statefulset.tpl | 1 + .../1.0.0/templates/lib/controller/_cronjobSpec.tpl | 4 ++-- .../1.0.0/templates/lib/controller/_daemonsetSpec.tpl | 2 +- .../1.0.0/templates/lib/controller/_deployementSpec.tpl | 2 +- .../common/1.0.0/templates/lib/controller/_jobSpec.tpl | 2 +- library/common/1.0.0/templates/lib/controller/_pod.tpl | 8 ++++++++ .../1.0.0/templates/lib/controller/_statefulsettSpec.tpl | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 library/common/1.0.0/templates/lib/controller/_pod.tpl diff --git a/library/common/1.0.0/templates/classes/_statefulset.tpl b/library/common/1.0.0/templates/classes/_statefulset.tpl index 0f355dfc5d..afff9fe46b 100644 --- a/library/common/1.0.0/templates/classes/_statefulset.tpl +++ b/library/common/1.0.0/templates/classes/_statefulset.tpl @@ -49,4 +49,5 @@ spec: {{- . | nindent 8 }} {{- end }} spec: + {{- include "ix.v1.common.lib.controller.pod" (dict "rootCtx" $rootCtx "objectData" $objectData.podSpec) -}} {{- end -}} diff --git a/library/common/1.0.0/templates/lib/controller/_cronjobSpec.tpl b/library/common/1.0.0/templates/lib/controller/_cronjobSpec.tpl index 7e92beb472..a4fd6c668e 100644 --- a/library/common/1.0.0/templates/lib/controller/_cronjobSpec.tpl +++ b/library/common/1.0.0/templates/lib/controller/_cronjobSpec.tpl @@ -1,6 +1,6 @@ {{/* CronJob Spec */}} {{/* Call this template: -{{ include "ix.v1.common.lib.controller.cronjobSpec" (dict "objectData" $objectData "rootCtx" $rootCtx) -}} +{{ include "ix.v1.common.lib.controller.cronjobSpec" (dict "rootCtx" $rootCtx "objectData" $objectData) -}} rootCtx: The root context of the template. It is used to access the global context. objectData: schedule: The schedule in Cron format, see https://en.wikipedia.org/wiki/Cron. @@ -22,5 +22,5 @@ successfulJobsHistoryLimit: {{ $objectData.successfulJobsHistoryLimit | default startingDeadlineSeconds: {{ $objectData.startingDeadlineSeconds | default nil }} jobTemplate: spec: - {{- include "ix.v1.common.lib.controller.jobSpec" (dict "objectData" $objectData "rootCtx" $rootCtx) | nindent 4 }} + {{- include "ix.v1.common.lib.controller.jobSpec" (dict "rootCtx" $rootCtx "objectData" $objectData) | nindent 4 }} {{- end -}} diff --git a/library/common/1.0.0/templates/lib/controller/_daemonsetSpec.tpl b/library/common/1.0.0/templates/lib/controller/_daemonsetSpec.tpl index 547ea517a4..3a4ad745cc 100644 --- a/library/common/1.0.0/templates/lib/controller/_daemonsetSpec.tpl +++ b/library/common/1.0.0/templates/lib/controller/_daemonsetSpec.tpl @@ -1,6 +1,6 @@ {{/* DaemonSet Spec */}} {{/* Call this template: -{{ include "ix.v1.common.lib.controller.daemonsetSpec" (dict "objectData" $objectData "rootCtx" $rootCtx) -}} +{{ include "ix.v1.common.lib.controller.daemonsetSpec" (dict "rootCtx" $rootCtx "objectData" $objectData) -}} rootCtx: The root context of the template. It is used to access the global context. objectData: replicas: The number of replicas. diff --git a/library/common/1.0.0/templates/lib/controller/_deployementSpec.tpl b/library/common/1.0.0/templates/lib/controller/_deployementSpec.tpl index 50192efbb6..066986f347 100644 --- a/library/common/1.0.0/templates/lib/controller/_deployementSpec.tpl +++ b/library/common/1.0.0/templates/lib/controller/_deployementSpec.tpl @@ -1,6 +1,6 @@ {{/* Deployment Spec */}} {{/* Call this template: -{{ include "ix.v1.common.lib.controller.deploymentSpec" (dict "objectData" $objectData "rootCtx" $rootCtx) -}} +{{ include "ix.v1.common.lib.controller.deploymentSpec" (dict "rootCtx" $rootCtx "objectData" $objectData) -}} rootCtx: The root context of the template. It is used to access the global context. objectData: replicas: The number of replicas. diff --git a/library/common/1.0.0/templates/lib/controller/_jobSpec.tpl b/library/common/1.0.0/templates/lib/controller/_jobSpec.tpl index 29eb533ebc..32fb804c16 100644 --- a/library/common/1.0.0/templates/lib/controller/_jobSpec.tpl +++ b/library/common/1.0.0/templates/lib/controller/_jobSpec.tpl @@ -1,6 +1,6 @@ {{/* Job Spec */}} {{/* Call this template: -{{ include "ix.v1.common.lib.controller.jobSpec" (dict "objectData" $objectData "rootCtx" $rootCtx) -}} +{{ include "ix.v1.common.lib.controller.jobSpec" (dict "rootCtx" $rootCtx "objectData" $objectData) -}} rootCtx: The root context of the template. It is used to access the global context. objectData: backoffLimit: The number of retries before marking this job failed. Defaults to 6. diff --git a/library/common/1.0.0/templates/lib/controller/_pod.tpl b/library/common/1.0.0/templates/lib/controller/_pod.tpl new file mode 100644 index 0000000000..6d6dc1dc0c --- /dev/null +++ b/library/common/1.0.0/templates/lib/controller/_pod.tpl @@ -0,0 +1,8 @@ +{{/* Pod Spec */}} +{{/* Call this template: +{{ include "ix.v1.common.lib.controller.pod" (dict "rootCtx" $ "objectData" $objectData) }} +rootCtx: The root context of the template. It is used to access the global context. +objectData: The object data to be used to render the Pod. +*/}} +{{- define "ix.v1.common.lib.controller.pod" -}} +{{- end -}} diff --git a/library/common/1.0.0/templates/lib/controller/_statefulsettSpec.tpl b/library/common/1.0.0/templates/lib/controller/_statefulsettSpec.tpl index b0a5d9d49b..843e2ad5b7 100644 --- a/library/common/1.0.0/templates/lib/controller/_statefulsettSpec.tpl +++ b/library/common/1.0.0/templates/lib/controller/_statefulsettSpec.tpl @@ -1,6 +1,6 @@ {{/* StatefulSet Spec */}} {{/* Call this template: -{{ include "ix.v1.common.lib.controller.statefulsetSpec" (dict "objectData" $objectData "rootCtx" $rootCtx) -}} +{{ include "ix.v1.common.lib.controller.statefulsetSpec" (dict "rootCtx" $rootCtx "objectData" $objectData) -}} rootCtx: The root context of the template. It is used to access the global context. objectData: replicas: The number of replicas.