From 84dcc502bf3880625b9be0a585135155340622bf Mon Sep 17 00:00:00 2001
From: Martin Hrabovcin <martin.hrabovcin@nutanix.com>
Date: Tue, 7 May 2024 23:09:15 +0200
Subject: [PATCH] fix: bump dex to 2.13.11 (dex-controller v0.14.6) (2.7)
 (#2206)

* fix: bump dex to 2.13.11 (dex-controller v0.14.6)

* fix: add license mapping for kubectl:1.29.2
---
 licenses.d2iq.yaml                                          | 3 ++-
 services/dex/{2.13.6 => 2.13.11}/defaults/cm.yaml           | 6 +++---
 .../dex/{2.13.6 => 2.13.11}/defaults/kustomization.yaml     | 0
 services/dex/{2.13.6 => 2.13.11}/dex.yaml                   | 4 ++--
 services/dex/{2.13.6 => 2.13.11}/kustomization.yaml         | 0
 5 files changed, 7 insertions(+), 6 deletions(-)
 rename services/dex/{2.13.6 => 2.13.11}/defaults/cm.yaml (91%)
 rename services/dex/{2.13.6 => 2.13.11}/defaults/kustomization.yaml (100%)
 rename services/dex/{2.13.6 => 2.13.11}/dex.yaml (89%)
 rename services/dex/{2.13.6 => 2.13.11}/kustomization.yaml (100%)

diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
index c596e8468..25e077475 100644
--- a/licenses.d2iq.yaml
+++ b/licenses.d2iq.yaml
@@ -46,6 +46,7 @@ ignore:
   - docker.io/bitnami/kubectl:1.24.1
   - docker.io/bitnami/kubectl:1.26.4
   - docker.io/bitnami/kubectl:1.27.9
+  - docker.io/bitnami/kubectl:1.29.2
 
   # Fossa cannot scan C/CPP projects
   # See: https://docs.fossa.com/docs/c-cpp
@@ -192,7 +193,7 @@ resources:
     sources:
       - ref: ${image_tag}
         url: https://github.com/mesosphere/kommander-auditing-pipeline
-  - container_image: docker.io/mesosphere/dex-controller:v0.13.0
+  - container_image: docker.io/mesosphere/dex-controller:v0.14.6
     sources:
       - ref: ${image_tag}
         url: https://github.com/mesosphere/dex-controller
diff --git a/services/dex/2.13.6/defaults/cm.yaml b/services/dex/2.13.11/defaults/cm.yaml
similarity index 91%
rename from services/dex/2.13.6/defaults/cm.yaml
rename to services/dex/2.13.11/defaults/cm.yaml
index 97270c4bd..c26f332d8 100644
--- a/services/dex/2.13.6/defaults/cm.yaml
+++ b/services/dex/2.13.11/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dex-2.13.6-d2iq-defaults
+  name: dex-2.13.11-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |-
@@ -14,7 +14,7 @@ data:
         cpu: 100m
         memory: 50Mi
     deploymentAnnotations:
-      secret.reloader.stakater.com/reload: dex-tls # If a fullNameOverride has been set, change the value of "dex-tls" accordingly.
+      secret.reloader.stakater.com/reload: "dex-tls,dex-client-tls" # If a fullNameOverride has been set, change the value of "dex-tls" accordingly.
     ingress:
       enabled: true
       annotations:
@@ -106,7 +106,7 @@ data:
           dexDeploymentName: dex
       deployment:
         annotations:
-          secret.reloader.stakater.com/reload: dex-dex-controller-webhook-server-cert # If a fullNameOverride has been set, change the value of "dex-dex-controller" accordingly.
+          secret.reloader.stakater.com/reload: dex-dex-controller-webhook-server-cert-1 # If a fullNameOverride has been set, change the value of "dex-dex-controller" accordingly.
       service:
         metrics:
           labels:
diff --git a/services/dex/2.13.6/defaults/kustomization.yaml b/services/dex/2.13.11/defaults/kustomization.yaml
similarity index 100%
rename from services/dex/2.13.6/defaults/kustomization.yaml
rename to services/dex/2.13.11/defaults/kustomization.yaml
diff --git a/services/dex/2.13.6/dex.yaml b/services/dex/2.13.11/dex.yaml
similarity index 89%
rename from services/dex/2.13.6/dex.yaml
rename to services/dex/2.13.11/dex.yaml
index 82e4c2eef..95c0880eb 100644
--- a/services/dex/2.13.6/dex.yaml
+++ b/services/dex/2.13.11/dex.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: mesosphere.github.io-charts-stable
         namespace: kommander-flux
-      version: 2.13.6
+      version: 2.13.11
   interval: 15s
   install:
     crds: CreateReplace
@@ -24,5 +24,5 @@ spec:
   releaseName: dex
   valuesFrom:
     - kind: ConfigMap
-      name: dex-2.13.6-d2iq-defaults
+      name: dex-2.13.11-d2iq-defaults
   targetNamespace: ${releaseNamespace}
diff --git a/services/dex/2.13.6/kustomization.yaml b/services/dex/2.13.11/kustomization.yaml
similarity index 100%
rename from services/dex/2.13.6/kustomization.yaml
rename to services/dex/2.13.11/kustomization.yaml