From 95d277c232ca9b17f0b00f1066073b3611d5cf30 Mon Sep 17 00:00:00 2001 From: Xstar97 Date: Thu, 3 Nov 2022 12:09:41 -0400 Subject: [PATCH] fix(cloudflared) remove port + persistence (#4283) * fix(cloudflared) remove port + persistence * update chart correctly * update questions * fix questions * fix questions * update extraargs Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/stable/cloudflared/Chart.yaml | 25 ++++----- charts/stable/cloudflared/questions.yaml | 70 +++++++----------------- charts/stable/cloudflared/values.yaml | 13 +++-- 3 files changed, 40 insertions(+), 68 deletions(-) diff --git a/charts/stable/cloudflared/Chart.yaml b/charts/stable/cloudflared/Chart.yaml index f509fa2c527..f4acdb74ca7 100644 --- a/charts/stable/cloudflared/Chart.yaml +++ b/charts/stable/cloudflared/Chart.yaml @@ -1,28 +1,27 @@ apiVersion: v2 -kubeVersion: ">=1.16.0-0" -name: cloudflared -version: 1.0.25 appVersion: "2022.10.3" -description: Client for Cloudflare Tunnel, a daemon that exposes private services through the Cloudflare edge. -type: application +dependencies: + - name: common + repository: https://library-charts.truecharts.org + version: 10.7.13 deprecated: false +description: Client for Cloudflare Tunnel, a daemon that exposes private services through the Cloudflare edge. home: https://truecharts.org/docs/charts/stable/cloudflared icon: https://truecharts.org/img/hotlink-ok/chart-icons/cloudflared.png keywords: - cloudflared - networking -sources: - - https://github.com/truecharts/charts/tree/master/charts/stable/cloudflared - - https://hub.docker.com/r/cloudflare/cloudflared -dependencies: - - name: common - repository: https://library-charts.truecharts.org - version: 10.7.13 - # condition: +kubeVersion: ">=1.16.0-0" maintainers: - email: info@truecharts.org name: TrueCharts url: https://truecharts.org +name: cloudflared +sources: + - https://github.com/truecharts/charts/tree/master/charts/stable/cloudflared + - https://hub.docker.com/r/cloudflare/cloudflared +type: application +version: 1.0.26 annotations: truecharts.org/catagories: | - network diff --git a/charts/stable/cloudflared/questions.yaml b/charts/stable/cloudflared/questions.yaml index fe55a0beb96..e21f703c281 100644 --- a/charts/stable/cloudflared/questions.yaml +++ b/charts/stable/cloudflared/questions.yaml @@ -10,59 +10,29 @@ questions: # Include{recreate} # Include{controllerExpert} # Include{controllerExpertExtraArgs} - - variable: env - group: "Container Configuration" - label: "Image Environment" + - variable: cloudflared + group: Container Configuration + label: Cloudflared Configuration schema: additional_attrs: true type: dict attrs: - variable: token - label: "Tunnel Token" - description: "Token for tunnel (Tunnel managed by Cloudflare not locally)" + label: Tunnel Token + description: Token for tunnel (Tunnel managed by Cloudflare not locally) schema: type: string required: true default: "" # Include{containerConfig} -# Include{serviceRoot} - - variable: main - label: "Main Service" - description: "The Primary service on which the healthcheck runs, often the webUI" - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelectorLoadBalancer} -# Include{serviceSelectorExtras} - - variable: main - label: "Main Service Port Configuration" - schema: - additional_attrs: true - type: dict - attrs: - - variable: port - label: "Port" - description: "This port exposes the container port on the service" - schema: - type: int - default: 6969 - required: true -# Include{advancedPortHTTP} - - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" - schema: - type: int - default: 6969 # Include{serviceExpertRoot} default: false # Include{serviceExpert} # Include{serviceList} # Include{persistenceRoot} - variable: config - label: "App Config Storage" - description: "Stores the Application Configuration." + label: App Config Storage + description: Stores the Application Configuration. schema: additional_attrs: true type: dict @@ -74,42 +44,42 @@ questions: # Include{security} # Include{securityContextAdvancedRoot} - variable: privileged - label: "Privileged mode" + label: Privileged mode schema: type: boolean default: false - variable: readOnlyRootFilesystem - label: "ReadOnly Root Filesystem" + label: ReadOnly Root Filesystem schema: type: boolean default: true - variable: allowPrivilegeEscalation - label: "Allow Privilege Escalation" + label: Allow Privilege Escalation schema: type: boolean default: false - variable: runAsNonRoot - label: "runAsNonRoot" + label: runAsNonRoot schema: type: boolean - default: true + default: false # Include{securityContextAdvanced} # Include{podSecurityContextRoot} - variable: runAsUser - label: "runAsUser" - description: "The UserID of the user running the application" + label: runAsUser + description: The UserID of the user running the application schema: type: int - default: 568 + default: 0 - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" + label: runAsGroup + description: The groupID this App of the user running the application schema: type: int - default: 568 + default: 0 - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." + label: fsGroup + description: The group that should own ALL storage. schema: type: int default: 568 diff --git a/charts/stable/cloudflared/values.yaml b/charts/stable/cloudflared/values.yaml index d77d8a80b10..fbad38aa497 100644 --- a/charts/stable/cloudflared/values.yaml +++ b/charts/stable/cloudflared/values.yaml @@ -4,9 +4,13 @@ image: tag: 2022.10.3@sha256:20455e880d8b5d5a2d83c632c53f83b0924e86e6f0bb587f55d854b188b65742 extraArgs: - ["tunnel", "--no-autoupdate", "run", "--token", "{{ .Values.env.token }}"] + - tunnel + - --no-autoupdate + - run + - --token + - "{{ .Values.cloudflared.token }}" -env: +cloudflared: token: "" securityContext: @@ -18,11 +22,10 @@ podSecurityContext: service: main: + enabled: false ports: main: - protocol: HTTP - targetPort: 6969 - port: 6969 + enabled: false probes: liveness: