Revert "Gatekeeper Deployment" (#362)

smarunich · web-flow · commit 91c80541f27c · 2024-03-27T11:08:15.000-04:00
Reverts #358 Need to follow `argocd` as an example to enable, not to have it under tsb modules but have it independently installed
diff --git a/modules/addons/gatekeeper/main.tf b/modules/addons/gatekeeper/main.tf
diff --git a/modules/addons/gatekeeper/manifests/gatekeeper-values.yaml b/modules/addons/gatekeeper/manifests/gatekeeper-values.yaml
diff --git a/modules/addons/gatekeeper/providers.tf b/modules/addons/gatekeeper/providers.tf
diff --git a/modules/addons/gatekeeper/variable.tf b/modules/addons/gatekeeper/variable.tf
diff --git a/modules/tsb/mp/main.tf b/modules/tsb/mp/main.tf
@@ -130,4 +130,3 @@ data "kubernetes_service" "tsb" {
   }
   depends_on = [time_sleep.wait_240_seconds]
 }
-
diff --git a/modules/tsb/mp/variables.tf b/modules/tsb/mp/variables.tf
@@ -66,3 +66,4 @@ variable "es_cacert" {
 
 
 
+
diff --git a/terraform-advanced.tfvars.json.sample b/terraform-advanced.tfvars.json.sample
@@ -19,9 +19,6 @@
                     },
                     "tsb-monitoring": {
                         "enabled": true
-                    },
-                    "gatekeeper": {
-                        "enabled" : true
                     }
                 }
             }
@@ -44,9 +41,6 @@
                     },
                     "tsb-monitoring": {
                         "enabled": true
-                    },
-                    "gatekeeper": {
-                        "enabled" : true
                     }
                 }
             }
@@ -69,9 +63,6 @@
                     },
                     "tsb-monitoring": {
                         "enabled": true
-                    },
-                    "gatekeeper": {
-                        "enabled" : true
                     }
                 }
             }
diff --git a/terraform-basic.tfvars.json.sample b/terraform-basic.tfvars.json.sample
@@ -9,9 +9,6 @@
                 "addons": {
                     "argocd": {
                         "enabled": true
-                    },
-                    "gatekeeper": {
-                        "enabled" : true
                     }
                 }
             }
@@ -25,9 +22,6 @@
                 "addons": {
                     "argocd": {
                         "enabled": true
-                    },
-                    "gatekeeper": {
-                        "enabled": true
                     }
                 }
             }
@@ -41,9 +35,6 @@
                 "addons": {
                     "argocd": {
                         "enabled": true
-                    },
-                    "gatekeeper": {
-                        "enabled": true
                     }
                 }
             }
diff --git a/tsb/cp/main.tf b/tsb/cp/main.tf
@@ -37,15 +37,6 @@ module "ratelimit" {
   enabled                    = var.ratelimit_enabled
 }
 
-module "gatekeeper" {
-  source                     = "../../modules/addons/gatekeeper"
-  cluster_name               = data.terraform_remote_state.infra.outputs.cluster_name
-  k8s_host                   = data.terraform_remote_state.infra.outputs.host
-  k8s_cluster_ca_certificate = data.terraform_remote_state.infra.outputs.cluster_ca_certificate
-  k8s_client_token           = data.terraform_remote_state.k8s_auth.outputs.token
-  gatekeeper_enabled         = local.cluster.tetrate.management_plane ? false : local.cluster.addons.gatekeeper
-}
-
 module "tsb_cp" {
   source                       = "../../modules/tsb/cp"
   cloud                        = local.cluster.cloud
diff --git a/tsb/cp/variables.tf b/tsb/cp/variables.tf
@@ -9,11 +9,6 @@ variable "cluster" {
       control_plane    = optional(bool)
       management_plane = optional(bool)
     })
-    addons = object({
-      gatekeeper = object({
-        enabled = optional(bool)
-      })     
-    })
     version   = optional(string)
     workspace = string
   })
@@ -26,9 +21,6 @@ locals {
       management_plane = false
     }
     version = "1.27"
-    addons = {
-      gatekeeper = false
-    }
   }
   cluster = {
     cloud  = var.cluster.cloud
@@ -41,10 +33,6 @@ locals {
     }
     version   = coalesce(var.cluster.version, local.cluster_defaults.version)
     workspace = var.cluster.workspace
-    addons = {
-      gatekeeper  = coalesce(var.cluster.addons.gatekeeper.enabled,local.cluster_defaults.addons.gatekeeper)
-    }
-    
   }
 }
 
diff --git a/tsb/mp/main.tf b/tsb/mp/main.tf
@@ -30,15 +30,6 @@ module "es" {
   es_version                 = local.tetrate.es_version
 }
 
-module "gatekeeper" {
-  source                     = "../../modules/addons/gatekeeper"
-  cluster_name               = data.terraform_remote_state.infra.outputs.cluster_name
-  k8s_host                   = data.terraform_remote_state.infra.outputs.host
-  k8s_cluster_ca_certificate = data.terraform_remote_state.infra.outputs.cluster_ca_certificate
-  k8s_client_token           = data.terraform_remote_state.k8s_auth.outputs.token
-  gatekeeper_enabled         = local.cluster.addons.gatekeeper
-}
-
 module "tsb_mp" {
   source                       = "../../modules/tsb/mp"
   name_prefix                  = var.name_prefix
@@ -62,4 +53,4 @@ module "tsb_mp" {
   k8s_host                     = data.terraform_remote_state.infra.outputs.host
   k8s_cluster_ca_certificate   = data.terraform_remote_state.infra.outputs.cluster_ca_certificate
   k8s_client_token             = data.terraform_remote_state.k8s_auth.outputs.token
-}
+}
diff --git a/tsb/mp/variables.tf b/tsb/mp/variables.tf
@@ -9,11 +9,6 @@ variable "cluster" {
       control_plane    = optional(bool)
       management_plane = optional(bool)
     })
-    addons = object({
-      gatekeeper = object({
-        enabled = optional(bool)
-      }) 
-    })
     version   = optional(string)
     workspace = string
   })
@@ -26,9 +21,6 @@ locals {
       management_plane = false
     }
     version = "1.27"
-    addons = {
-      gatekeeper = false
-    }
   }
   cluster = {
     cloud  = var.cluster.cloud
@@ -41,10 +33,6 @@ locals {
     }
     version   = coalesce(var.cluster.version, local.cluster_defaults.version)
     workspace = var.cluster.workspace
-    addons = {
-      gatekeeper  = coalesce(var.cluster.addons.gatekeeper.enabled,local.cluster_defaults.addons.gatekeeper)
-    }
-    
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -130,4 +130,3 @@ data "kubernetes_service" "tsb" {`
`130`	`130`	`}`
`131`	`131`	`depends_on = [time_sleep.wait_240_seconds]`
`132`	`132`	`}`
`133`		`-`
Original file line number	Diff line number	Diff line change
`@@ -66,3 +66,4 @@ variable "es_cacert" {`
`66`	`66`
`67`	`67`
`68`	`68`
	`69`	`+`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,6 @@`
`19`	`19`	`},`
`20`	`20`	`"tsb-monitoring": {`
`21`	`21`	`"enabled": true`
`22`		`- },`
`23`		`- "gatekeeper": {`
`24`		`- "enabled" : true`
`25`	`22`	`}`
`26`	`23`	`}`
`27`	`24`	`}`
`@@ -44,9 +41,6 @@`
`44`	`41`	`},`
`45`	`42`	`"tsb-monitoring": {`
`46`	`43`	`"enabled": true`
`47`		`- },`
`48`		`- "gatekeeper": {`
`49`		`- "enabled" : true`
`50`	`44`	`}`
`51`	`45`	`}`
`52`	`46`	`}`
`@@ -69,9 +63,6 @@`
`69`	`63`	`},`
`70`	`64`	`"tsb-monitoring": {`
`71`	`65`	`"enabled": true`
`72`		`- },`
`73`		`- "gatekeeper": {`
`74`		`- "enabled" : true`
`75`	`66`	`}`
`76`	`67`	`}`
`77`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,6 @@`
`9`	`9`	`"addons": {`
`10`	`10`	`"argocd": {`
`11`	`11`	`"enabled": true`
`12`		`- },`
`13`		`- "gatekeeper": {`
`14`		`- "enabled" : true`
`15`	`12`	`}`
`16`	`13`	`}`
`17`	`14`	`}`
`@@ -25,9 +22,6 @@`
`25`	`22`	`"addons": {`
`26`	`23`	`"argocd": {`
`27`	`24`	`"enabled": true`
`28`		`- },`
`29`		`- "gatekeeper": {`
`30`		`- "enabled": true`
`31`	`25`	`}`
`32`	`26`	`}`
`33`	`27`	`}`
`@@ -41,9 +35,6 @@`
`41`	`35`	`"addons": {`
`42`	`36`	`"argocd": {`
`43`	`37`	`"enabled": true`
`44`		`- },`
`45`		`- "gatekeeper": {`
`46`		`- "enabled": true`
`47`	`38`	`}`
`48`	`39`	`}`
`49`	`40`	`}`