feat: use podSelctor to allow traefik

docs(terraform-docs): generate docs and write to README.adoc
camptocamp · Aug 21, 2024 · 5ffc39f · 5ffc39f
1 parent a98ad02
commit 5ffc39f
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 57 deletions.
diff --git a/README.adoc b/README.adoc
@@ -270,6 +270,14 @@ Type: `bool`
 
 Default: `false`
 
+==== [[input_network_policy_thanos]] <<input_network_policy_thanos,network_policy_thanos>>
+
+Description: Enable or disable network policy for Thanos components.
+
+Type: `bool`
+
+Default: `false`
+
 === Outputs
 
 The following outputs are exported:
@@ -302,8 +310,8 @@ Description: ID to pass other modules in order to refer to this module as a depe
 |===
 |Name |Version
 |[[provider_random]] <<provider_random,random>> |>= 3
-|[[provider_argocd]] <<provider_argocd,argocd>> |>= 5
 |[[provider_utils]] <<provider_utils,utils>> |>= 1
+|[[provider_argocd]] <<provider_argocd,argocd>> |>= 5
 |[[provider_null]] <<provider_null,null>> |>= 3
 |===
 
@@ -513,6 +521,12 @@ object({
 |`false`
 |no
 
+|[[input_network_policy_thanos]] <<input_network_policy_thanos,network_policy_thanos>>
+|Enable or disable network policy for Thanos components.
+|`bool`
+|`false`
+|no
+
 |===
 
 = Outputs

diff --git a/aks/README.adoc b/aks/README.adoc
@@ -474,6 +474,14 @@ Type: `bool`
 
 Default: `false`
 
+==== [[input_network_policy_thanos]] <<input_network_policy_thanos,network_policy_thanos>>
+
+Description: Enable or disable network policy for Thanos components.
+
+Type: `bool`
+
+Default: `false`
+
 === Outputs
 
 The following outputs are exported:
@@ -740,6 +748,12 @@ object({
 |`false`
 |no
 
+|[[input_network_policy_thanos]] <<input_network_policy_thanos,network_policy_thanos>>
+|Enable or disable network policy for Thanos components.
+|`bool`
+|`false`
+|no
+
 |===
 
 = Outputs

diff --git a/aks/main.tf b/aks/main.tf
@@ -59,19 +59,19 @@ resource "azurerm_federated_identity_credential" "thanos" {
 module "thanos" {
   source = "../"
 
-  cluster_name           = var.cluster_name
-  base_domain            = var.base_domain
-  subdomain              = var.subdomain
-  argocd_project         = var.argocd_project
-  argocd_labels          = var.argocd_labels
-  destination_cluster    = var.destination_cluster
-  target_revision        = var.target_revision
-  cluster_issuer         = var.cluster_issuer
-  deep_merge_append_list = var.deep_merge_append_list
-  enable_service_monitor = var.enable_service_monitor
-  app_autosync           = var.app_autosync
-  dependency_ids         = var.dependency_ids
-  enable_network_policies  = var.enable_network_policies
+  cluster_name            = var.cluster_name
+  base_domain             = var.base_domain
+  subdomain               = var.subdomain
+  argocd_project          = var.argocd_project
+  argocd_labels           = var.argocd_labels
+  destination_cluster     = var.destination_cluster
+  target_revision         = var.target_revision
+  cluster_issuer          = var.cluster_issuer
+  deep_merge_append_list  = var.deep_merge_append_list
+  enable_service_monitor  = var.enable_service_monitor
+  app_autosync            = var.app_autosync
+  dependency_ids          = var.dependency_ids
+  enable_network_policies = var.enable_network_policies
 
   resources = var.resources
 

diff --git a/eks/README.adoc b/eks/README.adoc
@@ -503,6 +503,14 @@ Type: `bool`
 
 Default: `false`
 
+==== [[input_network_policy_thanos]] <<input_network_policy_thanos,network_policy_thanos>>
+
+Description: Enable or disable network policy for Thanos components.
+
+Type: `bool`
+
+Default: `false`
+
 === Outputs
 
 The following outputs are exported:
@@ -768,6 +776,12 @@ object({
 |`false`
 |no
 
+|[[input_network_policy_thanos]] <<input_network_policy_thanos,network_policy_thanos>>
+|Enable or disable network policy for Thanos components.
+|`bool`
+|`false`
+|no
+
 |===
 
 = Outputs

diff --git a/eks/main.tf b/eks/main.tf
@@ -50,19 +50,19 @@ module "iam_assumable_role_thanos" {
 module "thanos" {
   source = "../"
 
-  cluster_name           = var.cluster_name
-  base_domain            = var.base_domain
-  subdomain              = var.subdomain
-  argocd_project         = var.argocd_project
-  argocd_labels          = var.argocd_labels
-  destination_cluster    = var.destination_cluster
-  target_revision        = var.target_revision
-  cluster_issuer         = var.cluster_issuer
-  deep_merge_append_list = var.deep_merge_append_list
-  enable_service_monitor = var.enable_service_monitor
-  app_autosync           = var.app_autosync
-  dependency_ids         = var.dependency_ids
-  enable_network_policies  = var.enable_network_policies
+  cluster_name            = var.cluster_name
+  base_domain             = var.base_domain
+  subdomain               = var.subdomain
+  argocd_project          = var.argocd_project
+  argocd_labels           = var.argocd_labels
+  destination_cluster     = var.destination_cluster
+  target_revision         = var.target_revision
+  cluster_issuer          = var.cluster_issuer
+  deep_merge_append_list  = var.deep_merge_append_list
+  enable_service_monitor  = var.enable_service_monitor
+  app_autosync            = var.app_autosync
+  dependency_ids          = var.dependency_ids
+  enable_network_policies = var.enable_network_policies
 
   resources = var.resources
 

diff --git a/kind/README.adoc b/kind/README.adoc
@@ -401,6 +401,14 @@ Type: `bool`
 
 Default: `false`
 
+==== [[input_network_policy_thanos]] <<input_network_policy_thanos,network_policy_thanos>>
+
+Description: Enable or disable network policy for Thanos components.
+
+Type: `bool`
+
+Default: `false`
+
 === Outputs
 
 The following outputs are exported:
@@ -645,6 +653,12 @@ object({
 |`false`
 |no
 
+|[[input_network_policy_thanos]] <<input_network_policy_thanos,network_policy_thanos>>
+|Enable or disable network policy for Thanos components.
+|`bool`
+|`false`
+|no
+
 |===
 
 = Outputs

diff --git a/kind/main.tf b/kind/main.tf
@@ -1,19 +1,19 @@
 module "thanos" {
   source = "../"
 
-  cluster_name           = var.cluster_name
-  base_domain            = var.base_domain
-  subdomain              = var.subdomain
-  argocd_project         = var.argocd_project
-  argocd_labels          = var.argocd_labels
-  destination_cluster    = var.destination_cluster
-  target_revision        = var.target_revision
-  cluster_issuer         = var.cluster_issuer
-  deep_merge_append_list = var.deep_merge_append_list
-  enable_service_monitor = var.enable_service_monitor
-  app_autosync           = var.app_autosync
-  dependency_ids         = var.dependency_ids
-  enable_network_policies  = var.enable_network_policies
+  cluster_name            = var.cluster_name
+  base_domain             = var.base_domain
+  subdomain               = var.subdomain
+  argocd_project          = var.argocd_project
+  argocd_labels           = var.argocd_labels
+  destination_cluster     = var.destination_cluster
+  target_revision         = var.target_revision
+  cluster_issuer          = var.cluster_issuer
+  deep_merge_append_list  = var.deep_merge_append_list
+  enable_service_monitor  = var.enable_service_monitor
+  app_autosync            = var.app_autosync
+  dependency_ids          = var.dependency_ids
+  enable_network_policies = var.enable_network_policies
 
   resources = var.resources
 

diff --git a/locals.tf b/locals.tf
@@ -204,9 +204,9 @@ locals {
           extraIngress = var.enable_network_policies ? [
             {
               from = {
-                namespaceSelector = {
+                podSelector = {
                   matchLabels = {
-                    "app.kubernetes.io/metadata.name" = "traefik"
+                    "app" = "traefik"
                   }
                 }
               }
@@ -349,9 +349,9 @@ locals {
           extraIngress = var.enable_network_policies ? [
             {
               from = {
-                namespaceSelector = {
+                podSelector = {
                   matchLabels = {
-                    "app.kubernetes.io/metadata.name" = "traefik"
+                    "app" = "traefik"
                   }
                 }
               }

diff --git a/sks/README.adoc b/sks/README.adoc
@@ -344,6 +344,14 @@ Type: `bool`
 
 Default: `false`
 
+==== [[input_network_policy_thanos]] <<input_network_policy_thanos,network_policy_thanos>>
+
+Description: Enable or disable network policy for Thanos components.
+
+Type: `bool`
+
+Default: `false`
+
 === Outputs
 
 The following outputs are exported:
@@ -587,6 +595,12 @@ object({
 |`false`
 |no
 
+|[[input_network_policy_thanos]] <<input_network_policy_thanos,network_policy_thanos>>
+|Enable or disable network policy for Thanos components.
+|`bool`
+|`false`
+|no
+
 |===
 
 = Outputs

diff --git a/sks/main.tf b/sks/main.tf
@@ -1,19 +1,19 @@
 module "thanos" {
   source = "../"
 
-  cluster_name           = var.cluster_name
-  base_domain            = var.base_domain
-  subdomain              = var.subdomain
-  argocd_project         = var.argocd_project
-  argocd_labels          = var.argocd_labels
-  destination_cluster    = var.destination_cluster
-  target_revision        = var.target_revision
-  cluster_issuer         = var.cluster_issuer
-  deep_merge_append_list = var.deep_merge_append_list
-  enable_service_monitor = var.enable_service_monitor
-  app_autosync           = var.app_autosync
-  dependency_ids         = var.dependency_ids
-  enable_network_policies  = var.enable_network_policies
+  cluster_name            = var.cluster_name
+  base_domain             = var.base_domain
+  subdomain               = var.subdomain
+  argocd_project          = var.argocd_project
+  argocd_labels           = var.argocd_labels
+  destination_cluster     = var.destination_cluster
+  target_revision         = var.target_revision
+  cluster_issuer          = var.cluster_issuer
+  deep_merge_append_list  = var.deep_merge_append_list
+  enable_service_monitor  = var.enable_service_monitor
+  app_autosync            = var.app_autosync
+  dependency_ids          = var.dependency_ids
+  enable_network_policies = var.enable_network_policies
 
   resources = var.resources