From b134ff87656db7beebb858c25e4296c1d5bce4a7 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Tue, 6 Aug 2024 11:26:13 +0200
Subject: [PATCH] make custom manifests an init container

---
 README.md                     | 2 +-
 chart/Chart.yaml              | 2 +-
 chart/templates/PostSync.yaml | 2 +-
 tests/results/full.yaml       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 766bce4..33b53e8 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ spec:
   sources:
   - repoURL: 'https://loganmc10.github.io/hypershift-helm'
     chart: deploy-cluster
-    targetRevision: 0.1.23
+    targetRevision: 0.1.24
     helm:
       valueFiles:
       - $values/install-config.yaml
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 19845e8..dcee82a 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -4,4 +4,4 @@ description: A Helm chart for deploying HyperShift clusters on bare metal
 
 type: application
 
-version: 0.1.23
+version: 0.1.24
diff --git a/chart/templates/PostSync.yaml b/chart/templates/PostSync.yaml
index 743818a..8464dec 100644
--- a/chart/templates/PostSync.yaml
+++ b/chart/templates/PostSync.yaml
@@ -170,7 +170,6 @@ spec:
               mountPath: "/script"
               readOnly: true
 {{- end }}
-      containers:
 {{- if hasKey .Values.hypershift "customManifests" }}
         - name: apply-custom-manifests
           image: {{ include "ocp_client" . }}
@@ -189,6 +188,7 @@ spec:
               mountPath: "/script"
               readOnly: true
 {{- end }}
+      containers:
         - name: configure-ingress
           image: {{ include "ocp_client" . }}
           command:
diff --git a/tests/results/full.yaml b/tests/results/full.yaml
index 57bb8a4..54ee55c 100644
--- a/tests/results/full.yaml
+++ b/tests/results/full.yaml
@@ -531,7 +531,6 @@ spec:
             - name: cluster-setup
               mountPath: "/script"
               readOnly: true
-      containers:
         - name: apply-custom-manifests
           image: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fc458ece66c8d4184b45b5c495a372a96b47432ae5a39844cd5837e3981685b
           command:
@@ -548,6 +547,7 @@ spec:
             - name: cluster-setup
               mountPath: "/script"
               readOnly: true
+      containers:
         - name: configure-ingress
           image: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fc458ece66c8d4184b45b5c495a372a96b47432ae5a39844cd5837e3981685b
           command: