feat(cloudflare): Changed cloudflared command when testing the Chart (#19)

charts/cloudflare-tunnel/Chart.yaml

@@ -4,7 +4,7 @@ description: Connect your resources to Cloudflare without a publicly routable IP
 home: https://github.com/plcnk/charts/tree/master/charts/cloudflare-tunnel
 icon: https://raw.githubusercontent.com/plcnk/charts/master/charts/cloudflare-tunnel/icon.svg
 type: application
-version: 0.1.0
+version: 0.1.1
 # renovate datasource=docker depName=cloudflare/cloudflared
 appVersion: "2024.8.2"
 kubeVersion: ">=1.22.0-0"
@@ -21,8 +21,8 @@ sources:
   - https://github.com/cloudflare/cloudflared
 annotations:
   artifacthub.io/changes: |-
-    - kind: added
-      description: Initial release
+    - kind: changed
+      description: Changed cloudflared command when testing the Chart.
   artifacthub.io/links: |-
     - name: App Source
       url: https://github.com/cloudflare/cloudflared

charts/cloudflare-tunnel/README.md

@@ -102,8 +102,8 @@ helm install cloudflare-tunnel plcnk/cloudflare-tunnel -f values.yaml
 | controllers.main.type | string | `"deployment"` | Controller type |
 | logLevel | string | `"info"` | Set the container log level.    Accepted values: `debug`, `info`, `warn`, `error`, `fatal` |
 | metrics | object | `{"enabled":false,"port":""}` | Enable Metrics Monitor under this key. |
-| tunnel.existingSecret | object | `{"enabled":false,"key":"","name":""}` | You can set the token as an existing secret here. |
-| tunnel.token | string | `"your-token-here"` | Set the Cloudflare Tunnel token here. |
+| tunnel.existingSecret | object | `{"enabled":false,"key":"","name":""}` | You can set the token as an existing secret here.    Cannot coexist with `tunnel.token` |
+| tunnel.token | string | `"your-token-here"` | Set the Cloudflare Tunnel token here.    Cannot coexist with `tunnel.existingSecret.enabled` set to `true`. |
 
 ---
 Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs)

charts/cloudflare-tunnel/icon.svg

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg xmlns="http://www.w3.org/2000/svg"
-aria-label="Cloudflare" role="img"
-viewBox="0 0 512 512"><rect
-width="512" height="512"
-rx="15%"
-fill="#ffffff"/><path fill="#f38020" d="M331 326c11-26-4-38-19-38l-148-2c-4 0-4-6 1-7l150-2c17-1 37-15 43-33 0 0 10-21 9-24a97 97 0 0 0-187-11c-38-25-78 9-69 46-48 3-65 46-60 72 0 1 1 2 3 2h274c1 0 3-1 3-3z"/><path fill="#faae40" d="M381 224c-4 0-6-1-7 1l-5 21c-5 16 3 30 20 31l32 2c4 0 4 6-1 7l-33 1c-36 4-46 39-46 39 0 2 0 3 2 3h113l3-2a81 81 0 0 0-78-103"/></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: visioncortex VTracer 0.6.3 -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="1368" height="1368">
+<path d="M0 0 C0.9 0.3 1.81 0.59 2.74 0.9 C30.37 10.09 57.26 23.05 81 40 C82.05 40.75 82.05 40.75 83.12 41.51 C93.85 49.19 104.2 57.16 114 66 C114.9 66.8 114.9 66.8 115.81 67.62 C130.2 80.59 143.43 94.46 155 110 C155.5 110.67 156 111.33 156.52 112.02 C183.24 147.62 203.61 188.25 213.24 231.92 C214.71 238.18 217.19 243.88 222.43 247.84 C223.24 248.2 224.04 248.56 224.88 248.94 C225.68 249.32 226.48 249.7 227.3 250.09 C233.49 252.18 239.84 252.15 246.29 252.18 C248.12 252.2 249.95 252.22 251.79 252.24 C253.22 252.26 253.22 252.26 254.67 252.27 C315.14 253.09 372.77 269.58 421 307 C421.92 307.71 422.84 308.42 423.79 309.15 C428.88 313.14 433.73 317.36 438.51 321.73 C440.13 323.21 441.77 324.67 443.43 326.11 C454.99 336.21 464.81 347.74 474 360 C474.43 360.57 474.86 361.15 475.3 361.74 C481.81 370.47 487.66 379.51 493 389 C493.43 389.77 493.87 390.54 494.32 391.34 C501.8 404.78 507.75 418.55 513 433 C513.26 433.7 513.52 434.41 513.79 435.13 C532.45 485.92 532.08 543.7 518.19 595.53 C516.6 598.84 515.13 600.04 512 602 C508.93 602.58 505.9 602.54 502.78 602.5 C501.84 602.51 500.9 602.51 499.94 602.52 C496.77 602.53 493.61 602.52 490.44 602.5 C488.15 602.51 485.85 602.51 483.56 602.52 C477.22 602.54 470.87 602.53 464.53 602.51 C458.36 602.5 452.18 602.51 446 602.52 C433.21 602.54 420.42 602.54 407.63 602.53 C394.67 602.52 381.7 602.52 368.74 602.53 C367.92 602.53 367.1 602.53 366.26 602.53 C362.92 602.53 359.59 602.53 356.26 602.53 C325.2 602.55 294.15 602.56 263.09 602.55 C262.17 602.54 261.25 602.54 260.3 602.54 C258.92 602.54 258.92 602.54 257.51 602.54 C229.43 602.53 201.36 602.53 173.29 602.54 C171.41 602.54 169.54 602.54 167.66 602.54 C160.11 602.54 152.56 602.54 145.02 602.54 C123.92 602.54 102.82 602.55 81.72 602.55 C80.76 602.55 79.8 602.55 78.81 602.55 C48.18 602.55 17.55 602.54 -13.08 602.54 C-14.07 602.54 -15.06 602.54 -16.09 602.53 C-32.23 602.53 -48.36 602.53 -64.5 602.52 C-128.51 602.5 -192.52 602.5 -256.53 602.52 C-272.66 602.53 -288.79 602.53 -304.92 602.54 C-305.92 602.54 -306.91 602.54 -307.93 602.54 C-338.53 602.55 -369.12 602.55 -399.72 602.55 C-400.68 602.55 -401.64 602.55 -402.63 602.55 C-423.7 602.55 -444.78 602.54 -465.85 602.54 C-473.4 602.54 -480.94 602.54 -488.48 602.54 C-490.35 602.54 -492.23 602.54 -494.1 602.53 C-522.17 602.53 -550.24 602.53 -578.3 602.54 C-579.22 602.54 -580.14 602.54 -581.09 602.55 C-582.47 602.55 -582.47 602.55 -583.88 602.55 C-614.84 602.56 -645.81 602.55 -676.77 602.53 C-680.09 602.53 -683.41 602.53 -686.74 602.53 C-687.96 602.52 -687.96 602.52 -689.21 602.52 C-702.14 602.52 -715.07 602.52 -728.01 602.53 C-740.71 602.54 -753.41 602.54 -766.12 602.52 C-772.92 602.51 -779.72 602.51 -786.52 602.52 C-792.7 602.54 -798.88 602.53 -805.05 602.51 C-807.28 602.51 -809.51 602.51 -811.74 602.52 C-814.76 602.53 -817.77 602.52 -820.78 602.5 C-821.65 602.51 -822.52 602.52 -823.42 602.53 C-827.48 602.48 -829.5 602.31 -833.02 600.09 C-842.45 590.12 -838.42 564.68 -838.14 551.88 C-836.42 503 -815.12 455.7 -781.49 420.57 C-780.48 419.5 -779.47 418.43 -778.47 417.36 C-763.65 401.45 -746.18 389.13 -727 379 C-726.33 378.64 -725.65 378.28 -724.95 377.9 C-699.01 364.22 -667.52 355.44 -638 356 C-638.2 355.03 -638.41 354.06 -638.62 353.05 C-646.55 313.4 -639.86 273.21 -617.59 239.23 C-612.09 231.17 -605.76 224.02 -599 217 C-598.36 216.29 -597.72 215.59 -597.05 214.86 C-579.7 196.35 -554.31 184.24 -530 178 C-529.36 177.83 -528.72 177.67 -528.06 177.5 C-491.52 168.63 -451.22 176.44 -419.45 195.73 C-415.6 198.11 -411.79 200.54 -408 203 C-407.76 201.72 -407.51 200.45 -407.26 199.13 C-406.06 193.78 -404.08 188.94 -401.88 183.94 C-401.48 183.02 -401.08 182.11 -400.67 181.16 C-397.33 173.59 -393.77 166.17 -389.95 158.84 C-389.04 157.08 -388.16 155.3 -387.29 153.52 C-378.55 136.27 -367.25 119.95 -355 105 C-354.59 104.49 -354.17 103.98 -353.74 103.46 C-338.92 85.31 -322.53 68.39 -304 54 C-303.42 53.55 -302.84 53.1 -302.25 52.63 C-282.6 37.39 -261.49 24.6 -239 14 C-237.77 13.42 -237.77 13.42 -236.51 12.82 C-163.01 -21.39 -76.82 -25.29 0 0 Z " fill="#F38020" transform="translate(838,335)"/>
+<path d="M0 0 C0.84 1.08 0.84 1.08 1.69 2.19 C7.89 9.74 13.22 12.9 23 14 C26.1 14.14 29.19 14.16 32.29 14.18 C34.12 14.2 35.95 14.22 37.79 14.24 C38.74 14.25 39.69 14.26 40.67 14.27 C101.14 15.09 158.77 31.58 207 69 C207.92 69.71 208.84 70.42 209.79 71.15 C214.88 75.14 219.73 79.36 224.51 83.73 C226.13 85.21 227.77 86.67 229.43 88.11 C240.99 98.21 250.81 109.74 260 122 C260.43 122.57 260.86 123.15 261.3 123.74 C267.81 132.47 273.66 141.51 279 151 C279.43 151.77 279.87 152.54 280.32 153.34 C287.8 166.78 293.75 180.55 299 195 C299.26 195.7 299.52 196.41 299.79 197.13 C318.45 247.92 318.08 305.7 304.19 357.53 C302.63 360.78 301.02 362.03 298 364 C294.64 364.5 294.64 364.5 290.72 364.49 C289.99 364.5 289.26 364.5 288.51 364.51 C286.07 364.52 283.63 364.5 281.19 364.48 C279.42 364.48 277.66 364.49 275.89 364.49 C271.03 364.5 266.18 364.48 261.32 364.46 C256.08 364.45 250.85 364.45 245.61 364.46 C236.54 364.46 227.47 364.45 218.39 364.42 C205.27 364.39 192.16 364.38 179.04 364.37 C157.75 364.37 136.47 364.34 115.19 364.3 C94.51 364.27 73.84 364.24 53.16 364.22 C51.89 364.22 50.61 364.22 49.3 364.22 C42.91 364.21 36.51 364.21 30.12 364.2 C-22.92 364.16 -75.96 364.09 -129 364 C-128.01 363.34 -127.02 362.68 -126 362 C-120.61 357.69 -119.63 353.41 -118 347 C-117.61 345.61 -117.21 344.23 -116.81 342.84 C-114.17 333.62 -111.86 324.41 -110 315 C-109.72 313.82 -109.72 313.82 -109.43 312.61 C-106.41 294.38 -110.32 273.87 -120.28 258.37 C-132.86 241.05 -149.39 232.36 -170 228 C-178.01 226.9 -186.02 226.68 -194.09 226.47 C-195.23 226.44 -195.23 226.44 -196.4 226.41 C-218.58 225.82 -240.77 225.71 -262.95 225.55 C-275.83 225.46 -288.7 225.36 -301.57 225.25 C-303.48 225.23 -303.48 225.23 -305.43 225.22 C-327.33 225.04 -349.22 224.82 -371.12 224.53 C-373.3 224.5 -375.49 224.47 -377.68 224.45 C-390.92 224.28 -404.16 224.07 -417.4 223.76 C-444.96 223.12 -472.5 222.76 -500.06 222.55 C-512.32 222.46 -524.58 222.36 -536.84 222.25 C-538.06 222.24 -539.27 222.23 -540.52 222.22 C-561.99 222.04 -583.45 221.81 -604.91 221.53 C-607.13 221.5 -609.34 221.47 -611.56 221.45 C-619.62 221.34 -627.67 221.22 -635.73 221.07 C-639.64 221 -643.55 220.97 -647.46 220.94 C-650.87 220.92 -654.28 220.87 -657.68 220.81 C-659.33 220.79 -660.97 220.78 -662.62 220.78 C-664.9 220.77 -667.19 220.73 -669.47 220.69 C-670.78 220.68 -672.09 220.66 -673.44 220.65 C-678.09 219.8 -679.71 218.33 -683 215 C-684.17 211.54 -683.96 208.51 -683 205 C-680.53 201.83 -677.57 199.79 -674 198 C-671.12 197.85 -668.25 197.76 -665.37 197.72 C-664.44 197.7 -663.51 197.68 -662.55 197.66 C-659.32 197.6 -656.1 197.55 -652.88 197.5 C-651.71 197.48 -650.55 197.46 -649.36 197.44 C-632.73 197.15 -616.1 196.95 -599.48 196.79 C-598.57 196.78 -597.67 196.77 -596.73 196.76 C-588.98 196.68 -581.23 196.61 -573.48 196.53 C-535.6 196.17 -497.73 195.6 -459.86 194.97 C-421.84 194.33 -383.82 193.82 -345.79 193.53 C-307.76 193.23 -269.73 192.83 -231.71 192.24 C-226.54 192.16 -221.38 192.09 -216.21 192.02 C-210.16 191.94 -204.11 191.85 -198.06 191.75 C-195.85 191.71 -193.65 191.68 -191.44 191.66 C-174.41 191.45 -156.89 190.8 -140.69 185 C-139.84 184.7 -138.99 184.41 -138.11 184.1 C-115.96 176.11 -95.68 164.59 -78 149 C-77.02 148.14 -76.03 147.28 -75.02 146.39 C-56.31 129.75 -41.75 109.77 -31.9 86.73 C-31.51 85.82 -31.13 84.92 -30.73 83.99 C-25.73 72.17 -21.29 60.14 -16.81 48.12 C-15.09 43.52 -13.37 38.92 -11.64 34.32 C-11.03 32.69 -11.03 32.69 -10.41 31.02 C-7.77 23.97 -5.01 16.98 -2.07 10.05 C-0.89 6.7 -0.39 3.52 0 0 Z " fill="#FAAE40" transform="translate(1052,573)"/>
+<path d="M0 0 C0.84 1.08 0.84 1.08 1.69 2.19 C9.73 11.97 16.8 13.44 29 15 C28.23 15.65 27.47 16.3 26.68 16.97 C23.33 20.33 22.36 24.04 21.13 28.54 C20.77 29.79 20.77 29.79 20.4 31.07 C19.63 33.77 18.88 36.48 18.12 39.19 C17.59 41.05 17.06 42.92 16.53 44.78 C15 50.18 13.49 55.59 12 61 C11.8 61.73 11.6 62.45 11.39 63.2 C9.69 69.38 8.01 75.56 6.4 81.77 C5.59 84.86 4.73 87.9 3.69 90.92 C-2.9 111.07 -0.18 134.74 8 154 C16.68 170.94 32.09 182.19 50 188 C60.83 191.22 71.67 191.85 82.88 192.5 C84.82 192.62 86.77 192.74 88.71 192.87 C99.98 193.57 111.25 194.18 122.52 194.79 C123.73 194.85 124.95 194.92 126.2 194.98 C132.15 195.3 138.1 195.61 144.05 195.91 C150.37 196.23 156.69 196.6 163 197 C164.43 197.09 164.43 197.09 165.88 197.18 C168.53 197.35 171.16 197.56 173.8 197.78 C174.57 197.83 175.33 197.87 176.12 197.92 C179.95 198.28 181.92 198.93 184.97 201.33 C187.19 204.25 187.79 206.25 187.56 209.93 C186.52 213.75 183.99 216.49 181 219 C177.19 220.27 173.46 220.4 169.48 220.65 C168.61 220.71 167.74 220.76 166.84 220.82 C163.96 221.01 161.07 221.19 158.19 221.38 C156.17 221.51 154.15 221.64 152.14 221.77 C147.91 222.04 143.68 222.31 139.45 222.58 C133.14 222.99 126.83 223.41 120.52 223.83 C117.49 224.03 114.46 224.23 111.42 224.43 C109.51 224.56 107.59 224.69 105.68 224.81 C94.84 225.54 84.01 226.18 73.16 226.65 C37.79 228.22 6.1 240.52 -22 262 C-22.89 262.67 -23.79 263.34 -24.71 264.03 C-44.5 279.48 -60.57 298.7 -72 321 C-72.59 322.13 -72.59 322.13 -73.19 323.28 C-76.43 329.62 -79.2 336.07 -81.81 342.69 C-82.22 343.68 -82.63 344.67 -83.04 345.7 C-85.14 351 -86.74 355.29 -86 361 C-85.34 361.99 -84.68 362.98 -84 364 C-98.85 364 -113.7 364 -129 364 C-128.01 363.34 -127.02 362.68 -126 362 C-120.61 357.69 -119.63 353.41 -118 347 C-117.61 345.61 -117.21 344.23 -116.81 342.84 C-114.17 333.62 -111.86 324.41 -110 315 C-109.72 313.82 -109.72 313.82 -109.43 312.61 C-106.41 294.38 -110.32 273.87 -120.28 258.37 C-132.86 241.05 -149.39 232.36 -170 228 C-178.01 226.9 -186.02 226.68 -194.09 226.47 C-195.23 226.44 -195.23 226.44 -196.4 226.41 C-218.58 225.82 -240.77 225.71 -262.95 225.55 C-275.83 225.46 -288.7 225.36 -301.57 225.25 C-303.48 225.23 -303.48 225.23 -305.43 225.22 C-327.33 225.04 -349.22 224.82 -371.12 224.53 C-373.3 224.5 -375.49 224.47 -377.68 224.45 C-390.92 224.28 -404.16 224.07 -417.4 223.76 C-444.96 223.12 -472.5 222.76 -500.06 222.55 C-512.32 222.46 -524.58 222.36 -536.84 222.25 C-538.06 222.24 -539.27 222.23 -540.52 222.22 C-561.99 222.04 -583.45 221.81 -604.91 221.53 C-607.13 221.5 -609.34 221.47 -611.56 221.45 C-619.62 221.34 -627.67 221.22 -635.73 221.07 C-639.64 221 -643.55 220.97 -647.46 220.94 C-650.87 220.92 -654.28 220.87 -657.68 220.81 C-659.33 220.79 -660.97 220.78 -662.62 220.78 C-664.9 220.77 -667.19 220.73 -669.47 220.69 C-670.78 220.68 -672.09 220.66 -673.44 220.65 C-678.09 219.8 -679.71 218.33 -683 215 C-684.17 211.54 -683.96 208.51 -683 205 C-680.53 201.83 -677.57 199.79 -674 198 C-671.12 197.85 -668.25 197.76 -665.37 197.72 C-664.44 197.7 -663.51 197.68 -662.55 197.66 C-659.32 197.6 -656.1 197.55 -652.88 197.5 C-651.71 197.48 -650.55 197.46 -649.36 197.44 C-632.73 197.15 -616.1 196.95 -599.48 196.79 C-598.57 196.78 -597.67 196.77 -596.73 196.76 C-588.98 196.68 -581.23 196.61 -573.48 196.53 C-535.6 196.17 -497.73 195.6 -459.86 194.97 C-421.84 194.33 -383.82 193.82 -345.79 193.53 C-307.76 193.23 -269.73 192.83 -231.71 192.24 C-226.54 192.16 -221.38 192.09 -216.21 192.02 C-210.16 191.94 -204.11 191.85 -198.06 191.75 C-195.85 191.71 -193.65 191.68 -191.44 191.66 C-174.41 191.45 -156.89 190.8 -140.69 185 C-139.84 184.7 -138.99 184.41 -138.11 184.1 C-115.96 176.11 -95.68 164.59 -78 149 C-77.02 148.14 -76.03 147.28 -75.02 146.39 C-56.31 129.75 -41.75 109.77 -31.9 86.73 C-31.51 85.82 -31.13 84.92 -30.73 83.99 C-25.73 72.17 -21.29 60.14 -16.81 48.12 C-15.09 43.52 -13.37 38.92 -11.64 34.32 C-11.03 32.69 -11.03 32.69 -10.41 31.02 C-7.77 23.97 -5.01 16.98 -2.07 10.05 C-0.89 6.7 -0.39 3.52 0 0 Z " fill="#FEFEFD" transform="translate(1052,573)"/>
+</svg>

charts/cloudflare-tunnel/templates/common.yaml

@@ -34,6 +34,7 @@ controllers:
               key: {{ .Values.tunnel.existingSecret.key }}
             {{- end }}
         args:
+          {{- if ne .Values.tunnel.token "your-token-here" }}
           - tunnel
           - --no-autoupdate
           {{- if .Values.logLevel }}
@@ -47,6 +48,10 @@ controllers:
           - run
           - --token
           - $(TUNNEL_TOKEN)
+          {{- else }}
+          - --url
+          - localhost:8080
+          {{- end }}
 {{- end -}}
 
 {{- $tmplVars := deepCopy . -}}

charts/cloudflare-tunnel/values.yaml

@@ -59,8 +59,10 @@ controllers:
 
 tunnel:
   # -- Set the Cloudflare Tunnel token here.
+  #    Cannot coexist with `tunnel.existingSecret.enabled` set to `true`.
   token: "your-token-here"
   # -- You can set the token as an existing secret here.
+  #    Cannot coexist with `tunnel.token`
   existingSecret:
     enabled: false
     name: ""