From d34dfbe0b2a8a6cdfb4852c8329dc26f888b6606 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Tue, 24 Sep 2024 19:45:15 +0000 Subject: [PATCH] Bump traefik to 27.0.2 Signed-off-by: Brad Davidson --- .../generated-changes/patch/Chart.yaml.patch | 21 ++++++++------ .../patch/templates/_podtemplate.tpl.patch | 4 +-- .../generated-changes/patch/values.yaml.patch | 28 +++++++++---------- packages/rke2-traefik/package.yaml | 2 +- .../templates/crd-template/Chart.yaml | 4 +-- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/packages/rke2-traefik/generated-changes/patch/Chart.yaml.patch b/packages/rke2-traefik/generated-changes/patch/Chart.yaml.patch index 00a8d22..f845ec3 100644 --- a/packages/rke2-traefik/generated-changes/patch/Chart.yaml.patch +++ b/packages/rke2-traefik/generated-changes/patch/Chart.yaml.patch @@ -1,17 +1,20 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -11,6 +11,7 @@ - update traefik docker tag to v2.10.5\"\n- \"chore(deps): update docker.io/helmunittest/helm-unittest - docker tag to v3.12.3\"\n- \"chore(ci): \U0001F527 \U0001F477 add e2e test when - releasing\"\n" +@@ -1,8 +1,7 @@ + annotations: +- artifacthub.io/changes: | +- - "feat: ✨ update Traefik Proxy to v2.11.2" + fleet.cattle.io/bundle-id: rke2 apiVersion: v2 - appVersion: v2.10.5 +-appVersion: v2.11.2 ++appVersion: v2.11.10 description: A Traefik based Kubernetes ingress controller -@@ -32,7 +33,7 @@ - name: mloiseleur - - email: charlie.haley@traefik.io - name: charlie-haley + home: https://traefik.io/ + icon: https://raw.githubusercontent.com/traefik/traefik/v2.3/docs/content/assets/img/traefik.logo.png +@@ -19,7 +18,7 @@ + - email: remi.buisson@traefik.io + name: darkweaver87 + - name: jnoordsij -name: traefik +name: rke2-traefik sources: diff --git a/packages/rke2-traefik/generated-changes/patch/templates/_podtemplate.tpl.patch b/packages/rke2-traefik/generated-changes/patch/templates/_podtemplate.tpl.patch index 11f7124..911026b 100644 --- a/packages/rke2-traefik/generated-changes/patch/templates/_podtemplate.tpl.patch +++ b/packages/rke2-traefik/generated-changes/patch/templates/_podtemplate.tpl.patch @@ -1,7 +1,7 @@ --- charts-original/templates/_podtemplate.tpl +++ charts/templates/_podtemplate.tpl -@@ -50,7 +50,7 @@ - shareProcessNamespace: true +@@ -53,7 +53,7 @@ + runtimeClassName: {{ . }} {{- end }} containers: - - image: {{ template "traefik.image-name" . }} diff --git a/packages/rke2-traefik/generated-changes/patch/values.yaml.patch b/packages/rke2-traefik/generated-changes/patch/values.yaml.patch index 2b60c3b..d72ca11 100644 --- a/packages/rke2-traefik/generated-changes/patch/values.yaml.patch +++ b/packages/rke2-traefik/generated-changes/patch/values.yaml.patch @@ -23,7 +23,7 @@ # -- Number of pods of the deployment (only applies when kind == Deployment) replicas: 1 # -- Number of old history to retain to allow rollback (If not set, default Kubernetes value is set to 10) -@@ -111,8 +109,8 @@ +@@ -117,8 +115,8 @@ # -- Create a default IngressClass for Traefik ingressClass: enabled: true @@ -34,7 +34,7 @@ # Traefik experimental features experimental: -@@ -180,8 +178,8 @@ +@@ -188,8 +186,8 @@ # -- Customize updateStrategy: RollingUpdate or OnDelete type: RollingUpdate rollingUpdate: @@ -45,7 +45,7 @@ readinessProbe: # -- The number of consecutive failures allowed before considering the probe as failed. -@@ -227,6 +225,8 @@ +@@ -246,6 +244,8 @@ enabled: true # -- Allows to reference ExternalName services in Ingress allowExternalNameServices: false @@ -54,8 +54,8 @@ # -- Allows to return 503 when there is no endpoints available allowEmptyServices: false # ingressClass: traefik-internal -@@ -236,7 +236,7 @@ - # - "default" +@@ -258,7 +258,7 @@ + disableIngressClassLookup: false # IP used for Kubernetes Ingress endpoints publishedService: - enabled: false @@ -63,25 +63,25 @@ # Published Kubernetes Service to copy status from. Format: namespace/servicename # By default this Traefik service # pathOverride: "" -@@ -602,7 +602,7 @@ +@@ -642,7 +642,7 @@ ## -- Enable this entrypoint as a default entrypoint. When a service doesn't explicitly set an entrypoint it will only use this entrypoint. # asDefault: true port: 8000 - # hostPort: 8000 + hostPort: 80 # containerPort: 8000 - expose: true - exposedPort: 80 -@@ -634,7 +634,7 @@ + expose: + default: true +@@ -675,7 +675,7 @@ ## -- Enable this entrypoint as a default entrypoint. When a service doesn't explicitly set an entrypoint it will only use this entrypoint. # asDefault: true port: 8443 - # hostPort: 8443 + hostPort: 443 # containerPort: 8443 - expose: true - exposedPort: 443 -@@ -735,7 +735,7 @@ + expose: + default: true +@@ -778,7 +778,7 @@ ## -- Single service is using `MixedProtocolLBService` feature gate. ## -- When set to false, it will create two Service, one for TCP and one for UDP. single: true @@ -90,7 +90,7 @@ # -- Additional annotations applied to both TCP and UDP services (e.g. for cloud provider specific config) annotations: {} # -- Additional annotations for TCP service only -@@ -758,7 +758,7 @@ +@@ -801,7 +801,7 @@ externalIPs: [] # - 1.2.3.4 ## One of SingleStack, PreferDualStack, or RequireDualStack. @@ -99,7 +99,7 @@ ## List of IP families (e.g. IPv4 and/or IPv6). ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services # ipFamilies: -@@ -945,3 +945,8 @@ +@@ -992,3 +992,8 @@ # ## -- This will override the default app.kubernetes.io/instance label for all Objects. # instanceLabelOverride: traefik diff --git a/packages/rke2-traefik/package.yaml b/packages/rke2-traefik/package.yaml index 9dc0c4e..e134e79 100644 --- a/packages/rke2-traefik/package.yaml +++ b/packages/rke2-traefik/package.yaml @@ -1,4 +1,4 @@ -url: https://traefik.github.io/charts/traefik/traefik-25.0.0.tgz +url: https://traefik.github.io/charts/traefik/traefik-27.0.2.tgz packageVersion: 00 # This repository does not use releaseCandidateVersions, so you can leave this as 00. releaseCandidateVersion: 00 diff --git a/packages/rke2-traefik/templates/crd-template/Chart.yaml b/packages/rke2-traefik/templates/crd-template/Chart.yaml index 1edf69e..af6b80e 100644 --- a/packages/rke2-traefik/templates/crd-template/Chart.yaml +++ b/packages/rke2-traefik/templates/crd-template/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -version: 25.0.0 -appVersion: v2.10.5 +version: 27.0.2 +appVersion: v2.11.10 description: Installs the CRDs for rke2-traefik name: rke2-traefik-crd type: application