removed null resource for localkubeconfig and helm (#500)

* refactor: removed null_resource create_local_kubeconfig,install_helm_on_operator

* removed commented lines

* renamed null resource

Author: karthicgit

modules/extensions/calico.tf

@@ -14,7 +14,7 @@ resource "null_resource" "install_calico" {
     bastion_private_key = local.ssh_private_key
   }
 
-  depends_on = [null_resource.install_kubectl_on_operator, null_resource.write_kubeconfig_on_operator]
+  depends_on = [null_resource.install_k8stools_on_operator, null_resource.write_kubeconfig_on_operator]
 
   provisioner "file" {
     content     = local.install_calico_template

modules/extensions/gatekeeper.tf

@@ -14,7 +14,7 @@ resource "null_resource" "enable_gatekeeper" {
     bastion_private_key = local.ssh_private_key
   }
 
-  depends_on = [null_resource.install_kubectl_on_operator, null_resource.write_kubeconfig_on_operator]
+  depends_on = [null_resource.install_k8stools_on_operator, null_resource.write_kubeconfig_on_operator]
 
   provisioner "file" {
     content     = local.gatekeeper_template

modules/extensions/k8stools.tf

@@ -1,7 +1,7 @@
 # Copyright 2017, 2021 Oracle Corporation and/or affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
-resource "null_resource" "install_kubectl_on_operator" {
+resource "null_resource" "install_k8stools_on_operator" {
   connection {
     host        = var.operator_private_ip
     private_key = local.ssh_private_key
@@ -19,45 +19,20 @@ resource "null_resource" "install_kubectl_on_operator" {
     destination = "/home/opc/install_kubectl.sh"
   }
 
-  provisioner "remote-exec" {
-    inline = [
-      "chmod +x $HOME/install_kubectl.sh",
-      "$HOME/install_kubectl.sh",
-      "rm -f $HOME/install_kubectl.sh"
-    ]
-  }
-
-  count = var.create_bastion_host == true && var.bastion_state == "RUNNING" && var.create_operator == true ? 1 : 0
-}
-
-# helm
-resource "null_resource" "install_helm_on_operator" {
-  connection {
-    host        = var.operator_private_ip
-    private_key = local.ssh_private_key
-    timeout     = "40m"
-    type        = "ssh"
-    user        = "opc"
-
-    bastion_host        = var.bastion_public_ip
-    bastion_user        = "opc"
-    bastion_private_key = local.ssh_private_key
-  }
-
-  depends_on = [null_resource.install_kubectl_on_operator, null_resource.write_kubeconfig_on_operator]
-
   provisioner "file" {
     content     = local.install_helm_template
     destination = "/home/opc/install_helm.sh"
   }
-
   provisioner "remote-exec" {
     inline = [
+      "chmod +x $HOME/install_kubectl.sh",
+      "$HOME/install_kubectl.sh",
+      "rm -f $HOME/install_kubectl.sh",
       "chmod +x $HOME/install_helm.sh",
-      "bash $HOME/install_helm.sh",
+      "$HOME/install_helm.sh",
       "rm -f $HOME/install_helm.sh"
     ]
   }
 
-  count = var.create_bastion_host == true && var.bastion_state == "RUNNING" && var.create_operator == true ? 1 : 0
+  count = var.create_bastion_host == true && var.bastion_state == "RUNNING" && var.create_operator == true && var.operator_state == "RUNNING" ? 1 : 0
 }

modules/extensions/kubeconfig.tf

@@ -5,23 +5,8 @@ data "oci_containerengine_cluster_kube_config" "kube_config" {
   cluster_id = var.cluster_id
 }
 
-resource "null_resource" "create_local_kubeconfig" {
-  provisioner "local-exec" {
-    command = "rm -rf generated"
-  }
-
-  provisioner "local-exec" {
-    command = "mkdir generated"
-  }
-
-  provisioner "local-exec" {
-    command = "touch generated/kubeconfig"
-  }
-}
-
 resource "local_file" "kube_config_file" {
   content         = data.oci_containerengine_cluster_kube_config.kube_config.content
-  depends_on      = [null_resource.create_local_kubeconfig]
   filename        = "${path.root}/generated/kubeconfig"
   file_permission = "0600"
 }
@@ -39,7 +24,7 @@ resource "null_resource" "write_kubeconfig_on_operator" {
     bastion_private_key = local.ssh_private_key
   }
 
-  depends_on = [null_resource.install_kubectl_on_operator]
+  depends_on = [null_resource.install_k8stools_on_operator]
 
   provisioner "file" {
     content     = local.generate_kubeconfig_template

modules/extensions/metricserver.tf

@@ -14,7 +14,7 @@ resource "null_resource" "enable_metric_server" {
     bastion_private_key = local.ssh_private_key
   }
 
-  depends_on = [null_resource.install_kubectl_on_operator, null_resource.write_kubeconfig_on_operator]
+  depends_on = [null_resource.install_k8stools_on_operator, null_resource.write_kubeconfig_on_operator]
 
   provisioner "file" {
     content     = local.metric_server_template

modules/extensions/serviceaccount.tf

@@ -14,7 +14,7 @@ resource "null_resource" "create_service_account" {
     bastion_private_key = local.ssh_private_key
   }
 
-  depends_on = [null_resource.install_kubectl_on_operator, null_resource.write_kubeconfig_on_operator]
+  depends_on = [null_resource.install_k8stools_on_operator, null_resource.write_kubeconfig_on_operator]
 
   provisioner "file" {
     content     = local.create_service_account_template