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 5a82eda added step-ca
5a82eda is described below
commit 5a82eda641cef1e43ba4ef967010233d3e71b7b6
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Tue Nov 19 22:35:34 2019 +0200
added step-ca
---
.../modules/helm_charts/step-ca-chart/values.yaml | 9 ++----
.../ssn-gke/main/modules/helm_charts/step-ca.tf | 33 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 7 deletions(-)
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 70aad8a..8145e1d 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
@@ -78,14 +78,9 @@ autocert:
enabled: true
# ingress contains the configuration for an ingress controller.
-paths:
- - /step
ingress:
- enabled: true
- annotations:
- kubernetes.io/ingress.class: nginx
- nginx.ingress.kubernetes.io/ssl-redirect: "true"
- nginx.ingress.kubernetes.io/rewrite-target: /step
+ enabled: false
+ annotations: {}
hosts: []
tls: []
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 c990124..848f5d3 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
@@ -46,6 +46,39 @@ resource "helm_release" "step_ca" {
]
}
+resource "kubernetes_ingress" "step_ca_ingress" {
+ metadata {
+ name = "keycloak"
+ namespace = kubernetes_namespace.dlab-namespace.metadata[0].name
+ annotations = {
+ "kubernetes.io/ingress.class": "nginx"
+ "nginx.ingress.kubernetes.io/ssl-redirect": "false"
+ "nginx.ingress.kubernetes.io/rewrite-target": "/step"
+ }
+ }
+
+ spec {
+ backend {
+ service_name = helm_release.step_ca.name
+ service_port = 80
+ }
+
+ rule {
+ http {
+ path {
+ backend {
+ service_name = helm_release.step_ca.name
+ service_port = 80
+ }
+
+ path = "/step"
+ }
+ }
+ }
+ }
+ depends_on = [helm_release.step_ca]
+}
+
resource "null_resource" "step_ca_delay" {
provisioner "local-exec" {
command = "sleep 120"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
