Update nexus helm charts. Docker and helm repos are exposed using separated ingress...

[it/dep.git] / ric-infra / 10-Nexus / helm / templates / helm-ingress.yaml

diff --git a/ric-infra/10-Nexus/helm/templates/helmingress.yaml b/ric-infra/10-Nexus/helm/templates/helm-ingress.yaml
similarity index 77%
rename from ric-infra/10-Nexus/helm/templates/helmingress.yaml
rename to ric-infra/10-Nexus/helm/templates/helm-ingress.yaml
index 291a103..22e1938 100644 (file)
--- a/ric-infra/10-Nexus/helm/templates/helmingress.yaml
+++ b/ric-infra/10-Nexus/helm/templates/helm-ingress.yaml
@@ -19,22 +19,17 @@ kind: Ingress
 metadata:
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /repository/helm.local/
-  name: {{ include "nexus.fullname" . }}-helm
-  labels:
-    app: {{ template "nexus.name" . }}
-    chart: {{ template "nexus.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+  name: {{ include "common.ingressname.nexus" . }}-helm
 spec:
   tls:
     - hosts:
-      - helm.{{ .Values.ingress.hostpostfix }}
-      secretName: {{ include "common.helmrepositorycert" . }}
+      - {{ include "common.ingressurl.localhelm" . }}
+      secretName: secret-{{ include "common.name.nexus" . }}-helm
   rules:
-    - host: helm.{{ .Values.ingress.hostpostfix }}
+    - host: {{ include "common.ingressurl.localhelm" . }}
       http:
         paths:
           - backend:
-              serviceName: {{ include "nexus.fullname" . }}
-              servicePort: nexus
+              serviceName: {{ include "common.servicename.nexus.http" . }}
+              servicePort: helm
             path: /