From c1c53e9e562b57f78ec343c3800c2769503e30c2 Mon Sep 17 00:00:00 2001
From: Alec Fenichel <alec.fenichel@gmail.com>
Date: Mon, 5 Jun 2023 18:20:58 -0400
Subject: [PATCH] fix(cloudflared) use env for token (#9422)
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)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [x] 🪛 Bugfix
- [x] ⚠️ 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
- [x] ⬆️ I increased versions for any altered app according to semantic
versioning

See comment below.

**➕ 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._
---
 charts/incubator/cloudflared/Chart.yaml          |  2 +-
 charts/incubator/cloudflared/ci/test-values.yaml |  5 +----
 charts/incubator/cloudflared/questions.yaml      | 13 ++++++-------
 charts/incubator/cloudflared/values.yaml         |  4 ++--
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/charts/incubator/cloudflared/Chart.yaml b/charts/incubator/cloudflared/Chart.yaml
index d21cd879d8c..29bd9279f4b 100644
--- a/charts/incubator/cloudflared/Chart.yaml
+++ b/charts/incubator/cloudflared/Chart.yaml
@@ -20,7 +20,7 @@ name: cloudflared
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/cloudflared
 type: application
-version: 5.0.1
+version: 5.0.2
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/incubator/cloudflared/ci/test-values.yaml b/charts/incubator/cloudflared/ci/test-values.yaml
index a910b9773b5..bc009c83e10 100644
--- a/charts/incubator/cloudflared/ci/test-values.yaml
+++ b/charts/incubator/cloudflared/ci/test-values.yaml
@@ -1,4 +1,3 @@
-# With the bellow we test both container starts and that tpl is working inside extraArgs list
 workload:
   main:
     podSpec:
@@ -7,6 +6,4 @@ workload:
           args:
             - tunnel
             - --no-autoupdate
-            - "{{ .Values.testTpl }}"
-
-testTpl: "--hello-world"
+            - --hello-world
diff --git a/charts/incubator/cloudflared/questions.yaml b/charts/incubator/cloudflared/questions.yaml
index cde41102915..9e9cfb9219e 100644
--- a/charts/incubator/cloudflared/questions.yaml
+++ b/charts/incubator/cloudflared/questions.yaml
@@ -8,17 +8,16 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
-
-                                - variable: cloudflared
-                                  group: App Configuration
-                                  label: Cloudflared Configuration
+                                - variable: env
+                                  group: "App Configuration"
+                                  label: "Image Environment"
                                   schema:
                                     additional_attrs: true
                                     type: dict
                                     attrs:
-                                      - variable: token
-                                        label: Tunnel Token
-                                        description: Token for tunnel (Tunnel managed by Cloudflare not locally)
+                                      - variable: TUNNEL_TOKEN
+                                        label: "Tunnel Token"
+                                        description: "Token for tunnel (Tunnel managed by Cloudflare not locally)"
                                         schema:
                                           type: string
                                           required: true
diff --git a/charts/incubator/cloudflared/values.yaml b/charts/incubator/cloudflared/values.yaml
index fb7816f0dbd..1d96b95a421 100644
--- a/charts/incubator/cloudflared/values.yaml
+++ b/charts/incubator/cloudflared/values.yaml
@@ -22,8 +22,8 @@ workload:
             - tunnel
             - --no-autoupdate
             - run
-            - --token
-            - "{{ .Values.cloudflared.token }}"
+          env:
+            TUNNEL_TOKEN: ""
 
 service:
   main: