Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add global.ingressClass into values.yaml. #11820

Closed
wants to merge 1 commit into from
Closed

Add global.ingressClass into values.yaml. #11820

wants to merge 1 commit into from

Conversation

monaka
Copy link
Member

@monaka monaka commented Nov 4, 2018

What does this PR do?

Adding new value glbal.ingressClass for customizing ingress.class annotations.

What issues does this PR fix or reference?

This will fix indirectly #10751 #10767 #10099

@riuvshin
Copy link
Contributor

riuvshin commented Nov 4, 2018

Can one of the admins verify this patch?

2 similar comments
@riuvshin
Copy link
Contributor

riuvshin commented Nov 4, 2018

Can one of the admins verify this patch?

@riuvshin
Copy link
Contributor

riuvshin commented Nov 4, 2018

Can one of the admins verify this patch?

@monaka
Copy link
Member Author

monaka commented Nov 4, 2018

As it was discussed on #10751, Ingress on AKS have an issue related on loadBalancer.
But it will be set within enough acceptable delay after we set ingress.class: "addon-http-application-routing".

@benoitf benoitf added status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. kind/question Questions that haven't been identified as being feature requests or bugs. labels Nov 4, 2018
@@ -32,6 +32,8 @@ global:
# This value can be passed if custom Oidc provider is used, and there is no need to deploy keycloak in multiuser mode
# default (if empty) is true
#cheDedicatedKeycloak: false
ingressClass: "ingress"
#ingressClass: "addon-http-application-routing" ## This may fix the issue around bootstraping your stacks on Azure AKS.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is right value for .global.ingressAnnotationsPrefix if .global.ingressClass is set to addon-http-application-routing? Will default value nginx. will work fine?

Copy link

@garagatyi garagatyi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool to have this configurable. Thanks for this contribution!
Please, take a look on my inlined comments.

@@ -32,6 +32,8 @@ global:
# This value can be passed if custom Oidc provider is used, and there is no need to deploy keycloak in multiuser mode
# default (if empty) is true
#cheDedicatedKeycloak: false
ingressClass: "ingress"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previously hardcoded value was "nginx". Now it would be pointing to this value which is "ingress". Shouldn't it be "nginx"?

{{- else }}
CHE_INFRA_KUBERNETES_INGRESS_ANNOTATIONS__JSON: '{"kubernetes.io/ingress.class": "nginx", "{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/rewrite-target": "/","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/ssl-redirect": "false","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-connect-timeout": "3600","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout": "3600"}'
CHE_INFRA_KUBERNETES_INGRESS_ANNOTATIONS__JSON: '{"kubernetes.io/ingress.class": {{ .Values.global.ingressClass }}, "{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/rewrite-target": "/","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/ssl-redirect": "false","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-connect-timeout": "3600","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout": "3600"}'

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having {{ .Values.global.ingressClass }} in double quotes make it more aligned with other values.

@@ -66,9 +66,9 @@ data:
JAVA_OPTS: "-XX:MaxRAMFraction=2 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dsun.zip.disableMemoryMapping=true -Xms20m "
CHE_WORKSPACE_AUTO_START: "false"
{{- if .Values.global.tls.enabled }}
CHE_INFRA_KUBERNETES_INGRESS_ANNOTATIONS__JSON: '{"kubernetes.io/ingress.class": "nginx", "kubernetes.io/tls-acme": "true", "{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/rewrite-target": "/","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/ssl-redirect": "true","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-connect-timeout": "3600","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout": "3600"}'
CHE_INFRA_KUBERNETES_INGRESS_ANNOTATIONS__JSON: '{"kubernetes.io/ingress.class": {{ .Values.global.ingressClass }}, "kubernetes.io/tls-acme": "true", "{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/rewrite-target": "/","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/ssl-redirect": "true","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-connect-timeout": "3600","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout": "3600"}'

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having {{ .Values.global.ingressClass }} in double quotes make it more aligned with other values.

Signed-off-by: Masaki Muranaka <monaka@monami-ya.com>
@monaka
Copy link
Member Author

monaka commented Feb 11, 2019

@sleshchenko @garagatyi Today, I changed my opinion. I close this now and will send another pull request (for more details: #12645). Thank you for your review and comment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/question Questions that haven't been identified as being feature requests or bugs. status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants