Merge pull request #472 from cloud-pi-native/feat/enable-registry-choice

feat: ✨ enable registry choice

Author: Falltrades

roles/gitops/rendering-apps-files/templates/keycloak/Chart.yaml.j2

@@ -7,4 +7,4 @@ dependencies:
 - name: keycloak
   alias: keycloak
   version: {{ dsc.keycloak.chartVersion }}
-  repository: oci://registry-1.docker.io/bitnamicharts
+  repository: {{ dsc.keycloak.helmRepoUrl }}

roles/infra/keycloak-infra/tasks/main.yml

@@ -126,13 +126,6 @@
 
 # Deploy Keycloak
 
-- name: Add bitnami helm repo
-  changed_when: false
-  kubernetes.core.helm_repository:
-    name: bitnami
-    repo_url: "{{ dsc.keycloakInfra.helmRepoUrl }}"
-    force_update: true
-
 - name: Set path fact
   ansible.builtin.set_fact:
     path: "{{ role_path + '/templates/values' }}"
@@ -148,10 +141,12 @@
 - name: Deploy helm
   kubernetes.core.helm:
     name: keycloak
-    chart_ref: bitnami/keycloak
+    chart_ref: "{{ dsc.keycloakInfra.helmRepoUrl }}/keycloak"
     chart_version: "{{ dsc.keycloakInfra.chartVersion }}"
     release_namespace: "{{ dsc.keycloakInfra.namespace }}"
+    release_name: keycloak
     values: "{{ kc_values }}"
+    release_state: present
 
 - name: Wait Keycloak URL
   ansible.builtin.uri:

roles/keycloak/tasks/main.yml

@@ -126,12 +126,6 @@
 
 # Deploy Keycloak
 
-- name: Add bitnami helm repo
-  kubernetes.core.helm_repository:
-    name: bitnami
-    repo_url: "{{ dsc.keycloak.helmRepoUrl }}"
-    force_update: true
-
 - name: Set path fact
   ansible.builtin.set_fact:
     path: "{{ role_path + '/templates/values' }}"
@@ -147,10 +141,12 @@
 - name: Deploy helm
   kubernetes.core.helm:
     name: keycloak
-    chart_ref: bitnami/keycloak
+    chart_ref: "{{ dsc.keycloak.helmRepoUrl }}/keycloak"
     chart_version: "{{ dsc.keycloak.chartVersion }}"
     release_namespace: "{{ dsc.keycloak.namespace }}"
+    release_name: keycloak
     values: "{{ kc_values }}"
+    release_state: present
 
 - name: Wait Keycloak URL
   ansible.builtin.uri:

roles/socle-config/files/config.yaml

@@ -93,7 +93,7 @@ spec:
   keycloak:
     namespace: dso-keycloak
     subDomain: keycloak
-    helmRepoUrl: https://charts.bitnami.com/bitnami
+    helmRepoUrl: oci://registry-1.docker.io/bitnamicharts
     postgresPvcSize: 1Gi
     pluginDownloadUrl: https://github.com/codegouvfr/keycloak-theme-dsfr/releases/download/v2.1.4/keycloak-theme-for-kc-26-and-above.jar
     cnpg:
@@ -104,7 +104,7 @@ spec:
     installEnabled: false
     namespace: infra-keycloak
     subDomain: infra-keycloak
-    helmRepoUrl: https://charts.bitnami.com/bitnami
+    helmRepoUrl: oci://registry-1.docker.io/bitnamicharts
     postgresPvcSize: 1Gi
     pluginDownloadUrl: https://github.com/codegouvfr/keycloak-theme-dsfr/releases/download/v2.1.4/keycloak-theme-for-kc-26-and-above.jar
     cnpg: