OPSEXP-2488 Fix apiVersion of ingresses for msteams and ms365 (#249)

Alfresco · Mar 14, 2024 · 8f6341b · 8f6341b
1 parent 432f44a
commit 8f6341b
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 8 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: 0.6.1
+version: 0.7.0
 appVersion: 2.0.0
 dependencies:
   - name: alfresco-common

diff --git a/charts/alfresco-connector-ms365/README.md b/charts/alfresco-connector-ms365/README.md
@@ -1,6 +1,6 @@
 # alfresco-connector-ms365
 
-![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
+![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector ms365 service
 

diff --git a/charts/alfresco-connector-ms365/templates/ingress-conector-ms365.yaml b/charts/alfresco-connector-ms365/templates/ingress-conector-ms365.yaml
@@ -1,6 +1,6 @@
 {{- $serviceName := (include "alfresco-connector-ms365.fullname" .)  -}}
 {{- $servicePort := .Values.service.externalPort -}}
-apiVersion: {{ template "common.capabilities.ingress.apiVersion" . }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $serviceName }}
@@ -9,7 +9,7 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: "nginx"
     {{- if .Values.ingress.extraAnnotations }}
-    {{ toYaml .Values.ingress.extraAnnotations }}
+    {{- toYaml .Values.ingress.extraAnnotations | nindent 4 }}
     {{- end }}
 
 spec:

diff --git a/charts/alfresco-connector-ms365/tests/ingress-conector-ms365_test.yaml b/charts/alfresco-connector-ms365/tests/ingress-conector-ms365_test.yaml
@@ -0,0 +1,18 @@
+suite: test ms365-connector ingress
+templates:
+- ingress-conector-ms365.yaml
+tests:
+- it: should render extra annotations
+  values: &testvalues
+    - values/test_values.yaml
+  set:
+    ingress:
+      extraAnnotations:
+        annotationTest1: test1
+        annotationTest2: test2
+  asserts:
+    - isSubset:
+        path: metadata.annotations
+        content:
+          annotationTest1: test1
+          annotationTest2: test2
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: 0.4.1
+version: 0.5.0
 appVersion: 2.0.0
 dependencies:
   - name: alfresco-common

diff --git a/charts/alfresco-connector-msteams/README.md b/charts/alfresco-connector-msteams/README.md
@@ -1,6 +1,6 @@
 # alfresco-connector-msteams
 
-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
+![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector msteams service
 

diff --git a/charts/alfresco-connector-msteams/templates/ingress-connector-msteams.yaml b/charts/alfresco-connector-msteams/templates/ingress-connector-msteams.yaml
@@ -1,6 +1,6 @@
 {{- $serviceName := (include "alfresco-connector-msteams.fullname" .) -}}
 {{- $servicePort := .Values.service.externalPort -}}
-apiVersion: {{ template "common.capabilities.ingress.apiVersion" . }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $serviceName }}
@@ -9,7 +9,7 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: "nginx"
     {{- if .Values.ingress.extraAnnotations }}
-    {{ toYaml .Values.ingress.extraAnnotations }}
+    {{- toYaml .Values.ingress.extraAnnotations | nindent 4 }}
     {{- end }}
 
 spec:

diff --git a/charts/alfresco-connector-msteams/tests/ingress-connector-msteams_test.yaml b/charts/alfresco-connector-msteams/tests/ingress-connector-msteams_test.yaml
@@ -0,0 +1,18 @@
+suite: test msteams-connector ingress
+templates:
+- ingress-connector-msteams.yaml
+tests:
+- it: should render extra annotations
+  values: &testvalues
+    - values/test_values.yaml
+  set:
+    ingress:
+      extraAnnotations:
+        annotationTest1: test1
+        annotationTest2: test2
+  asserts:
+    - isSubset:
+        path: metadata.annotations
+        content:
+          annotationTest1: test1
+          annotationTest2: test2