From 77f17bec3020aae55e6f345040f505b934736fcd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 16:50:25 +0000 Subject: [PATCH 1/2] chore(deps): update cloudflare/cloudflared docker tag to v2024.8.3 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- charts/cloudflare-tunnel/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/cloudflare-tunnel/values.yaml b/charts/cloudflare-tunnel/values.yaml index 97ef49fb..2ab069d2 100644 --- a/charts/cloudflare-tunnel/values.yaml +++ b/charts/cloudflare-tunnel/values.yaml @@ -37,7 +37,7 @@ image: repository: cloudflare/cloudflared pullPolicy: IfNotPresent # If supplied, this overrides "appVersion" - tag: "2024.2.1" + tag: "2024.8.3" replicaCount: 1 From ceb97723b2c1e1c9fcd9034dd5185f68ec55b4a1 Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Fri, 6 Sep 2024 08:01:15 +0200 Subject: [PATCH 2/2] feat(cloudflared): cleanup Signed-off-by: Nicolas Lamirault --- charts/cloudflare-tunnel/Chart.yaml | 4 ++-- hack/mixins.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/charts/cloudflare-tunnel/Chart.yaml b/charts/cloudflare-tunnel/Chart.yaml index bd04433f..c72d5d3c 100644 --- a/charts/cloudflare-tunnel/Chart.yaml +++ b/charts/cloudflare-tunnel/Chart.yaml @@ -4,7 +4,7 @@ name: cloudflare-tunnel description: Creation of a cloudflared deployment - a reverse tunnel for an environment type: application version: 0.3.0 -appVersion: "2023.5.1" +appVersion: "2024.8.3" icon: https://www.vectorlogo.zone/logos/cloudflare/cloudflare-icon.svg home: https://github.com/nlamirault/portefaix-hub sources: @@ -33,4 +33,4 @@ annotations: url: https://keybase.io/nlamirault/pgp_keys.asc artifacthub.io/changes: | - kind: changed - description: Cleanup labels + description: Bump to v2024.8.3 diff --git a/hack/mixins.py b/hack/mixins.py index c7f95a76..27168733 100755 --- a/hack/mixins.py +++ b/hack/mixins.py @@ -35,10 +35,8 @@ MIXIN_REPOSITORY = "https://github.com/nlamirault/monitoring-mixins" - logger = logging.getLogger(__name__) - def escape(s): return ( s.replace("{{", "{{`{{") @@ -199,8 +197,8 @@ def manage_mixin(mixin_directory, mixin): logger.warning("Header for dashboards not found: %s", dashboard_header) return for f in glob.glob("%s/%s/dashboards/*.json" % (mixin_directory, mixin)): - manage_dashboards(f, mixin, chart_dst) - + manage_dashboards(f, mixin, chart_dst) + template_configmap(mixin, chart_dst, dashboard_header) mixin_version_file = open("%s/%s/.version" % (mixin_directory, mixin), 'r')