fix: mutliple fixes for pgadmin

plugins/contrib/Chart.yaml

@@ -61,3 +61,7 @@ dependencies:
     degit: socialgouv/helm-charts/charts/maildev@v1
     condition: maildev.enabled
     version: "1"
+  - name: pgadmin
+    degit: socialgouv/helm-charts/charts/pgadmin@v1
+    version: "1"
+    condition: pgadmin.enabled

plugins/contrib/deploy-with/kubectl-dependency-tree.js

@@ -54,7 +54,7 @@ module.exports = async (options, context) => {
 
   const { surviveOnBrokenCluster = false } = options
 
-  const { applyTimeout = "2m" } = options
+  const { applyTimeout = "2m", kindsForceRecreate = ["Job"] } = options
 
   const kubectlProcesses = []
   const kubectlDeleteManifestOptions = {
@@ -75,7 +75,7 @@ module.exports = async (options, context) => {
 
   const recreateAnnotationKey = "kontinuous/kubectl-recreate"
   const getRecreateThisResource = (manifest) => {
-    if (manifest.kind === "Job") {
+    if (kindsForceRecreate.includes(manifest.kind)) {
       return true
     }
     const manifestsRecreateResourceOption =

plugins/contrib/kontinuous.yaml

@@ -67,6 +67,13 @@ deploySidecars:
   progressing:
     enabled: true
 
+deployWith:
+  kubectlDependencyTree:
+    options:
+      kindsForceRecreate:
+        - "Job"
+        - "Policy"
+
 postDeploy:
   notifyMattermost:
     enabled: false

plugins/contrib/values-compilers/09-maildev.js

@@ -1,23 +1,9 @@
-function isMaildevComponent(component) {
-  return component[`~chart`]?.endsWith(".contrib.maildev")
-}
-
-function extractMaildevComponents(values, acc = []) {
-  Object.entries(values).forEach(([key, component]) => {
-    if (typeof component === "object" && component !== null) {
-      extractMaildevComponents(component, acc)
-      if (component._isChartValues && isMaildevComponent(component)) {
-        acc.push([key, component])
-      }
-    }
-  })
-  return acc
-}
+const extractComponents = require("./helpers/extract-components")
 
 const maildev = async (values, _options, { _config, utils, _ctx }) => {
   const { deepmerge } = utils
 
-  const components = extractMaildevComponents(values)
+  const components = extractComponents("maildev", values)
 
   components.forEach(([key, component]) => {
     const persistenceEnabled =

plugins/contrib/values-compilers/09-pgadmin.js

@@ -0,0 +1,17 @@
+const extractComponents = require("./helpers/extract-components")
+
+module.exports = async (values, _options, { _config, utils, _ctx }) => {
+  const { deepmerge } = utils
+  const components = extractComponents("pgadmin", values)
+
+  components.forEach(([key, componentValues]) => {
+    const mergedValues = {
+      host: componentValues.host || `${key}-${values.global.host}`,
+      ingress: {
+        annotations: values.global.ingress.annotations,
+      },
+    }
+
+    deepmerge(componentValues, mergedValues)
+  })
+}

plugins/contrib/values-compilers/helpers/extract-components.js

@@ -0,0 +1,17 @@
+function isComponent(name, component) {
+  return component[`~chart`]?.endsWith(`.contrib.${name}`)
+}
+
+function extractComponents(name, values, acc = []) {
+  Object.entries(values).forEach(([key, component]) => {
+    if (typeof component === "object" && component !== null) {
+      extractComponents(name, component, acc)
+      if (component._isChartValues && isComponent(name, component)) {
+        acc.push([key, component])
+      }
+    }
+  })
+  return acc
+}
+
+module.exports = extractComponents

plugins/fabrique/Chart.yaml

@@ -18,7 +18,3 @@ dependencies:
     repository: https://codecentric.github.io/helm-charts
     version: 2.1.1
     condition: keycloakx.enabled
-  - name: pgadmin
-    degit: socialgouv/helm-charts/charts/pgadmin@v1
-    version: "1"
-    condition: pgadmin.enabled

plugins/fabrique/values-compilers/index.js

@@ -9,7 +9,8 @@ module.exports = [
 
   "./global-defaults.js",
 
-  "../charts/contrib/values-compilers/09-maildev.js",
+  "../charts/contrib/values-compilers/09-maildev",
+  "../charts/contrib/values-compilers/09-pgadmin",
   "../charts/contrib/values-compilers/10-tpl-meta-values",
   "../charts/contrib/values-compilers/11-get-git-default-branch",
 ]