diff --git a/httpd/v1.0.0/questions.yml b/httpd/v1.0.0/questions.yml index d1e9f5e..82e8577 100644 --- a/httpd/v1.0.0/questions.yml +++ b/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 \ No newline at end of file diff --git a/httpd/v1.0.0/templates/deployment.yaml b/httpd/v1.0.0/templates/deployment.yaml index e7d9b85..c4745e0 100644 --- a/httpd/v1.0.0/templates/deployment.yaml +++ b/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: / diff --git a/nexus/v1.0.0/templates/services/httpd-service.yaml b/nexus/v1.0.0/templates/services/httpd-service.yaml index 5127165..18a3380 100644 --- a/nexus/v1.0.0/templates/services/httpd-service.yaml +++ b/nexus/v1.0.0/templates/services/httpd-service.yaml @@ -1,14 +1,19 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: null - name: httpd + name: {{ template "httpd.fullname" . }} + labels: + app: {{ template "httpd.name" . }} + chart: {{ template "httpd.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} spec: + type: {{ .Values.service.type }} ports: - - name: "80" - port: 80 - targetPort: 80 + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http selector: - app: nexus -status: - loadBalancer: {} + app: {{ template "httpd.name" . }} + release: {{ .Release.Name }} diff --git a/nexus/v1.0.0/templates/services/nexus-service.yaml b/nexus/v1.0.0/templates/services/nexus-service.yaml index ca90695..14b56cb 100644 --- a/nexus/v1.0.0/templates/services/nexus-service.yaml +++ b/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: "5000" + - name: "docker" port: 5000 - targetPort: 5000 selector: app: nexus diff --git a/nexus/v1.0.0/values.yaml b/nexus/v1.0.0/values.yaml index b548f1d..865732a 100644 --- a/nexus/v1.0.0/values.yaml +++ b/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: