add default annotations and possibility to use same ingress for http-… #2106
Conversation
| annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} | ||
| {{- /*Following annotation can't be described in the _helpers.tpl, so actually it hast to stay here*/ -}} | ||
| {{- if and .Values.frost.mqtt.ingress.useSameAsHttp (or (eq .Values.frost.http.ingress.ingressProvider "kubernetes-nginx") (not .Values.frost.http.ingress.ingressProvider))}} | ||
| nginx.ingress.kubernetes.io/server-snippets: | |
There was a problem hiding this comment.
According to the docs that should be without s: server-snippet. Are you sure this works?
helm/frost-server/values.yaml
Outdated
| @@ -126,11 +126,11 @@ frost: | |||
| nodePort: | |||
| servicePort: 80 | |||
| ingress: | |||
| enabled: true | |||
| enabled: false | |||
There was a problem hiding this comment.
HTTP-ingress disabled by default? That seems odd?
helm/frost-server/values.yaml
Outdated
| # className: nginx-hamel | ||
| ## Defines the type of ingress-Controller in use (nginx [default], agic ) | ||
| # ingressProvider: agic | ||
| ingressClassName: regioit-private-ingress |
There was a problem hiding this comment.
That looks like an internal test name, is that OK, or should it be "anonymised"?
There was a problem hiding this comment.
remove values for test purposes
helm/frost-server/values.yaml
Outdated
| serviceHost: frost.hameltest.intern.cnaphci.regioit.cloud | ||
| urlSubPath: "meinFrost" |
There was a problem hiding this comment.
That looks like an internal test name, is that OK, or should it be "anonymised"?
There was a problem hiding this comment.
remove values for test purposes
helm/frost-server/values.yaml
Outdated
| enabled: false | ||
| secretName: [] | ||
| enabled: true | ||
| secretName: hamel-test-frost-server-http-tls |
There was a problem hiding this comment.
That looks like an internal test name, is that OK, or should it be "anonymised"?
There was a problem hiding this comment.
remove values for test purposes
helm/frost-server/values.yaml
Outdated
| # className: azure-application-gateway | ||
| ## Defines the type of ingress-Controller in use (nginx [default], agic or traefik) | ||
| # ingressProvider: agic | ||
| ingressClassName: regioit-private-ingress |
There was a problem hiding this comment.
That looks like an internal test name, is that OK, or should it be "anonymised"?
There was a problem hiding this comment.
remove values for test purposes
helm/frost-server/values.yaml
Outdated
|
|
||
| # FROST-Server MQTT business settings | ||
| serviceHost: "" # default URI is the same then frost.http.serviceHost" | ||
| serviceHost: "mqtt.hameltest.intern.cnaphci.regioit.cloud" # default URI is the same then frost.http.serviceHost" |
There was a problem hiding this comment.
That looks like an internal test name, is that OK, or should it be "anonymised"?
There was a problem hiding this comment.
remove values for test purposes
helm/frost-server/values.yaml
Outdated
| enabled: false | ||
| secretName: [] | ||
| enabled: true | ||
| secretName: hamel-test-frost-server-mqtt-tls |
There was a problem hiding this comment.
That looks like an internal test name, is that OK, or should it be "anonymised"?
There was a problem hiding this comment.
remove values for test purposes
fix "snippet"
revoke test values
|
remove values for test purposes |
uncomment tls values
possible to use the http-service ingress for http-service and mqtt-websocket-service
mqtt is listening on /mqtt
while FROST-Server is listening default on /FROST-Server
enhancement for mqtt and http-service annotations