Merge pull request #20 from adamrushuk/fix-nexus-ingress

Fixed ingress
adamrushuk · Oct 19, 2022 · 1235c55 · 1235c55
2 parents df91979 + 7cb72c2
commit 1235c55
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/charts/sonatype-nexus/Chart.yaml b/charts/sonatype-nexus/Chart.yaml
@@ -3,7 +3,7 @@ name: sonatype-nexus
 description: Sonatype Nexus is an open source repository manager
 type: application
 # This is the chart version
-version: 0.3.0
+version: 0.3.1
 # This is the version number of the application being deployed
 appVersion: 3.42.0
 keywords:

diff --git a/charts/sonatype-nexus/templates/ingress.yaml b/charts/sonatype-nexus/templates/ingress.yaml
@@ -1,18 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "sonatype-nexus.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
-  {{- end }}
-{{- end }}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -42,13 +31,20 @@ spec:
       paths:
       - path: /
         backend:
-          serviceName: {{ $fullName }}
-          servicePort: {{ .Values.nexus.nexusPort }}
+          service:
+            name: {{ $fullName }}
+            port:
+              number: {{ .Values.nexus.nexusPort }}
+        pathType: ImplementationSpecific
+
   - host: docker.{{ .Values.nexus.baseDomain }}
     http:
       paths:
       - path: /
         backend:
-          serviceName: {{ $fullName }}
-          servicePort: {{ .Values.nexus.dockerPort }}
+          service:
+            name: {{ $fullName }}
+            port:
+              number: {{ .Values.nexus.dockerPort }}
+        pathType: ImplementationSpecific
 {{- end }}