← azuredeploy

change kubectl module and harness delegate

2b9dca9bc3cb4764f5e7094da5a7eb72eb4c76d5 · ovidiucs · Aug 9, 2024 22:02

+14 −25 · 4 files changed

• terraform/deployment/aks/modules/kubectl/harness-delegate.yml +0 −7
• terraform/deployment/aks/modules/kubectl/kubectl-cfg/secret.yaml +1 −0
• terraform/deployment/aks/modules/kubectl/main.tf +12 −4
• terraform/deployment/aks/terragrunt.hcl +1 −14

diff --git a/terraform/deployment/aks/modules/kubectl/harness-delegate.yml b/terraform/deployment/aks/modules/kubectl/harness-delegate.yml
index 30cc76b..9a277e5 100644
--- a/terraform/deployment/aks/modules/kubectl/harness-delegate.yml
+++ b/terraform/deployment/aks/modules/kubectl/harness-delegate.yml
@@ -1,10 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: harness-delegate-ng
-
----
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
diff --git a/terraform/deployment/aks/modules/kubectl/kubectl-cfg/secret.yaml b/terraform/deployment/aks/modules/kubectl/kubectl-cfg/secret.yaml
index d94fd8b..021c2ae 100644
--- a/terraform/deployment/aks/modules/kubectl/kubectl-cfg/secret.yaml
+++ b/terraform/deployment/aks/modules/kubectl/kubectl-cfg/secret.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: my-sa-token
+  namespace: default
   annotations:
     kubernetes.io/service-account.name: aks-sa
 type: kubernetes.io/service-account-token
diff --git a/terraform/deployment/aks/modules/kubectl/main.tf b/terraform/deployment/aks/modules/kubectl/main.tf
index ecc690d..7709d04 100644
--- a/terraform/deployment/aks/modules/kubectl/main.tf
+++ b/terraform/deployment/aks/modules/kubectl/main.tf
@@ -3,7 +3,7 @@ terraform {
     kubernetes = {
       source = "hashicorp/kubernetes"
       # Setting the provider version is a strongly recommended practice
-        version = "~> 2.23.0"
+        version = "~> 2.31.0"
     }
   }
   # Provider functions require Terraform 1.8 and later.
@@ -48,12 +48,20 @@ provider "kubernetes" {
 */
 # Multi decode YAML, iterate over the object
 /*
+
+*/
+resource "kubernetes_manifest" "harness_delegate_namespace" {
+  manifest = yamldecode(file("${path.module}/harness-delegate-nsconf.yaml"))
+}
 resource "kubernetes_manifest" "harness_delegate" {
-  value = provider::kubernetes::manifest_decode_multi(file("manifest.yaml"))
-  manifest = yamldecode(file("harness-delegate.yml"))
+# value = provider::kubernetes::manifest_decode_multi(file("manifest.yaml"))
+# manifest = provider::kubernetes::manifest_decode_multi(file("${path.module}/harness-delegate.yml"))
+# for_each = provider::kubernetes::manifest_decode_multi(file("${path.module}/harness-delegate.yml"))
+  for_each = { for manifest in provider::kubernetes::manifest_decode_multi(file("${path.module}/harness-delegate.yml")) : "${lower(manifest.kind)}-${manifest.metadata.name}" => manifest }
+  manifest = each.value
+  depends_on = [kubernetes_manifest.harness_delegate_namespace]
 }
 
-*/
 resource "kubernetes_manifest" "clusterrolebinding" {
   manifest = yamldecode(file("${path.module}/${var.config_path}/clusterrolebinding.yaml"))
 }
diff --git a/terraform/deployment/aks/terragrunt.hcl b/terraform/deployment/aks/terragrunt.hcl
index b4eea11..800c97b 100644
--- a/terraform/deployment/aks/terragrunt.hcl
+++ b/terraform/deployment/aks/terragrunt.hcl
@@ -1,20 +1,7 @@
 terraform {
   source = "."
 }
-
-remote_state {
-  backend = "azurerm"
-  config = {
-    resource_group_name  = "AZ-Resource-GRP"
-    storage_account_name = "terragruntstorageaccount"
-    container_name       = "terraform-state"
-    key                  = "aks/terraform.tfstate"
-  }
-    generate = {
-    path      = "backend.tf"
-    if_exists = "overwrite_terragrunt"
-  }
-}
+include "root" {path=find_in_parent_folders("state.hcl")}
 
 inputs = {
   # other input variables for the AKS deployment