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 58a6347 added step-ca
58a6347 is described below
commit 58a63477e1cacb6a0ebf4665f808223322f1875b
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Tue Nov 26 18:07:09 2019 +0200
added step-ca
---
.../main/modules/helm_charts/dlab-ui-chart/templates/cert.yaml | 3 +--
.../gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml | 6 +++---
.../terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf | 2 +-
.../terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf | 2 +-
.../gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/values.yaml | 6 ++----
.../terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca.tf | 2 +-
.../terraform/gcp/ssn-gke/main/modules/helm_charts/step-issuer.tf | 2 +-
7 files changed, 10 insertions(+), 13 deletions(-)
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/cert.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/cert.yaml
index d29eb31..9285a2b 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/cert.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/cert.yaml
@@ -35,11 +35,10 @@ spec:
# DNS SAN
dnsNames:
- localhost
- - om2611.dedvelop.dlabanalytics.com
# IP Address SAN
ipAddresses:
- "127.0.0.1"
- # - {{ .Values.ui.ingress.host }}
+ - {{ .Values.ui.ingress.host }}
# Duration of the certificate
duration: 24h
# Renew 8 hours before the certificate expiration
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 1797d5b..b6be089 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
@@ -41,7 +41,7 @@ ui:
https_port: 58443
ingress:
enabled: true
- host: om2611.dedvelop.dlabanalytics.com # ${ssn_k8s_alb_dns_name}
+ host: ${ssn_k8s_alb_dns_name}
annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/ssl-redirect: "true"
@@ -53,8 +53,8 @@ ui:
username: ${mongo_user}
db_name: ${mongo_db_name}
keycloak:
- auth_server_url: https://om2611.dedvelop.dlabanalytics.com/auth #
https://${ssn_k8s_alb_dns_name}/auth
- redirect_uri: https://om2611.dedvelop.dlabanalytics.com/ #
https://${ssn_k8s_alb_dns_name}/
+ auth_server_url: https://${ssn_k8s_alb_dns_name}/auth
+ redirect_uri: https://${ssn_k8s_alb_dns_name}/
custom_certs:
enabled: ${custom_certs_enabled}
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
index 2f5f796..0f0fcb9 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
@@ -35,7 +35,7 @@ data "template_file" "dlab_ui_values" {
mongo_user = var.mongo_db_username
mongo_port = var.mongo_service_port
mongo_service_name = var.mongo_service_name
- ssn_k8s_alb_dns_name = "om2611.dedvelop.dlabanalytics.com"
#local.ui_host
+ ssn_k8s_alb_dns_name = local.ui_host
service_base_name = var.service_base_name
os = var.env_os
namespace =
kubernetes_namespace.dlab-namespace.metadata[0].name
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 52b7691..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
@@ -42,7 +42,7 @@ data "template_file" "keycloak_values" {
vars = {
keycloak_user = var.keycloak_user
keycloak_password = random_string.keycloak_password.result
- ssn_k8s_alb_dns_name = "om2611.dedvelop.dlabanalytics.com" #
local.ui_host
+ ssn_k8s_alb_dns_name = local.ui_host
configure_keycloak_file = data.template_file.configure_keycloak.rendered
mysql_db_name = var.mysql_db_name
mysql_user = var.mysql_user
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/values.yaml
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/values.yaml
index 0e0f060..45350b6 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/values.yaml
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca-chart/values.yaml
@@ -35,13 +35,11 @@ ca:
address: :9000
# dns is the comma separated dns names to use. Leave it empty to use the
format:
# {include "step-certificates.fullname" .}.{
.Release.Namespace}.svc.cluster.local,127.0.0.1
- dns: om2611.dedvelop.dlabanalytics.com
- # ${step_chart_name}.${namespace}.svc.cluster.local,${step_ca_host}
+ dns: ${step_chart_name}.${namespace}.svc.cluster.local,${step_ca_host}
# ${step_ca_host}
# url is the http url where step-certificates will listen at. Leave it empty
to use the format
# https://{{ include "step-certificates.fullname" . }}.{{ .Release.Namespace
}}.svc.cluster.local
- url: https://om2611.dedvelop.dlabanalytics.com
- #${step_chart_name}.${namespace}.svc.cluster.local
+ url: https://${step_chart_name}.${namespace}.svc.cluster.local
#${step_ca_host}
# password is the password used to encrypt the keys. Leave it empty to
generate a random one.
password: ${step_ca_password}
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca.tf
index 2e8fd1c..ebd831f 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-ca.tf
@@ -54,7 +54,7 @@ data "template_file" "step_ca_values" {
vars = {
step_ca_password = random_string.step_ca_password.result
step_ca_provisioner_password =
random_string.step_ca_provisioner_password.result
- step_ca_host = "om2611.dedvelop.dlabanalytics.com" #
kubernetes_service.step_service_lb.load_balancer_ingress.0.ip
+ step_ca_host =
kubernetes_service.step_service_lb.load_balancer_ingress.0.ip
step_chart_name = local.step_ca_name
namespace =
kubernetes_namespace.dlab-namespace.metadata[0].name
}
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-issuer.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-issuer.tf
index c99b467..2cbb247 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-issuer.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/step-issuer.tf
@@ -46,7 +46,7 @@ resource "null_resource" "step_issuer_delay" {
data "template_file" "step_ca_issuer_values" {
template = file("./modules/helm_charts/step-ca-issuer-chart/values.yaml")
vars = {
- step_ca_url = "https://om2611.dedvelop.dlabanalytics.com"; #
"https://${kubernetes_service.step_service_lb.load_balancer_ingress.0.ip}";
+ step_ca_url =
"https://${kubernetes_service.step_service_lb.load_balancer_ingress.0.ip}";
step_ca_bundle = lookup(data.external.step-ca-config-values.result,
"rootCa")
namespace = kubernetes_namespace.dlab-namespace.metadata[0].name
step_ca_kid_name = lookup(data.external.step-ca-config-values.result,
"kidName")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
