feat: upgraded operator module to 3.1.4 (#598)

* feat: upgraded operator module to 3.1.4

kubectl and helm are now installed with operator's cloud-init.
Also renamed context to cluster_name.

Signed-off-by: Ali Mukadam <[email protected]>

* fix: removed superfluous templates

Signed-off-by: Ali Mukadam <[email protected]>

Signed-off-by: Ali Mukadam <[email protected]>

Author: hyder

main.tf

@@ -108,7 +108,7 @@ module "bastion" {
 
 module "operator" {
   source  = "oracle-terraform-modules/operator/oci"
-  version = "3.1.3"
+  version = "3.1.4"
 
 
   # general oci parameters
@@ -279,7 +279,7 @@ module "oke" {
   preferred_load_balancer = var.preferred_load_balancer
 
   # nsgs
-  pod_nsgs = concat(module.network.pod_nsg_id)
+  pod_nsgs    = concat(module.network.pod_nsg_id)
   worker_nsgs = concat(var.worker_nsgs, [module.network.worker_nsg_id])
 
   # tags
@@ -361,6 +361,7 @@ module "extensions" {
 
   # oke cluster parameters
   cluster_id                   = module.oke.cluster_id
+  cluster_name                 = var.cluster_name
   pods_cidr                    = var.pods_cidr
   use_cluster_encryption       = var.use_cluster_encryption
   cluster_kms_key_id           = var.cluster_kms_key_id

modules/extensions/k8stools.tf

@@ -14,25 +14,13 @@ resource "null_resource" "install_k8stools_on_operator" {
     bastion_private_key = local.ssh_private_key
   }
 
-  provisioner "file" {
-    content     = local.install_kubectl_template
-    destination = "/home/opc/install_kubectl.sh"
-  }
-
-  provisioner "file" {
-    content     = local.install_helm_template
-    destination = "/home/opc/install_helm.sh"
-  }
-
   provisioner "file" {
     content     = local.install_kubectx_template
     destination = "/home/opc/install_kubectx.sh"
   }
 
   provisioner "remote-exec" {
     inline = [
-      "if [ -f \"$HOME/install_kubectl.sh\" ]; then bash \"$HOME/install_kubectl.sh\"; rm -f \"$HOME/install_kubectl.sh\";fi",
-      "if [ -f \"$HOME/install_helm.sh\" ]; then bash \"$HOME/install_helm.sh\"; rm -f \"$HOME/install_helm.sh\";fi",
       "if [ -f \"$HOME/install_kubectx.sh\" ]; then bash \"$HOME/install_kubectx.sh\"; rm -f \"$HOME/install_kubectx.sh\";fi",
     ]
   }

modules/extensions/scripts/install_helm.template.sh

@@ -6,7 +6,13 @@ curl -sSfL https://github.com/ahmetb/kubectx/releases/download/v${version}/kubec
 curl -sSfL https://github.com/ahmetb/kubectx/releases/download/v${version}/kubens_v${version}_linux_$(uname -m).tar.gz | sudo tar zxvf - -C /usr/local --xform='s|^|kubens/|S'
 
 sudo ln -s /usr/local/kubectx/kubectx /usr/bin/kubectx 
-sudo ln -s /usr/local/kubens/kubens /usr/bin/kubens 
+sudo ln -s /usr/local/kubens/kubens /usr/bin/kubens
+
+echo "source <(kubectl completion bash)" >> ~/.bashrc
+echo "alias k='kubectl'" >> $HOME/.bashrc
+
+echo "source <(helm completion bash)" >> ~/.bashrc
+echo "alias h='helm'" >> ~/.bashrc
 
 echo "alias ktx='kubectx'" >> $HOME/.bashrc
 echo "alias kns='kubens'" >> $HOME/.bashrc

modules/extensions/scripts/install_kubectl.template.sh

@@ -9,4 +9,6 @@ kubectl config set-credentials "user-${cluster-id-11}" --exec-command="$HOME/bin
   --exec-arg="--cluster-id" \
   --exec-arg="${cluster-id}" \
   --exec-arg="--region" \
-  --exec-arg="${region}"
+  --exec-arg="${region}"
+
+kubectx ${cluster_name}=$(kubectl config current-context)

modules/extensions/scripts/install_kubectx.template.sh

@@ -46,20 +46,8 @@ locals {
     }
   )
 
-  install_helm_template = templatefile("${path.module}/scripts/install_helm.template.sh",
-    {
-      ol = var.operator_os_version
-    }
-  )
-
-  install_kubectl_template = templatefile("${path.module}/scripts/install_kubectl.template.sh",
-    {
-      ol = var.operator_os_version
-    }
-  )
-
   install_kubectx_template = templatefile("${path.module}/scripts/install_kubectx.template.sh", {
-    version = "0.9.4"
+    version      = "0.9.4"
   })
 
   metric_server_template = templatefile("${path.module}/scripts/install_metricserver.template.sh",
@@ -95,6 +83,7 @@ locals {
     {
       cluster-id    = var.cluster_id
       cluster-id-11 = substr(var.cluster_id, (length(var.cluster_id) - 11), length(var.cluster_id))
+      cluster_name  = var.cluster_name
       region        = var.region
     }
   )

modules/extensions/scripts/kubeconfig_set_credentials.template.sh

@@ -55,6 +55,8 @@ variable "operator_os_version" {}
 # oke
 variable "cluster_id" {}
 
+variable "cluster_name" {}
+
 variable "pods_cidr" {}
 
 # encryption