From 10743a63f269586603addedfaadfb59926d297ec Mon Sep 17 00:00:00 2001 From: Mesosphere CI Robot Date: Fri, 18 Nov 2022 09:54:12 -0600 Subject: [PATCH] feat: Bump traefik to 20.3.0 (#818) * chore: Update traefik 10.30.1 => 20.1.1 * chore: Move traefik/10.30.1 => traefik/20.1.1 * chore: Update kommander defaults: traefik 10.30.1 => 20.1.1 * chore: bump base tech version in dashboard cm build: bump version in licenses Signed-off-by: Tarun Gupta Akirala * feat: bump traefik to v20.2.0 Signed-off-by: Tarun Gupta Akirala * fix: force upgrade traefik Signed-off-by: Tarun Gupta Akirala * chore: remove unused velero port exposure Signed-off-by: Tarun Gupta Akirala * feat: bump traefik to v20.3.0 Signed-off-by: Tarun Gupta Akirala Signed-off-by: Tarun Gupta Akirala Co-authored-by: d2iq-mergebot Co-authored-by: Tarun Gupta Akirala --- licenses.d2iq.yaml | 4 ++-- services/kommander/0.5.0/defaults/cm.yaml | 2 +- .../{10.30.1 => 20.3.0}/defaults/cm.yaml | 17 ++++++----------- .../defaults/kustomization.yaml | 0 .../grafana-dashboards/kustomization.yaml | 0 .../grafana-dashboards/traefik.json | 0 .../{10.30.1 => 20.3.0}/kustomization.yaml | 0 .../traefik-plugin-rewritebody.yaml | 0 .../traefik/{10.30.1 => 20.3.0}/traefik.yaml | 8 ++++---- 9 files changed, 13 insertions(+), 18 deletions(-) rename services/traefik/{10.30.1 => 20.3.0}/defaults/cm.yaml (90%) rename services/traefik/{10.30.1 => 20.3.0}/defaults/kustomization.yaml (100%) rename services/traefik/{10.30.1 => 20.3.0}/grafana-dashboards/kustomization.yaml (100%) rename services/traefik/{10.30.1 => 20.3.0}/grafana-dashboards/traefik.json (100%) rename services/traefik/{10.30.1 => 20.3.0}/kustomization.yaml (100%) rename services/traefik/{10.30.1 => 20.3.0}/traefik-plugin-rewritebody.yaml (100%) rename services/traefik/{10.30.1 => 20.3.0}/traefik.yaml (97%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index bc29810de..7f696c856 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -133,10 +133,10 @@ resources: - url: https://github.com/kubernetes-sigs/dashboard-metrics-scraper ref: ${image_tag} license_path: LICENSE - - container_image: docker.io/library/traefik:2.8.7 + - container_image: docker.io/library/traefik:v2.9.4 sources: - url: https://github.com/traefik/traefik - ref: v${image_tag} + ref: ${image_tag} license_path: LICENSE.md - container_image: docker.io/mesosphere/capimate:v2.3.0 sources: diff --git a/services/kommander/0.5.0/defaults/cm.yaml b/services/kommander/0.5.0/defaults/cm.yaml index 302b53187..1e181440c 100644 --- a/services/kommander/0.5.0/defaults/cm.yaml +++ b/services/kommander/0.5.0/defaults/cm.yaml @@ -89,7 +89,7 @@ data: prerequisites: defaultApps: reloader: "0.0.124" - traefik: "10.30.1" + traefik: "20.3.0" kubernetes-dashboard: "5.11.0" kubecost: "0.29.0" kube-prometheus-stack: "40.0.0" diff --git a/services/traefik/10.30.1/defaults/cm.yaml b/services/traefik/20.3.0/defaults/cm.yaml similarity index 90% rename from services/traefik/10.30.1/defaults/cm.yaml rename to services/traefik/20.3.0/defaults/cm.yaml index a536df842..1e7b959ca 100644 --- a/services/traefik/10.30.1/defaults/cm.yaml +++ b/services/traefik/20.3.0/defaults/cm.yaml @@ -1,8 +1,7 @@ ---- apiVersion: v1 kind: ConfigMap metadata: - name: traefik-10.30.1-d2iq-defaults + name: traefik-20.3.0-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | @@ -197,12 +196,8 @@ data: # pathOverride: "${releaseNamespace}/kommander-traefik" pilot: dashboard: false - ports: - # Minio must be hosted on a separate port and not on a subpath, - # see explaination in https://github.com/minio/minio/issues/10162 - velero-minio: - # port: 9000 is occupied by the "traefik" endpoint which is not exposed - port: 9090 - expose: true - exposedPort: 9000 # Velero is configured to use this value - protocol: TCP + # This value should be equal to release name. Justification with timeline of changes: + # 1. This was set to `kommander-treafik` in an old chart version - https://github.com/traefik/traefik-helm-chart/blob/v10.30.1/traefik/templates/deployment.yaml#L42 (Shipped in DKP 2.4) + # 2. A breaking change was made in traefik 17.0.1 https://github.com/traefik/traefik-helm-chart/blob/v17.0.1/traefik/templates/deployment.yaml#L38 which caused it to be renamed to `kommander-treafik-${releaseNamespace}` + # 3. Another change was made in 20.3.0 for backwards compatibility thats lets a user override the label value - https://github.com/traefik/traefik-helm-chart/blob/v20.3.0/traefik/templates/_helpers.tpl#L42-L47 + instanceLabelOverride: "kommander-traefik" diff --git a/services/traefik/10.30.1/defaults/kustomization.yaml b/services/traefik/20.3.0/defaults/kustomization.yaml similarity index 100% rename from services/traefik/10.30.1/defaults/kustomization.yaml rename to services/traefik/20.3.0/defaults/kustomization.yaml diff --git a/services/traefik/10.30.1/grafana-dashboards/kustomization.yaml b/services/traefik/20.3.0/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/traefik/10.30.1/grafana-dashboards/kustomization.yaml rename to services/traefik/20.3.0/grafana-dashboards/kustomization.yaml diff --git a/services/traefik/10.30.1/grafana-dashboards/traefik.json b/services/traefik/20.3.0/grafana-dashboards/traefik.json similarity index 100% rename from services/traefik/10.30.1/grafana-dashboards/traefik.json rename to services/traefik/20.3.0/grafana-dashboards/traefik.json diff --git a/services/traefik/10.30.1/kustomization.yaml b/services/traefik/20.3.0/kustomization.yaml similarity index 100% rename from services/traefik/10.30.1/kustomization.yaml rename to services/traefik/20.3.0/kustomization.yaml diff --git a/services/traefik/10.30.1/traefik-plugin-rewritebody.yaml b/services/traefik/20.3.0/traefik-plugin-rewritebody.yaml similarity index 100% rename from services/traefik/10.30.1/traefik-plugin-rewritebody.yaml rename to services/traefik/20.3.0/traefik-plugin-rewritebody.yaml diff --git a/services/traefik/10.30.1/traefik.yaml b/services/traefik/20.3.0/traefik.yaml similarity index 97% rename from services/traefik/10.30.1/traefik.yaml rename to services/traefik/20.3.0/traefik.yaml index 6f20d31d8..8113d05c9 100644 --- a/services/traefik/10.30.1/traefik.yaml +++ b/services/traefik/20.3.0/traefik.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: helm.traefik.io-traefik namespace: kommander-flux - version: 10.30.1 + version: 20.3.0 interval: 15s install: crds: CreateReplace @@ -25,7 +25,7 @@ spec: releaseName: kommander-traefik valuesFrom: - kind: ConfigMap - name: traefik-10.30.1-d2iq-defaults + name: traefik-20.3.0-d2iq-defaults --- apiVersion: v1 kind: ConfigMap @@ -37,9 +37,9 @@ metadata: data: name: "Traefik" dashboardLink: "/dkp/traefik/dashboard/" - docsLink: "https://doc.traefik.io/traefik/v2.5" + docsLink: "https://doc.traefik.io/traefik/v2.9" # Check https://artifacthub.io/packages/helm/traefik/traefik for app version - version: "2.8.7" + version: "2.9.4" --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role