1
0

updated versions

This commit is contained in:
sido
2018-06-25 22:53:22 +02:00
parent 5dcda7ff78
commit 1a7b201aba
39 changed files with 262 additions and 193 deletions

View File

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -7,8 +7,9 @@ metadata:
app: {{ .Values.httpd.name }}
environment: {{ .Values.environment }}
spec:
replicas: 1
strategy: {}
replicas: {{ .Values.replicaCount }}
strategy:
type: {{ .Values.httpd.strategy.type }}
selector:
matchLabels:
app: {{ .Values.httpd.selector }}
@ -25,9 +26,9 @@ spec:
imagePullPolicy: {{ .Values.httpd.image.pullPolicy }}
env:
- name: PROXY_SERVICE
value: "{{ .Values.nexus.name }}:{{ .Values.nexus.port.ui }},{{ .Values.nexus.name }}:{{ .Values.nexus.port.docker }}:v2"
value: "{{ .Values.nexus.name }}:{{ .Values.nexus.port.ui }},{{ .Values.nexus.name }}:{{ .Values.nexus.port.docker }}:{{ .Values.nexus.path.dockerV2 }}"
- name: SERVER_NAME
value: registry.molgenis.org
value: {{ .Values.httpd.hostname }}
ports:
- containerPort: {{ .Values.httpd.port }}
resources: {}

View File

@ -7,8 +7,8 @@ metadata:
app: {{ .Values.nexus.name }}
environment: {{ .Values.environment }}
spec:
replicas: 1
strategy: {}
replicas: {{ .Values.replicaCount }}
strategy: {{ .Values.strategy.type }}
selector:
matchLabels:
app: {{ .Values.nexus.selector }}

View File

@ -12,6 +12,8 @@ service:
nexus:
name: nexus
strategy:
type: Recreate
selector: nexus
restartPolicy: Always
image:
@ -21,9 +23,14 @@ nexus:
port:
docker: 5000
ui: 8081
path:
dockerV2: v2
httpd:
name: httpd
hostname: registry.molgenis.org
strategy:
type: Recreate
selector: httpd
restartPolicy: Always
image:
@ -32,6 +39,7 @@ httpd:
pullPolicy: Always
port: 80
ingress:
enabled: true
annotations: {}