feat: bump traefik image (#2745)

* feat: bump traefik image * build: Updated licenses.d2iq.yaml * fix: update errors in upgrade test * fix: retry on conflict * fix: wait for upgrade to complete --------- Co-authored-by: d2iq-mergebot <ci-mergebot@d2iq.com>
mesosphere · Oct 17, 2024 · 3c1e918 · 3c1e918
1 parent 9c4eb34
commit 3c1e918
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 14 deletions.
diff --git a/apptests/appscenarios/traefik.go b/apptests/appscenarios/traefik.go
@@ -6,6 +6,8 @@ import (
 	"path/filepath"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/util/retry"
+	controllerruntime "sigs.k8s.io/controller-runtime"
 	ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	fluxhelmv2beta2 "github.com/fluxcd/helm-controller/api/v2beta2"
@@ -88,16 +90,17 @@ func (t traefik) install(ctx context.Context, env *environment.Env, appPath stri
 	if err != nil {
 		return fmt.Errorf("could not create the generic client: %w", err)
 	}
-	err = genericClient.Get(ctx, ctrlClient.ObjectKeyFromObject(hr), hr)
-	if err != nil {
-		return fmt.Errorf("could not get the HelmRelease: %w", err)
-	}
 
-	hr.Spec.ValuesFrom = append(hr.Spec.ValuesFrom, fluxhelmv2beta2.ValuesReference{
-		Kind: "ConfigMap",
-		Name: traefikCMName,
+	err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		_, err = controllerruntime.CreateOrUpdate(ctx, genericClient, hr, func() error {
+			hr.Spec.ValuesFrom = append(hr.Spec.ValuesFrom, fluxhelmv2beta2.ValuesReference{
+				Kind: "ConfigMap",
+				Name: traefikCMName,
+			})
+			return nil
+		})
+		return err
 	})
-	err = genericClient.Update(ctx, hr)
 
 	return err
 }

diff --git a/apptests/appscenarios/traefik_test.go b/apptests/appscenarios/traefik_test.go
@@ -225,9 +225,11 @@ func assertTraefikEndpoints(t *traefik, podList *corev1.PodList) {
 	listOptions := &ctrlClient.ListOptions{
 		LabelSelector: selector,
 	}
-	err = k8sClient.List(ctx, podList, listOptions)
-	Expect(err).To(BeNil())
-	Expect(podList.Items).To(HaveLen(1))
+
+	Eventually(func() ([]corev1.Pod, error) {
+		err := k8sClient.List(ctx, podList, listOptions)
+		return podList.Items, err
+	}).WithPolling(5 * time.Second).WithTimeout(time.Minute).Should(HaveLen(1))
 
 	By("checking traefik prometheus metrics endpoint")
 	res := restClientV1Pods.Get().Resource("pods").Namespace(podList.Items[0].Namespace).Name(podList.Items[0].Name + ":9100").SubResource("proxy").Suffix("/metrics").Do(ctx)

diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -107,7 +107,7 @@ resources:
       - license_path: LICENSE
         ref: 3.6.0
         url: https://github.com/Kong/kong
-  - container_image: docker.io/library/traefik:v2.11.2
+  - container_image: docker.io/library/traefik:v2.11.9
     sources:
       - license_path: LICENSE.md
         ref: ${image_tag}

diff --git a/services/traefik/27.0.2/defaults/cm.yaml → services/traefik/27.0.3/defaults/cm.yaml b/services/traefik/27.0.2/defaults/cm.yaml → services/traefik/27.0.3/defaults/cm.yaml
@@ -1,11 +1,13 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: traefik-27.0.2-d2iq-defaults
+  name: traefik-27.0.3-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
     ---
+    image:
+      tag: v2.11.9
     priorityClassName: "dkp-critical-priority"
     podDisruptionBudget:
       minAvailable: 1

diff --git a/...raefik/27.0.2/defaults/kustomization.yaml → ...raefik/27.0.3/defaults/kustomization.yaml b/...raefik/27.0.2/defaults/kustomization.yaml → ...raefik/27.0.3/defaults/kustomization.yaml
diff --git a/...0.2/grafana-dashboards/kustomization.yaml → ...0.3/grafana-dashboards/kustomization.yaml b/...0.2/grafana-dashboards/kustomization.yaml → ...0.3/grafana-dashboards/kustomization.yaml
diff --git a/...ik/27.0.2/grafana-dashboards/traefik.json → ...ik/27.0.3/grafana-dashboards/traefik.json b/...ik/27.0.2/grafana-dashboards/traefik.json → ...ik/27.0.3/grafana-dashboards/traefik.json
diff --git a/services/traefik/27.0.2/kustomization.yaml → services/traefik/27.0.3/kustomization.yaml b/services/traefik/27.0.2/kustomization.yaml → services/traefik/27.0.3/kustomization.yaml
diff --git a/...ik/27.0.2/traefik-plugin-rewritebody.yaml → ...ik/27.0.3/traefik-plugin-rewritebody.yaml b/...ik/27.0.2/traefik-plugin-rewritebody.yaml → ...ik/27.0.3/traefik-plugin-rewritebody.yaml
diff --git a/services/traefik/27.0.2/traefik.yaml → services/traefik/27.0.3/traefik.yaml b/services/traefik/27.0.2/traefik.yaml → services/traefik/27.0.3/traefik.yaml
@@ -25,7 +25,7 @@ spec:
   releaseName: kommander-traefik
   valuesFrom:
     - kind: ConfigMap
-      name: traefik-27.0.2-d2iq-defaults
+      name: traefik-27.0.3-d2iq-defaults
     - kind: ConfigMap
       name: traefik-overrides
       optional: true