From 4d4f3fdf9e7d6b76bb58819b028867d4300d49a2 Mon Sep 17 00:00:00 2001
From: Alec Fenichel <alec.fenichel@gmail.com>
Date: Mon, 5 Jun 2023 15:51:30 -0400
Subject: [PATCH] fix(cloudflared) fix container not starting (#9420)
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)-->

1. Fixes the bug causing cloudflared not to start.
2. cloudflared no longer runs as root.

**⚙️ 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
- [x] ⬆️ 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._
---
 charts/incubator/cloudflared/Chart.yaml       |  2 +-
 .../incubator/cloudflared/ci/test-values.yaml | 11 +++++++++-
 charts/incubator/cloudflared/values.yaml      | 20 ++++++-------------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/charts/incubator/cloudflared/Chart.yaml b/charts/incubator/cloudflared/Chart.yaml
index dac9ca11bce..d21cd879d8c 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.0
+version: 5.0.1
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/incubator/cloudflared/ci/test-values.yaml b/charts/incubator/cloudflared/ci/test-values.yaml
index 8ebcee81289..a910b9773b5 100644
--- a/charts/incubator/cloudflared/ci/test-values.yaml
+++ b/charts/incubator/cloudflared/ci/test-values.yaml
@@ -1,3 +1,12 @@
 # With the bellow we test both container starts and that tpl is working inside extraArgs list
-args: ["tunnel", "--no-autoupdate", "run", "{{ .Values.testTpl }}"]
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          args:
+            - tunnel
+            - --no-autoupdate
+            - "{{ .Values.testTpl }}"
+
 testTpl: "--hello-world"
diff --git a/charts/incubator/cloudflared/values.yaml b/charts/incubator/cloudflared/values.yaml
index a5434d807d4..fb7816f0dbd 100644
--- a/charts/incubator/cloudflared/values.yaml
+++ b/charts/incubator/cloudflared/values.yaml
@@ -3,20 +3,6 @@ image:
   pullPolicy: IfNotPresent
   tag: v2023.5.1@sha256:2136a26cb736c3219c523c3dfdfa53efd5834a82cfefcb2b991b47237c0e149f
 
-securityContext:
-  container:
-    readOnlyRootFilesystem: false
-    runAsNonRoot: false
-    runAsUser: 0
-    runAsGroup: 0
-
-args:
-  - tunnel
-  - --no-autoupdate
-  - run
-  - --token
-  - "{{ .Values.cloudflared.token }}"
-
 cloudflared:
   token: ""
 
@@ -32,6 +18,12 @@ workload:
               enabled: false
             startup:
               enabled: false
+          args:
+            - tunnel
+            - --no-autoupdate
+            - run
+            - --token
+            - "{{ .Values.cloudflared.token }}"
 
 service:
   main: