OPSEXP-2482 Replace deprecated annotations with spec.ingressClassName

Alfresco · Sep 25, 2024 · 347aaf0 · 347aaf0
1 parent be66bd4
commit 347aaf0
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 6 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.0.0
+version: 2.0.1
 appVersion: 2.0.3
 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.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.3](https://img.shields.io/badge/AppVersion-2.0.3-informational?style=flat-square)
+![Version: 2.0.1](https://img.shields.io/badge/Version-2.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.3](https://img.shields.io/badge/AppVersion-2.0.3-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector ms365 service
 
@@ -29,6 +29,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"quay.io/alfresco/alfresco-ooi-service"` |  |
 | image.tag | string | `"2.0.3"` |  |
+| ingress.className | string | `"nginx"` |  |
 | ingress.extraAnnotations | object | `{}` |  |
 | ingress.path | string | `"/ooi-service"` |  |
 | ingress.tls | list | `[]` |  |

diff --git a/charts/alfresco-connector-ms365/templates/ingress-conector-ms365.yaml b/charts/alfresco-connector-ms365/templates/ingress-conector-ms365.yaml
@@ -7,12 +7,12 @@ metadata:
   labels:
     {{- include "alfresco-connector-ms365.labels" . | nindent 4 }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
     {{- if .Values.ingress.extraAnnotations }}
     {{- toYaml .Values.ingress.extraAnnotations | nindent 4 }}
     {{- end }}
 
 spec:
+  ingressClassName: {{ .Values.ingress.className }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}

diff --git a/charts/alfresco-connector-ms365/tests/ingress-conector-ms365_test.yaml b/charts/alfresco-connector-ms365/tests/ingress-conector-ms365_test.yaml
@@ -16,3 +16,8 @@ tests:
         content:
           annotationTest1: test1
           annotationTest2: test2
+- it: should render default ingressClassName
+  asserts:
+    - equal:
+        path: spec.ingressClassName
+        value: nginx
diff --git a/charts/alfresco-connector-ms365/values.yaml b/charts/alfresco-connector-ms365/values.yaml
@@ -57,6 +57,7 @@ service:
   type: ClusterIP
   externalPort: 80
 ingress:
+  className: nginx
   path: /ooi-service
   tls: []
   extraAnnotations: {}

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.0.0
+version: 1.0.1
 appVersion: 2.0.3
 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.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.3](https://img.shields.io/badge/AppVersion-2.0.3-informational?style=flat-square)
+![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.3](https://img.shields.io/badge/AppVersion-2.0.3-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector msteams service
 
@@ -32,6 +32,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"quay.io/alfresco/alfresco-ms-teams-service"` |  |
 | image.tag | string | `"2.0.3"` |  |
+| ingress.className | string | `"nginx"` |  |
 | ingress.extraAnnotations | object | `{}` |  |
 | ingress.path | string | `"/ms-teams-service"` |  |
 | ingress.tls | list | `[]` |  |

diff --git a/charts/alfresco-connector-msteams/templates/ingress-connector-msteams.yaml b/charts/alfresco-connector-msteams/templates/ingress-connector-msteams.yaml
@@ -7,12 +7,12 @@ metadata:
   labels:
     {{- include "alfresco-connector-msteams.labels" . | nindent 4 }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
     {{- if .Values.ingress.extraAnnotations }}
     {{- toYaml .Values.ingress.extraAnnotations | nindent 4 }}
     {{- end }}
 
 spec:
+  ingressClassName: {{ .Values.ingress.className }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}

diff --git a/charts/alfresco-connector-msteams/tests/ingress-connector-msteams_test.yaml b/charts/alfresco-connector-msteams/tests/ingress-connector-msteams_test.yaml
@@ -16,3 +16,8 @@ tests:
         content:
           annotationTest1: test1
           annotationTest2: test2
+- it: should render default ingressClassName
+  asserts:
+    - equal:
+        path: spec.ingressClassName
+        value: nginx
diff --git a/charts/alfresco-connector-msteams/values.yaml b/charts/alfresco-connector-msteams/values.yaml
@@ -17,6 +17,7 @@ service:
   type: ClusterIP
   externalPort: 80
 ingress:
+  className: nginx
   path: /ms-teams-service
   tls: []
   extraAnnotations: {}