From 55e7706f7e8760603efe0409c3458ef52a8ed0cb Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Mon, 1 Nov 2021 22:34:10 +0000
Subject: [PATCH] Revert "Set Security Context to ks-user job"

This reverts commit 5407b547bbb08397e41cceec4cf88d7ae9cbf9fc.

Reason for revert: This outputs duplicate securityContext entries,
breaking the yamllinter in osh. This needs a slight rework.

Change-Id: I0c892be5aba7ccd6e3c378e4e45a79d2df03c06a
---
 helm-toolkit/Chart.yaml                                | 2 +-
 helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl | 9 ---------
 releasenotes/notes/helm-toolkit.yaml                   | 1 +
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/helm-toolkit/Chart.yaml b/helm-toolkit/Chart.yaml
index 997957bdd..d0af6c793 100644
--- a/helm-toolkit/Chart.yaml
+++ b/helm-toolkit/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Helm-Toolkit
 name: helm-toolkit
-version: 0.2.25
+version: 0.2.26
 home: https://docs.openstack.org/openstack-helm
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
 sources:
diff --git a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
index 8bb2dd23e..cb90b44f6 100644
--- a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
@@ -70,15 +70,6 @@ spec:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName | quote }}
-{{- if hasKey $envAll.Values "pod" -}}
-{{- if hasKey $envAll.Values.pod "security_context" -}}
-{{- range $service, $value := $envAll.Values.pod.security_context }}
-{{- if  (($value).pod) }}
-{{ dict "envAll" $envAll "application" $service | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
       restartPolicy: {{ $restartPolicy }}
       nodeSelector:
 {{ toYaml $nodeSelector | indent 8 }}
diff --git a/releasenotes/notes/helm-toolkit.yaml b/releasenotes/notes/helm-toolkit.yaml
index 423479717..725b9c5fe 100644
--- a/releasenotes/notes/helm-toolkit.yaml
+++ b/releasenotes/notes/helm-toolkit.yaml
@@ -32,4 +32,5 @@ helm-toolkit:
   - 0.2.23 Helm 3 - Fix Job labels
   - 0.2.24 Migrate Ingress resources to networking.k8s.io/v1
   - 0.2.25 Set Security Context to ks-user job
+  - 0.2.26 Revert Set Security Context to ks-user job
 ...