chore(httpd): updated templates

httpd/v1.0.0/questions.yml

@@ -2,7 +2,7 @@ categories:
 - MOLGENIS
 questions:
 - variable: molgenisUsername
-  default: "user"
+  default: "molgenis"
   description: "User of the application"
   type: string
   required: true
@@ -45,12 +45,12 @@ questions:
   - variable: httpd.hostname
     default: ""
     description: "Hostname to your stack (comma separated)"
-    type: hostname
+    type: string
     required: true
     label: Hostname
   - variable: httpd.proxy
     default: "[service]:[port]:[path]"
     description: "Proxy to services (comma separated)"
     type: string
-    required: true
+    required: false
     label: Proxy

httpd/v1.0.0/templates/deployment.yaml

@@ -29,9 +29,9 @@ spec:
               protocol: TCP
           env:
             - name: SERVER_NAME
-              value: {{ .Values.ingress.hosts[0].name | quote }}
+              value: {{ .Values.httpd.hostname | quote }}
             - name: PROXY_SERVICE
-              values: {{ .Values.httpd.proxy | quote }}
+              value: {{ .Values.httpd.proxy | quote }}
           livenessProbe:
             httpGet:
               path: /

nexus/v1.0.0/templates/services/httpd-service.yaml

@@ -1,14 +1,19 @@
 apiVersion: v1
 kind: Service
 metadata:
-  creationTimestamp: null
+  name: {{ template "httpd.fullname" . }}
-  name: httpd
+  labels:
+    app: {{ template "httpd.name" . }}
+    chart: {{ template "httpd.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 spec:
+  type: {{ .Values.service.type }}
   ports:
-  - name: "80"
+    - port: {{ .Values.service.port }}
-    port: 80
+      targetPort: http
-    targetPort: 80
+      protocol: TCP
+      name: http
   selector:
-    app: nexus
+    app: {{ template "httpd.name" . }}
-status:
+    release: {{ .Release.Name }}
-  loadBalancer: {}

nexus/v1.0.0/templates/services/nexus-service.yaml

@@ -7,11 +7,9 @@ metadata:
     app: nexus
 spec:
   ports:
-  - name: "8081"
+  - name: "ui"
     port: 8081
-    targetPort: 8081
+  - name: "docker"
-  - name: "5000"
     port: 5000
-    targetPort: 5000
   selector:
     app: nexus

nexus/v1.0.0/values.yaml

@@ -14,13 +14,13 @@ service:
   type: ClusterIP
 
 ingress:
-  enabled: false
+  enabled: true
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   path: /
   hosts:
-    - registry.molgenis.local
+    - registry.molgenis.org
   tls: []
   #  - secretName: chart-example-tls
   #    hosts: