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 3154784 added step-ca
3154784 is described below
commit 3154784446f684345c30f56f5b104f9172213880
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Thu Nov 21 23:08:10 2019 +0200
added step-ca
---
.../modules/helm_charts/dlab-ui-chart/values.yaml | 2 +
.../modules/helm_charts/files/keycloak_values.yaml | 6 ++
.../modules/helm_charts/files/nginx_values.yaml | 5 +-
.../ssn-gke/main/modules/helm_charts/keycloak.tf | 70 +++++++++++-----------
4 files changed, 44 insertions(+), 39 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 9b589a6..9a7b8aa 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,6 +47,8 @@ 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 205ee11..be142c5 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
@@ -44,6 +44,12 @@ keycloak:
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/files/nginx_values.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
index 717caa0..60a6fbf 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
@@ -24,7 +24,4 @@ controller:
# nodePorts:
# http: 31080
# https: 31443
- type: LoadBalancer
-
-tcp:
- 8080: "${namespace}/${step_ca_service_name}:433"
\ No newline at end of file
+ type: LoadBalancer
\ No newline at end of file
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 a5ab90e..3aba87c 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]
