From 2881c618c98f3a366f01492ff7e578f78616283f Mon Sep 17 00:00:00 2001
From: sdimovv <36302090+sdimovv@users.noreply.github.com>
Date: Fri, 3 Nov 2023 19:35:21 +0000
Subject: [PATCH] fix(scale): Fix ingress clustercert var name (#14308)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->
Fixes some oversights in the ingress clustercertificate var

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [X] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [X] ⚖️ My code follows the style guidelines of this project
- [X] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [X] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Co-authored-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
---
 templates/questions/ingress/ingressAdvanced.yaml |  6 +++---
 templates/questions/ingress/ingressList.yaml     | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/questions/ingress/ingressAdvanced.yaml b/templates/questions/ingress/ingressAdvanced.yaml
index 370ab92447a..848554bde23 100644
--- a/templates/questions/ingress/ingressAdvanced.yaml
+++ b/templates/questions/ingress/ingressAdvanced.yaml
@@ -56,12 +56,12 @@
                                   schema:
                                     type: string
                                     default: ""
-                                - variable: 'clusterCertificate (Advanced)'
-                                  label:  Cluster Certificate
+                                - variable: clusterCertificate
+                                  label:  'Cluster Certificate (Advanced)'
                                   description: 'Add the name of your cluster-wide certificate, that you set up in the ClusterIssuer chart.'
                                   schema:
                                     type: string
-                                    show_if: [["clusterIssuer", "=", ""]]
+                                    show_if: [["certificateIssuer", "=", ""]]
                                     default: ""
                                 - variable: secretName
                                   label: 'Use Custom Certificate Secret (Advanced)'
diff --git a/templates/questions/ingress/ingressList.yaml b/templates/questions/ingress/ingressList.yaml
index ebc1f295d44..1bdd738353f 100644
--- a/templates/questions/ingress/ingressList.yaml
+++ b/templates/questions/ingress/ingressList.yaml
@@ -90,8 +90,8 @@
                                               label: Service Port
                                               schema:
                                                 type: int
-              - variable: clusterIssuer
-                label: clusterIssuer
+              - variable: certificateIssuer
+                label: certificateIssuer
                 description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates. Cannot be used combined with tls option below'
                 schema:
                   type: string
@@ -121,7 +121,7 @@
                                     type: string
                                     default: ""
                                     required: true
-                          - variable: clusterIssuer
+                          - variable: certificateIssuer
                             label: Use Cert-Manager clusterIssuer
                             description: 'add the name of your Cert-Manager clusterIssuer here for automatic tls certificates.'
                             schema:
@@ -135,8 +135,8 @@
                               $ref:
                                 - "definitions/certificate"
                           - variable: clusterCertificate
-                            label:  Cluster Certificate (Experimental)
-                            description: 'Add the name of your cluster-wide certificate, that you set up in the ClusterIssuer chart. NOTE: This is an experimental feature'
+                            label:  'Cluster Certificate (Advanced)'
+                            description: 'Add the name of your cluster-wide certificate, that you set up in the ClusterIssuer chart.'
                             schema:
                               type: string
                               show_if: [["clusterIssuer", "=", ""]]