OPSEXP-2984 Remove dependency on bitnami/common in charts by aligning ingress templates with common practices

charts/alfresco-connector-ms365/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: alfresco-common
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 3.1.4
-digest: sha256:472c86bbe4b88aceee0fec6653ae229ef9f5b6237d8d092d5d99c20272afa370
-generated: "2024-11-28T13:40:51.06201837Z"
+  version: 4.0.0-alpha.0
+digest: sha256:85e58624f01fb644cc7d66d17f90ad5d6524fdfe38f62857ffb3b16dbde97030
+generated: "2024-12-10T17:14:19.302412+01:00"

charts/alfresco-connector-ms365/Chart.yaml

@@ -2,9 +2,9 @@ apiVersion: v2
 name: alfresco-connector-ms365
 description: A Helm chart for deploying Alfresco connector ms365 service
 type: application
-version: 2.2.0
+version: 3.0.0-alpha.0
 appVersion: 2.0.4
 dependencies:
   - name: alfresco-common
-    version: 3.1.4
+    version: 4.0.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/

charts/alfresco-connector-ms365/README.md

@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-connector-ms365
 
-![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.4](https://img.shields.io/badge/AppVersion-2.0.4-informational?style=flat-square)
+![Version: 3.0.0-alpha.0](https://img.shields.io/badge/Version-3.0.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.4](https://img.shields.io/badge/AppVersion-2.0.4-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector ms365 service
 
@@ -15,7 +15,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.4 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 4.0.0-alpha.0 |
 
 ## Values
 
@@ -31,7 +31,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | image.tag | string | `"2.0.4"` |  |
 | ingress.className | string | `"nginx"` |  |
 | ingress.extraAnnotations | object | `{}` |  |
-| ingress.path | string | `"/ooi-service"` |  |
+| ingress.hosts[0].paths[0].path | string | `"/ooi-service"` |  |
+| ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
 | ingress.tls | list | `[]` |  |
 | livenessProbe.failureThreshold | int | `1` |  |
 | livenessProbe.initialDelaySeconds | int | `10` |  |

charts/alfresco-connector-ms365/templates/ingress-conector-ms365.yaml

@@ -6,11 +6,10 @@ metadata:
   name: {{ $serviceName }}
   labels:
     {{- include "alfresco-connector-ms365.labels" . | nindent 4 }}
+  {{- with .Values.ingress.extraAnnotations }}
   annotations:
-    {{- if .Values.ingress.extraAnnotations }}
-    {{- toYaml .Values.ingress.extraAnnotations | nindent 4 }}
-    {{- end }}
-
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
   {{- if .Values.ingress.tls }}
@@ -24,13 +23,17 @@ spec:
     {{- end }}
   {{- end }}
   rules:
-  - http:
-      paths:
-      - path: {{ .Values.ingress.path }}
-        {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
-        pathType: Prefix
-        {{- end }}
-        backend: {{- include "common.ingress.backend" (dict "serviceName" $serviceName "servicePort" $servicePort "context" $) | nindent 10 }}
-  {{- if .Values.ingress.hostName }}
-    host: {{ tpl .Values.ingress.hostName $ }}
-  {{- end }}
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ $serviceName }}
+                port:
+                  number: {{ $servicePort }}
+          {{- end }}
+    {{- end }}

charts/alfresco-connector-ms365/tests/ingress-conector-ms365_test.yaml

@@ -21,3 +21,40 @@ tests:
     - equal:
         path: spec.ingressClassName
         value: nginx
+- it: should render default rules
+  asserts:
+    - equal:
+        path: spec.rules
+        value:
+          - host:
+            http:
+              paths:
+                - backend:
+                    service:
+                      name: RELEASE-NAME-alfresco-connector-ms365
+                      port:
+                        number: 80
+                  path: /ooi-service
+                  pathType: Prefix
+- it: should render rules with host
+  set:
+    ingress:
+      hosts:
+        - host: testhost
+          paths:
+          - path: /ooi-service
+            pathType: Prefix
+  asserts:
+    - equal:
+        path: spec.rules
+        value:
+          - host: testhost
+            http:
+              paths:
+                - backend:
+                    service:
+                      name: RELEASE-NAME-alfresco-connector-ms365
+                      port:
+                        number: 80
+                  path: /ooi-service
+                  pathType: Prefix

charts/alfresco-connector-ms365/values.yaml

@@ -58,7 +58,10 @@ service:
   externalPort: 80
 ingress:
   className: nginx
-  path: /ooi-service
+  hosts:
+    - paths:
+        - path: /ooi-service
+          pathType: Prefix
   tls: []
   extraAnnotations: {}
 podSecurityContext:

charts/alfresco-connector-msteams/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: alfresco-common
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 3.1.4
-digest: sha256:472c86bbe4b88aceee0fec6653ae229ef9f5b6237d8d092d5d99c20272afa370
-generated: "2024-11-28T13:40:51.53690048Z"
+  version: 4.0.0-alpha.0
+digest: sha256:85e58624f01fb644cc7d66d17f90ad5d6524fdfe38f62857ffb3b16dbde97030
+generated: "2024-12-10T17:14:25.070097+01:00"

charts/alfresco-connector-msteams/Chart.yaml

@@ -2,9 +2,9 @@ apiVersion: v2
 name: alfresco-connector-msteams
 description: A Helm chart for deploying Alfresco connector msteams service
 type: application
-version: 1.2.0
+version: 2.0.0-alpha.0
 appVersion: 2.0.4
 dependencies:
   - name: alfresco-common
-    version: 3.1.4
+    version: 4.0.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/

charts/alfresco-connector-msteams/README.md

@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-connector-msteams
 
-![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.4](https://img.shields.io/badge/AppVersion-2.0.4-informational?style=flat-square)
+![Version: 2.0.0-alpha.0](https://img.shields.io/badge/Version-2.0.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.4](https://img.shields.io/badge/AppVersion-2.0.4-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector msteams service
 
@@ -15,7 +15,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.4 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 4.0.0-alpha.0 |
 
 ## Values
 
@@ -34,7 +34,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | image.tag | string | `"2.0.4"` |  |
 | ingress.className | string | `"nginx"` |  |
 | ingress.extraAnnotations | object | `{}` |  |
-| ingress.path | string | `"/ms-teams-service"` |  |
+| ingress.hosts[0].paths[0].path | string | `"/ms-teams-service"` |  |
+| ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
 | ingress.tls | list | `[]` |  |
 | livenessProbe.failureThreshold | int | `1` |  |
 | livenessProbe.initialDelaySeconds | int | `10` |  |

charts/alfresco-connector-msteams/templates/ingress-connector-msteams.yaml

@@ -6,11 +6,10 @@ metadata:
   name: {{ $serviceName }}
   labels:
     {{- include "alfresco-connector-msteams.labels" . | nindent 4 }}
+  {{- with .Values.ingress.extraAnnotations }}
   annotations:
-    {{- if .Values.ingress.extraAnnotations }}
-    {{- toYaml .Values.ingress.extraAnnotations | nindent 4 }}
-    {{- end }}
-
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
   {{- if .Values.ingress.tls }}
@@ -24,13 +23,17 @@ spec:
     {{- end }}
   {{- end }}
   rules:
-  - http:
-      paths:
-      - path: {{ .Values.ingress.path }}
-        {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
-        pathType: Prefix
-        {{- end }}
-        backend: {{- include "common.ingress.backend" (dict "serviceName" $serviceName "servicePort" $servicePort "context" $) | nindent 10 }}
-  {{- if .Values.ingress.hostName }}
-    host: {{ tpl .Values.ingress.hostName $ }}
-  {{- end }}
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ $serviceName }}
+                port:
+                  number: {{ $servicePort }}
+          {{- end }}
+    {{- end }}

charts/alfresco-connector-msteams/tests/ingress-connector-msteams_test.yaml

@@ -21,3 +21,40 @@ tests:
     - equal:
         path: spec.ingressClassName
         value: nginx
+- it: should render default rules
+  asserts:
+    - equal:
+        path: spec.rules
+        value:
+          - host:
+            http:
+              paths:
+                - backend:
+                    service:
+                      name: RELEASE-NAME-alfresco-connector-msteams
+                      port:
+                        number: 80
+                  path: /ms-teams-service
+                  pathType: Prefix
+- it: should render rules with host
+  set:
+    ingress:
+      hosts:
+        - host: testhost
+          paths:
+          - path: /ms-teams-service
+            pathType: Prefix
+  asserts:
+    - equal:
+        path: spec.rules
+        value:
+          - host: testhost
+            http:
+              paths:
+                - backend:
+                    service:
+                      name: RELEASE-NAME-alfresco-connector-msteams
+                      port:
+                        number: 80
+                  path:  /ms-teams-service
+                  pathType: Prefix

charts/alfresco-connector-msteams/values.yaml

@@ -18,7 +18,10 @@ service:
   externalPort: 80
 ingress:
   className: nginx
-  path: /ms-teams-service
+  hosts:
+    - paths:
+        - path: /ms-teams-service
+          pathType: Prefix
   tls: []
   extraAnnotations: {}
 podSecurityContext:

charts/alfresco-search-service/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: alfresco-insight-zeppelin
   repository: ""
-  version: 3.0.4
+  version: 4.0.0-alpha.0
 - name: alfresco-common
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 3.1.4
-digest: sha256:911093babc80298f32c48f2bca90633b00cb85484255c03be4b29f0e15203ca7
-generated: "2024-11-28T15:11:14.868557+01:00"
+  version: 4.0.0-alpha.0
+digest: sha256:79402b7c09780013902acddc4d6e42878f8dbf32a2644b11d57f7a3855a0ca26
+generated: "2024-12-10T17:14:30.426415+01:00"

charts/alfresco-search-service/Chart.yaml

@@ -10,12 +10,12 @@ keywords:
 name: alfresco-search-service
 sources:
   - https://github.com/Alfresco/alfresco-helm-charts
-version: 4.0.0
+version: 5.0.0-alpha.0
 appVersion: 2.0.13
 dependencies:
   - name: alfresco-insight-zeppelin
-    version: 3.0.4
+    version: 4.0.0-alpha.0
     condition: alfresco-insight-zeppelin.enabled
   - name: alfresco-common
-    version: 3.1.4
+    version: 4.0.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/

charts/alfresco-search-service/README.md

@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-search-service
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square) ![AppVersion: 2.0.13](https://img.shields.io/badge/AppVersion-2.0.13-informational?style=flat-square)
+![Version: 5.0.0-alpha.0](https://img.shields.io/badge/Version-5.0.0--alpha.0-informational?style=flat-square) ![AppVersion: 2.0.13](https://img.shields.io/badge/AppVersion-2.0.13-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Search Service
 
@@ -21,8 +21,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | alfresco-insight-zeppelin | 3.0.4 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.4 |
+|  | alfresco-insight-zeppelin | 4.0.0-alpha.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 4.0.0-alpha.0 |
 
 ## Values
 
@@ -37,7 +37,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | ingress.className | string | `"nginx"` |  |
 | ingress.enabled | bool | `false` | Expose the solr admin console behind basic auth |
 | ingress.existingSecretName | string | `nil` | An existing secret that contains an `auth` key with a value in the same format of `ingress.basicAuth` |
-| ingress.path | string | `"/solr"` |  |
+| ingress.hosts[0].paths[0].path | string | `"/solr"` |  |
+| ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
 | ingress.tls | list | `[]` |  |
 | initContainer.image.pullPolicy | string | `"IfNotPresent"` |  |
 | initContainer.image.repository | string | `"busybox"` |  |

charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.yaml

@@ -8,11 +8,11 @@ keywords:
   - alfresco zeppelin
   - alfresco insight zeppelin
 name: alfresco-insight-zeppelin
-version: 3.0.4
+version: 4.0.0-alpha.0
 sources:
   - https://github.com/Alfresco/alfresco-helm-charts
 appVersion: 2.0.13
 dependencies:
   - name: alfresco-common
-    version: 3.1.4
+    version: 4.0.0-alpha.0
     repository: https://alfresco.github.io/alfresco-helm-charts/

charts/alfresco-search-service/charts/alfresco-insight-zeppelin/README.md

@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-insight-zeppelin
 
-![Version: 3.0.4](https://img.shields.io/badge/Version-3.0.4-informational?style=flat-square) ![AppVersion: 2.0.13](https://img.shields.io/badge/AppVersion-2.0.13-informational?style=flat-square)
+![Version: 4.0.0-alpha.0](https://img.shields.io/badge/Version-4.0.0--alpha.0-informational?style=flat-square) ![AppVersion: 2.0.13](https://img.shields.io/badge/AppVersion-2.0.13-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Insight Zeppelin
 
@@ -21,7 +21,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.4 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 4.0.0-alpha.0 |
 
 ## Values
 
@@ -37,7 +37,11 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"quay.io/alfresco/insight-zeppelin"` |  |
 | image.tag | string | `"2.0.13"` |  |
-| ingress.path | string | `"/zeppelin"` |  |
+| ingress.className | string | `"nginx"` |  |
+| ingress.extraAnnotations | object | `{}` |  |
+| ingress.hosts[0].paths[0].path | string | `"/zeppelin"` |  |
+| ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
+| ingress.tls | list | `[]` |  |
 | livenessProbe.initialDelaySeconds | int | `130` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |