Merge branch 'feat/service-fix' into 'master'
Fix typo in matrix-synapse/service See merge request ananace/charts!24
This commit is contained in:
commit
a441d78848
4 changed files with 9 additions and 9 deletions
|
@ -139,11 +139,11 @@ spec:
|
||||||
service:
|
service:
|
||||||
name: {{ $fullName }}
|
name: {{ $fullName }}
|
||||||
port:
|
port:
|
||||||
number: 8008
|
number: {{ $.Values.service.port }}
|
||||||
pathType: Prefix
|
pathType: Prefix
|
||||||
{{- else }}
|
{{- else }}
|
||||||
serviceName: {{ $fullName }}
|
serviceName: {{ $fullName }}
|
||||||
servicePort: 8008
|
servicePort: {{ $.Values.service.port }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
@ -154,11 +154,11 @@ spec:
|
||||||
service:
|
service:
|
||||||
name: {{ $fullName }}
|
name: {{ $fullName }}
|
||||||
port:
|
port:
|
||||||
number: 8008
|
number: {{ $.Values.service.port }}
|
||||||
pathType: Prefix
|
pathType: Prefix
|
||||||
{{- else }}
|
{{- else }}
|
||||||
serviceName: {{ $fullName }}
|
serviceName: {{ $fullName }}
|
||||||
servicePort: 8008
|
servicePort: {{ $.Values.service.port }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
@ -195,11 +195,11 @@ spec:
|
||||||
service:
|
service:
|
||||||
name: {{ $fullName }}
|
name: {{ $fullName }}
|
||||||
port:
|
port:
|
||||||
number: 8008
|
number: {{ $.Values.service.port }}
|
||||||
pathType: Exact
|
pathType: Exact
|
||||||
{{- else }}
|
{{- else }}
|
||||||
serviceName: {{ $fullName }}
|
serviceName: {{ $fullName }}
|
||||||
servicePort: 8008
|
servicePort: {{ $.Values.service.port }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -8,7 +8,7 @@ metadata:
|
||||||
spec:
|
spec:
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
ports:
|
ports:
|
||||||
- port: {{ .Values.serviceport | default 8008 }}
|
- port: {{ .Values.service.port }}
|
||||||
targetPort: {{ .Values.service.targetPort | default "http" }}
|
targetPort: {{ .Values.service.targetPort | default "http" }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
name: http
|
name: http
|
||||||
|
|
|
@ -12,5 +12,5 @@ spec:
|
||||||
- name: wget
|
- name: wget
|
||||||
image: busybox
|
image: busybox
|
||||||
command: ['wget']
|
command: ['wget']
|
||||||
args: ['{{ include "matrix-synapse.fullname" . }}:8008/_matrix/client/versions']
|
args: ['{{ include "matrix-synapse.fullname" . }}:{{ $.Values.service.port }}/_matrix/client/versions']
|
||||||
restartPolicy: Never
|
restartPolicy: Never
|
||||||
|
|
|
@ -29,7 +29,7 @@ data:
|
||||||
worker_name: {{ $config.name }}
|
worker_name: {{ $config.name }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
worker_main_http_uri: http://{{ include "matrix-synapse.fullname" $ }}:8008
|
worker_main_http_uri: http://{{ include "matrix-synapse.fullname" $ }}:{{ $.Values.service.port }}
|
||||||
worker_replication_host: {{ include "matrix-synapse.replicationname" $ | quote }}
|
worker_replication_host: {{ include "matrix-synapse.replicationname" $ | quote }}
|
||||||
worker_replication_http_port: 9093
|
worker_replication_http_port: 9093
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue