OPSEXP-2984 Remove dependency to bitnami/common across charts

Alfresco · Dec 10, 2024 · c5657d8 · c5657d8
1 parent ea633d1
commit c5657d8
Show file tree

Hide file tree

Showing 21 changed files with 144 additions and 83 deletions.
diff --git a/charts/alfresco-connector-ms365/Chart.yaml b/charts/alfresco-connector-ms365/Chart.yaml
@@ -2,7 +2,7 @@ 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

diff --git a/charts/alfresco-connector-ms365/README.md b/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
 
@@ -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` |  |

diff --git a/charts/alfresco-connector-ms365/templates/ingress-conector-ms365.yaml b/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 }}
diff --git a/charts/alfresco-connector-ms365/values.yaml b/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:

diff --git a/charts/alfresco-connector-msteams/Chart.yaml b/charts/alfresco-connector-msteams/Chart.yaml
@@ -2,7 +2,7 @@ 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

diff --git a/charts/alfresco-connector-msteams/README.md b/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
 
@@ -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` |  |

diff --git a/charts/alfresco-connector-msteams/templates/ingress-connector-msteams.yaml b/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 }}
diff --git a/charts/alfresco-connector-msteams/values.yaml b/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:

diff --git a/charts/alfresco-search-service/Chart.lock b/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"
+digest: sha256:8c3ff83154624ccc59892f7c95065c8a19dae32a842f97408f216985d3183c95
+generated: "2024-12-10T14:24:24.927413+01:00"
diff --git a/charts/alfresco-search-service/Chart.yaml b/charts/alfresco-search-service/Chart.yaml
@@ -10,11 +10,11 @@ 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

diff --git a/charts/alfresco-search-service/README.md b/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,7 +21,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | alfresco-insight-zeppelin | 3.0.4 |
+|  | alfresco-insight-zeppelin | 4.0.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.4 |
 
 ## 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"` |  |

diff --git a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.yaml b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.yaml
@@ -8,7 +8,7 @@ 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

diff --git a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/README.md b/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
 
@@ -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` |  |

diff --git a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/ingress.yaml b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/ingress.yaml
@@ -3,16 +3,37 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ template "alfresco-insight-zeppelin.fullname" . }}
+  name: {{ $serviceName }}
   labels:
     {{- include "alfresco-insight-zeppelin.labels" . | nindent 4 }}
+  {{- with .Values.ingress.extraAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
-  ingressClassName: nginx
-  rules:
-  - http:
-      paths:
-      - path: {{ .Values.ingress.path }}
-        {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
-        pathType: Prefix
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
         {{- end }}
-        backend: {{- include "common.ingress.backend" (dict "serviceName" $serviceName "servicePort" $servicePort "context" $) | nindent 10 }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ $serviceName }}
+                port:
+                  number: {{ $servicePort }}
+          {{- end }}
+    {{- end }}
diff --git a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/values.yaml b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/values.yaml
@@ -13,7 +13,13 @@ service:
   type: ClusterIP
   externalPort: 80
 ingress:
-  path: /zeppelin
+  className: nginx
+  hosts:
+    - paths:
+        - path: /zeppelin
+          pathType: Prefix
+  tls: []
+  extraAnnotations: {}
 repository:
   # -- Alfresco repository URL
   url: http://alfresco-search-service

diff --git a/charts/alfresco-search-service/templates/ingress.yaml b/charts/alfresco-search-service/templates/ingress.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled }}
-{{- $servicePort := .Values.service.name | default (include "alfresco-search.svcPort" .) -}}
-{{- $backendSvc := dict "serviceName" (include "alfresco-search-service.deployment.name" .) "servicePort" $servicePort "context" $ -}}
+{{- $servicePort := (include "alfresco-search.svcPort" .) -}}
+{{- $serviceName := (include "alfresco-search-service.deployment.name" .) -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -27,14 +27,18 @@ 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" $backendSvc | nindent 10 }}
-    {{- if .Values.ingress.hostName }}
-    host: {{ tpl .Values.ingress.hostName . }}
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ $serviceName }}
+                port:
+                  number: {{ $servicePort }}
+          {{- end }}
     {{- end }}
 {{- end }}
diff --git a/charts/alfresco-search-service/values.yaml b/charts/alfresco-search-service/values.yaml
@@ -37,7 +37,10 @@ service:
 ingress:
   # -- Expose the solr admin console behind basic auth
   enabled: false
-  path: /solr
+  hosts:
+    - paths:
+        - path: /solr
+          pathType: Prefix
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:

diff --git a/charts/alfresco-sync-service/Chart.yaml b/charts/alfresco-sync-service/Chart.yaml
@@ -8,7 +8,7 @@ keywords:
 name: alfresco-sync-service
 sources:
   - https://github.com/Alfresco/acs-deployment
-version: 6.1.0
+version: 7.0.0-alpha.0
 appVersion: 5.1.0
 icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4
 dependencies:

diff --git a/charts/alfresco-sync-service/README.md b/charts/alfresco-sync-service/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-sync-service
 
-![Version: 6.1.0](https://img.shields.io/badge/Version-6.1.0-informational?style=flat-square) ![AppVersion: 5.1.0](https://img.shields.io/badge/AppVersion-5.1.0-informational?style=flat-square)
+![Version: 7.0.0-alpha.0](https://img.shields.io/badge/Version-7.0.0--alpha.0-informational?style=flat-square) ![AppVersion: 5.1.0](https://img.shields.io/badge/AppVersion-5.1.0-informational?style=flat-square)
 
 Alfresco Sync Service
 
@@ -48,7 +48,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | image.repository | string | `"quay.io/alfresco/service-sync"` |  |
 | image.tag | string | `"5.1.0"` |  |
 | ingress.extraAnnotations | object | `{}` | useful when running Sync service without SSL termination done by a load balancer, e.g. when ran on Minikube for testing purposes nginx.ingress.kubernetes.io/ssl-redirect: "false" |
-| ingress.path | string | `"/syncservice"` |  |
+| ingress.hosts[0].paths[0].path | string | `"/syncservice(/|$)(.*)"` |  |
+| ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
 | ingress.tls | list | `[]` |  |
 | livenessProbe.httpGet.path | string | `"/alfresco/healthcheck"` |  |
 | livenessProbe.httpGet.port | string | `"serviceport"` |  |