This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new 48efd41 added step-ca
48efd41 is described below
commit 48efd418869e79fd31fc3b28e102b9bbb0fa6c47
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Fri Nov 22 00:43:22 2019 +0200
added step-ca
---
.../modules/helm_charts/dlab-ui-chart/values.yaml | 2 -
.../modules/helm_charts/files/keycloak_values.yaml | 8 +--
.../ssn-gke/main/modules/helm_charts/keycloak.tf | 70 +++++++++++-----------
3 files changed, 36 insertions(+), 44 deletions(-)
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
index 9a7b8aa..9b589a6 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
@@ -47,8 +47,6 @@ ui:
nginx.ingress.kubernetes.io/ssl-redirect: "true"
tls:
- secretName: dlab-ui-tls
- hosts:
- - ${ssn_k8s_alb_dns_name}
mongo:
host: ${mongo_service_name}
port: ${mongo_port}
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
index ce3e5a7..205ee11 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
@@ -38,18 +38,12 @@ keycloak:
# nodePort: 31088
ingress:
- enabled: true
+ enabled: false
annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/ssl-redirect: "true"
nginx.ingress.kubernetes.io/rewrite-target: /auth
path: /auth
- hosts:
- - ${ssn_k8s_alb_dns_name}
- tls:
- - hosts:
- - ${ssn_k8s_alb_dns_name}
- secretName: dlab-ui-tls
startupScripts:
mystartup.sh: |
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
index 3aba87c..a5ab90e 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
@@ -71,38 +71,38 @@ resource "helm_release" "keycloak" {
helm_release.dlab_ui]
}
-//resource "kubernetes_ingress" "keycloak_ingress" {
-// metadata {
-// name = "keycloak"
-// namespace = kubernetes_namespace.dlab-namespace.metadata[0].name
-// annotations = {
-// "kubernetes.io/ingress.class": "nginx"
-// "nginx.ingress.kubernetes.io/ssl-redirect": "true"
-// "nginx.ingress.kubernetes.io/rewrite-target": "/auth"
-// }
-// }
-//
-// spec {
-// backend {
-// service_name = "${helm_release.keycloak.name}-http"
-// service_port = 80
-// }
-//
-// rule {
-// http {
-// path {
-// backend {
-// service_name = "${helm_release.keycloak.name}-http"
-// service_port = 80
-// }
-//
-// path = "/auth"
-// }
-// }
-// }
-// tls {
-// secret_name = "${helm_release.dlab_ui.name}-tls"
-// }
-// }
-// depends_on = [helm_release.keycloak]
-//}
\ No newline at end of file
+resource "kubernetes_ingress" "keycloak_ingress" {
+ metadata {
+ name = "keycloak"
+ namespace = kubernetes_namespace.dlab-namespace.metadata[0].name
+ annotations = {
+ "kubernetes.io/ingress.class": "nginx"
+ "nginx.ingress.kubernetes.io/ssl-redirect": "true"
+ "nginx.ingress.kubernetes.io/rewrite-target": "/auth"
+ }
+ }
+
+ spec {
+ backend {
+ service_name = "${helm_release.keycloak.name}-http"
+ service_port = 80
+ }
+
+ rule {
+ http {
+ path {
+ backend {
+ service_name = "${helm_release.keycloak.name}-http"
+ service_port = 80
+ }
+
+ path = "/auth"
+ }
+ }
+ }
+ tls {
+ secret_name = "${helm_release.dlab_ui.name}-tls"
+ }
+ }
+ depends_on = [helm_release.keycloak]
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
