Cleanup terraform

Author: aledbf

install/aws-terraform/main.tf

@@ -56,7 +56,6 @@ module "gitpod" {
     # simply setting "{}" does not work as it does not override: https://github.com/helm/helm/issues/5407
     certificatesSecret:
       secretName: ""
-    forceHTTPS: ${var.force_https}
 
     installation:
       region: ${var.region}

install/aws-terraform/variables.tf

@@ -35,12 +35,6 @@ variable "image_prefix" {
   description = "Image prefix for the registry in which the images for the components are hosted"
 }
 
-variable "force_https" {
-  type        = bool
-  default     = false
-  description = "Force the domain to use HTTPS"
-}
-
 variable "certbot_enabled" {
   type        = bool
   default     = false

install/docker/gitpod-image/entrypoint.sh

@@ -108,7 +108,6 @@ fi
 case "$DOMAIN" in
   *ip.mygitpod.com)
     cat << EOF > /default_values/03_ip_mygitpod_com.yaml
-forceHTTPS: true
 components:
   imageBuilder:
     registry:

install/gcp-terraform/environment/installer/main.tf

@@ -62,7 +62,6 @@ data "template_file" "values" {
     loadbalancer_ip = google_compute_address.gitpod.address
     certbot_enabled = var.certbot_enabled
     certbot_email   = var.certificate_email
-    force_https     = var.force_https
   }
 }
 module "gitpod" {

install/gcp-terraform/environment/installer/templates/values.tpl

@@ -13,5 +13,4 @@ components:
                 end: 11000
 
 installPodSecurityPolicies: true
-forceHTTPS: ${force_https}
 authProviders: []

install/gcp-terraform/environment/installer/variables.tf

@@ -41,11 +41,6 @@ variable "image_prefix" {
   default = "eu.gcr.io/gitpod-core-dev/build/"
 }
 
-variable "force_https" {
-  type    = bool
-  default = false
-}
-
 variable "certbot_enabled" {
   type    = bool
   default = false

install/gcp-terraform/modules/certmanager/templates/values.tpl

@@ -1,8 +1,5 @@
 certificatesSecret:
   secretName: ${secret_name}
-  keyName: ${key_name}
-  chainName: ${chain_name}
-  fullChainName: ${full_chain_name}
 
 components:
   restarter:

install/installer/cmd/aws.go

@@ -73,10 +73,6 @@ var awsCmd = &cobra.Command{
 			}
 		} else if !strings.Contains(domain, "ip.mygitpod.com") {
 			err = terraform.PersistVariable(tfvarsfn,
-				terraform.PersistVariableOpts{
-					Name:    "force_https",
-					Sources: []terraform.VariableValueSource{func(name string, spec terraform.VariableSpec) (value string, ok bool) { return "true", true }},
-				},
 				terraform.PersistVariableOpts{
 					Name:    "certbot_enabled",
 					Sources: []terraform.VariableValueSource{func(name string, spec terraform.VariableSpec) (value string, ok bool) { return "true", true }},
@@ -134,11 +130,7 @@ var awsCmd = &cobra.Command{
 					},
 				},
 				ForceOverwrite: true,
-			}, terraform.PersistVariableOpts{Name: "force_https", ForceOverwrite: true, Sources: []terraform.VariableValueSource{
-				func(name string, spec terraform.VariableSpec) (value string, ok bool) {
-					return "true", true
-				},
-			}})
+			})
 			if err != nil {
 				ui.Fatalf("cannot update the \"domain\" terraform variables - please re-run this installer.\n\t%q", err)
 			}

install/installer/cmd/gcp.go

@@ -69,10 +69,6 @@ var gcpCmd = &cobra.Command{
 			}
 		} else if !strings.Contains(domain, "ip.mygitpod.com") {
 			err = terraform.PersistVariable(tfvarsfn,
-				terraform.PersistVariableOpts{
-					Name:    "force_https",
-					Sources: []terraform.VariableValueSource{func(name string, spec terraform.VariableSpec) (value string, ok bool) { return "true", true }},
-				},
 				terraform.PersistVariableOpts{
 					Name:    "certbot_enabled",
 					Sources: []terraform.VariableValueSource{func(name string, spec terraform.VariableSpec) (value string, ok bool) { return "true", true }},
@@ -121,11 +117,7 @@ var gcpCmd = &cobra.Command{
 					},
 				},
 				ForceOverwrite: true,
-			}, terraform.PersistVariableOpts{Name: "force_https", ForceOverwrite: true, Sources: []terraform.VariableValueSource{
-				func(name string, spec terraform.VariableSpec) (value string, ok bool) {
-					return "true", true
-				},
-			}})
+			})
 			if err != nil {
 				ui.Fatalf("cannot update the \"domain\" terraform variables - please re-run this installer:\n\t%q", err)
 			}