From f01f35a5245d8fbeaf183575683f9ed29c9e6acd Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Mon, 21 Feb 2022 09:58:14 -0600
Subject: [PATCH] Fix field validation error

The metacontroller chart currently has the field
terminationGracePeriodSeconds in an invalid spot in the template
which causes a chart building error when using helm v3. This
change moves the field to the correct position in the template.

Change-Id: Ief454115f67af35f8dfb570d8315de82d97b536d
---
 metacontroller/Chart.yaml                 | 2 +-
 metacontroller/templates/statefulset.yaml | 2 +-
 releasenotes/notes/metacontroller.yaml    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/metacontroller/Chart.yaml b/metacontroller/Chart.yaml
index 3558c7954..26456fc82 100644
--- a/metacontroller/Chart.yaml
+++ b/metacontroller/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v0.4.2
 description: A Helm chart for Metacontroller
 name: metacontroller
-version: 0.1.4
+version: 0.1.5
 home: https://metacontroller.app/
 keywords:
   - CRDs
diff --git a/metacontroller/templates/statefulset.yaml b/metacontroller/templates/statefulset.yaml
index a98e5c284..2472ec476 100644
--- a/metacontroller/templates/statefulset.yaml
+++ b/metacontroller/templates/statefulset.yaml
@@ -65,7 +65,6 @@ spec:
   serviceName: {{ tuple "metacontroller" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
   podManagementPolicy: "Parallel"
   replicas: {{ .Values.pod.replicas.metacontroller }}
-  terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.server.timeout | default "30" }}
   template:
     metadata:
       labels:
@@ -75,6 +74,7 @@ spec:
     spec:
 {{ dict "envAll" . "application" "metacontroller" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.server.timeout | default "30" }}
       nodeSelector:
         {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value | quote }}
       containers:
diff --git a/releasenotes/notes/metacontroller.yaml b/releasenotes/notes/metacontroller.yaml
index dc476535c..ad153fdfd 100644
--- a/releasenotes/notes/metacontroller.yaml
+++ b/releasenotes/notes/metacontroller.yaml
@@ -5,4 +5,5 @@ metacontroller:
   - 0.1.2 Fix disappearing metacontroller CRDs on upgrade
   - 0.1.3 Use full image ref for docker official images
   - 0.1.4 Update htk requirements
+  - 0.1.5 Fix field validation error
 ...