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 7b5f687 added step-ca
7b5f687 is described below
commit 7b5f687279d3357cdd23a4f79321e8f250484730
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Thu Dec 5 09:48:56 2019 +0200
added step-ca
---
.../main/modules/helm_charts/cert-manager.tf | 18 ------------
.../gcp/ssn-gke/main/modules/helm_charts/mysql.tf | 32 ----------------------
.../gcp/ssn-gke/main/modules/helm_charts/nginx.tf | 22 ---------------
.../ssn-gke/main/modules/helm_charts/secrets.tf | 11 --------
.../ssn-gke/main/modules/helm_charts/step-ca.tf | 5 ----
.../ssn-gke/main/modules/helm_charts/variables.tf | 9 ------
6 files changed, 97 deletions(-)
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/cert-manager.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/cert-manager.tf
index c111cee..1f5906e 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/cert-manager.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/cert-manager.tf
@@ -19,24 +19,6 @@
#
#
******************************************************************************
-//resource "null_resource" "cert_manager" {
-// provisioner "local-exec" {
-// command = "kubectl apply -f
https://github.com/jetstack/cert-manager/releases/download/v0.9.1/cert-manager.yaml";
-// }
-// triggers = {
-// "after" = kubernetes_namespace.cert-manager-namespace.metadata[0].name
-// }
-//}
-//
-//resource "null_resource" "cert_manager_delay" {
-// provisioner "local-exec" {
-// command = "sleep 120"
-// }
-// triggers = {
-// "before" = null_resource.cert_manager.id
-// }
-//}
-
resource "null_resource" "crd_delay" {
provisioner "local-exec" {
command = "sleep 120"
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf
index 88a0088..401ca2f 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf
@@ -43,35 +43,3 @@ resource "helm_release" "keycloak-mysql" {
helm_release.nginx]
}
-//resource "kubernetes_persistent_volume" "example" {
-// metadata {
-// name = "mysql-keycloak-pv2"
-// }
-// spec {
-// capacity = {
-// storage = "8Gi"
-// }
-// access_modes = ["ReadWriteMany"]
-// persistent_volume_source {
-// host_path {
-// path = "/home/dlab-user/keycloak-pv2"
-// }
-// }
-// }
-//}
-//
-//resource "kubernetes_persistent_volume_claim" "example" {
-// metadata {
-// name = "mysql-keycloak-pvc2"
-// }
-// spec {
-// access_modes = ["ReadWriteMany"]
-// resources {
-// requests = {
-// storage = "5Gi"
-// }
-// }
-// volume_name = kubernetes_persistent_volume.example.metadata.0.name
-// }
-//}
-
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
index 5e81da1..e03bb97 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
@@ -19,28 +19,6 @@
#
#
******************************************************************************
-//data "template_file" "nginx_values" {
-// template = file("./modules/helm_charts/files/nginx_values.yaml")
-// vars = {
-// namespace = var.namespace_name
-// step_ca_service_name = helm_release.step_ca.name
-// }
-//}
-//
-//resource "helm_release" "nginx" {
-// name = "nginx-ingress"
-// chart = "stable/nginx-ingress"
-// namespace = kubernetes_namespace.dlab-namespace.metadata[0].name
-// wait = true
-// # depends_on = [null_resource.step_ca_delay]
-// depends_on = [null_resource.crd_delay]
-//
-// values = [
-// file("./modules/helm_charts/files/nginx_values.yaml")
-// ]
-//}
-
-
data "template_file" "nginx-default-backend" {
template = file("./modules/helm_charts/nginx-default-backend/values.yaml")
}
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/secrets.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/secrets.tf
index ab58bc4..5a78c41 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/secrets.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/secrets.tf
@@ -129,17 +129,6 @@ resource "kubernetes_secret" "ssn_keystore_password" {
}
}
-//resource "kubernetes_secret" "endpoint_keystore_password" {
-// metadata {
-// name = "endpoint-keystore-password"
-// namespace = kubernetes_namespace.dlab-namespace.metadata[0].name
-// }
-//
-// data = {
-// password = var.endpoint_keystore_password
-// }
-//}
-
resource "random_string" "step_ca_password" {
length = 8
special = false
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 ebd831f..51e2988 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
@@ -19,11 +19,6 @@
#
#
******************************************************************************
-//data "helm_repository" "smallstep" {
-// name = "smallstep"
-// url = "https://smallstep.github.io/helm-charts/";
-//}
-
locals {
step_ca_name = "step-certificates"
}
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
index 3441d1d..c9d3382 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
@@ -82,12 +82,3 @@ variable "custom_certs_host" {}
variable "mysql_disk_size" {}
variable "domain" {}
-
-//variable "nginx_http_port" {
-// default = "31080"
-// description = "Sets the nodePort that maps to the Ingress' port 80"
-//}
-//variable "nginx_https_port" {
-// default = "31443"
-// description = "Sets the nodePort that maps to the Ingress' port 443"
-//}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
