From 1195828b58ec9d5bf506f32b69bb3e1706112eb8 Mon Sep 17 00:00:00 2001
From: Thiago Brito <thiago.brito@windriver.com>
Date: Tue, 10 May 2022 14:15:20 -0300
Subject: [PATCH] Fix portieris-app to use upversioned cert-manager

On [1] and [2] cert-manager was migrated to fluxcd and upversioned
to version 1.7.1, but the portieris helm-charts are still creating
CRs with apiVersion v1beta2. This commit fixes it and also fixes
rendering issues for helmv3.

[1] https://review.opendev.org/c/starlingx/cert-manager-armada-app/+/831956
[2] https://review.opendev.org/c/starlingx/cert-manager-armada-app/+/838590


TEST PLAN
PASS build portieris-fluxcd app
PASS Upload
PASS Apply (verified created resources)
PASS Remove
PASS Delete

Logs: https://paste.opendev.org/show/b7dk5CFwtJEtBp8cLAXD/
Cluster State: https://paste.opendev.org/show/bvpBXWhU1GNlOlVuaz6H/

Story: 2009837
Task: 45333

Signed-off-by: Thiago Brito <thiago.brito@windriver.com>
Change-Id: Ic97e1af44d983044b8e93212459625238a3b6c27
---
 .../portieris-certs/templates/certificate.yaml         | 10 ++++++----
 .../helm-charts/portieris-certs/templates/issuer.yaml  |  6 ++++--
 .../helm-charts/portieris-certs/templates/secret.yaml  |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/certificate.yaml b/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/certificate.yaml
index 18cbe02..62ed14a 100644
--- a/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/certificate.yaml
+++ b/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/certificate.yaml
@@ -1,11 +1,13 @@
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
+  creationTimestamp: null
   name: portieris-certs
   namespace: portieris
 spec:
   dnsNames:
-    - portieris.portieris.svc
-  secretName: portieris-certs
+  - portieris.portieris.svc
   issuerRef:
-    name: stx-portieris
\ No newline at end of file
+    name: stx-portieris
+  secretName: portieris-certs
+status: {}
diff --git a/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/issuer.yaml b/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/issuer.yaml
index 120b038..5d33929 100644
--- a/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/issuer.yaml
+++ b/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/issuer.yaml
@@ -1,7 +1,9 @@
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
+  creationTimestamp: null
   name: stx-portieris
   namespace: portieris
 spec:
-  selfSigned: {}
\ No newline at end of file
+  selfSigned: {}
+status: {}
diff --git a/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/secret.yaml b/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/secret.yaml
index a8f8b34..abdf63c 100644
--- a/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/secret.yaml
+++ b/stx-portieris-helm/stx-portieris-helm/helm-charts/portieris-certs/templates/secret.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    ca.pem: {{ .Values.caCert }}
+    ca.pem: {{ .Values.caCert | toString | quote }}
     tls.crt: ""
     tls.key: ""
 kind: Secret