feat: added kubectx and kubens (#548)

hyder · web-flow · commit 14ac65265f4f · 2022-08-02T22:09:54.000+10:00
* feat: added kubectx and kubens Signed-off-by: Ali Mukadam <ali.mukadam@oracle.com> * fix: added some of the changes suggested by @Djelibeybi Signed-off-by: Ali Mukadam <ali.mukadam@oracle.com> * fix: use bash instead of setting scripts to executable as recommended by @Djelibeybi Signed-off-by: Ali Mukadam <ali.mukadam@oracle.com> * fix: added checks for file existence Signed-off-by: Ali Mukadam <ali.mukadam@oracle.com> * fix: updated bash commands for extensions module Signed-off-by: Ali Mukadam <ali.mukadam@oracle.com>
diff --git a/modules/extensions/activeworker.tf b/modules/extensions/activeworker.tf
@@ -27,9 +27,7 @@ resource "null_resource" "check_worker_active" {
 
   provisioner "remote-exec" {
     inline = [
-      "chmod +x $HOME/check_active_worker.sh",
-      "$HOME/check_active_worker.sh"
-      //"rm -f $HOME/check_active_worker.sh"
+      "if [ -f \"$HOME/check_active_worker.sh\" ]; then bash \"$HOME/check_active_worker.sh\"; rm -f \"$HOME/check_active_worker.sh\";fi",
     ]
   }
 
diff --git a/modules/extensions/calico.tf b/modules/extensions/calico.tf
@@ -23,9 +23,7 @@ resource "null_resource" "install_calico" {
 
   provisioner "remote-exec" {
     inline = [
-      "chmod +x $HOME/install_calico.sh",
-      "$HOME/install_calico.sh",
-      "rm -f $HOME/install_calico.sh"
+      "if [ -f \"$HOME/install_calico.sh\" ]; then bash \"$HOME/install_calico.sh\"; rm -f \"$HOME/install_calico.sh\";fi",
     ]
   }
 
diff --git a/modules/extensions/drain.tf b/modules/extensions/drain.tf
@@ -26,11 +26,9 @@ resource "null_resource" "drain_nodes" {
 
   provisioner "remote-exec" {
     inline = [
-      "python3 drainlist.py",
-      "chmod +x $HOME/drain.sh",
-      "$HOME/drain.sh",
-      "cat drainlist.txt >> drained.txt",
-      "rm -f drainlist.txt"
+      "if [ -f \"$HOME/drainlist.py\" ]; then python3 \"$HOME/drainlist.py\"; rm -f \"$HOME/drainlist.py\";fi",
+      "if [ -f \"$HOME/drain.sh\" ]; then bash \"$HOME/drain.sh\"; rm -f \"$HOME/drain.sh\";fi",
+      "if [ -f \"$HOME/drainlist.txt\" ]; then cat \"$HOME/drainlist.txt\" >> \"$HOME/drained.txt\"; rm -f \"$HOME/drainlist.txt\";fi",
     ]
   }
 
diff --git a/modules/extensions/gatekeeper.tf b/modules/extensions/gatekeeper.tf
@@ -23,9 +23,7 @@ resource "null_resource" "enable_gatekeeper" {
 
   provisioner "remote-exec" {
     inline = [
-      "chmod +x $HOME/enable_gatekeeper.sh",
-      "$HOME/enable_gatekeeper.sh",
-      "rm -f $HOME/enable_gatekeeper.sh"
+      "if [ -f \"$HOME/enable_gatekeeper.sh\" ]; then bash \"$HOME/enable_gatekeeper.sh\"; rm -f \"$HOME/enable_gatekeeper.sh\";fi",
     ]
   }
 
diff --git a/modules/extensions/iam.tf b/modules/extensions/iam.tf
@@ -57,9 +57,7 @@ resource "null_resource" "update_dynamic_group" {
 
   provisioner "remote-exec" {
     inline = [
-      "chmod +x $HOME/update_dynamic_group.sh",
-      "$HOME/update_dynamic_group.sh",
-      "rm -f $HOME/update_dynamic_group.sh"
+      "if [ -f \"$HOME/update_dynamic_group.sh\" ]; then bash $HOME/update_dynamic_group.sh; rm -f \"$HOME/update_dynamic_group.sh\";fi",
     ]
   }
 
diff --git a/modules/extensions/k8stools.tf b/modules/extensions/k8stools.tf
@@ -23,14 +23,17 @@ resource "null_resource" "install_k8stools_on_operator" {
     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 = [
-      "chmod +x $HOME/install_kubectl.sh",
-      "$HOME/install_kubectl.sh",
-      "rm -f $HOME/install_kubectl.sh",
-      "chmod +x $HOME/install_helm.sh",
-      "$HOME/install_helm.sh",
-      "rm -f $HOME/install_helm.sh"
+      "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",
     ]
   }
 
diff --git a/modules/extensions/kubeconfig.tf b/modules/extensions/kubeconfig.tf
@@ -43,15 +43,11 @@ resource "null_resource" "write_kubeconfig_on_operator" {
 
   provisioner "remote-exec" {
     inline = [
-      "chmod +x $HOME/generate_kubeconfig.sh",
-      "$HOME/generate_kubeconfig.sh",
+      "if [ -f \"$HOME/generate_kubeconfig.sh\" ]; then bash \"$HOME/generate_kubeconfig.sh\"; rm -f \"$HOME/generate_kubeconfig.sh\";fi",
       "mkdir $HOME/bin",
       "chmod +x $HOME/token_helper.sh",
       "mv $HOME/token_helper.sh $HOME/bin",
-      "chmod +x $HOME/kubeconfig_set_credentials.sh",
-      "$HOME/kubeconfig_set_credentials.sh",
-      "rm -f $HOME/generate_kubeconfig.sh",
-      "rm -f $HOME/kubeconfig_set_credentials.sh"
+      "if [ -f \"$HOME/kubeconfig_set_credentials.sh\" ]; then bash \"$HOME/kubeconfig_set_credentials.sh\"; rm -f \"$HOME/kubeconfig_set_credentials.sh\";fi",
     ]
   }
 
diff --git a/modules/extensions/metricserver.tf b/modules/extensions/metricserver.tf
@@ -23,9 +23,7 @@ resource "null_resource" "enable_metric_server" {
 
   provisioner "remote-exec" {
     inline = [
-      "chmod +x $HOME/enable_metric_server.sh",
-      "$HOME/enable_metric_server.sh",
-      "rm -f $HOME/enable_metric_server.sh"
+      "if [ -f \"$HOME/enable_metric_server.sh\" ]; then bash \"$HOME/enable_metric_server.sh\"; rm -f \"$HOME/enable_metric_server.sh\";fi",
     ]
   }
 
diff --git a/modules/extensions/scripts/drainlist.py b/modules/extensions/scripts/drainlist.py
@@ -14,8 +14,6 @@
 
 signer = oci.auth.signers.InstancePrincipalsSecurityTokenSigner()
 
-identity_client = oci.identity.IdentityClient(config={}, signer=signer)
-
 oce = oci.container_engine.ContainerEngineClient(config={'region': region}, signer=signer)
 
 # Get list of node pools
diff --git a/modules/extensions/scripts/install_helm.template.sh b/modules/extensions/scripts/install_helm.template.sh
@@ -3,10 +3,13 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 if [ ! -f .helm_completed ]; then
-  sudo yum install -y helm
+  if [ ${ol} = 8 ]; then
+    sudo dnf -q install -y helm
+  else
+    sudo yum -q install -y helm
 
-  echo "source <(helm completion bash)" >> ~/.bashrc
-  echo "alias h='helm'" >> ~/.bashrc
-  echo "helm completed"
+    echo "source <(helm completion bash)" >> ~/.bashrc
+    echo "alias h='helm'" >> ~/.bashrc
+    echo "helm completed"
   touch .helm_completed
 fi
diff --git a/modules/extensions/scripts/install_kubectl.template.sh b/modules/extensions/scripts/install_kubectl.template.sh
@@ -8,17 +8,17 @@ if [ ! -f .kubectl_completed ]; then
   done
 
   if [ ${ol} = 8 ]; then
-    sudo dnf install -y oracle-olcne-release-el8
+    sudo dnf -q install -y oracle-olcne-release-el8
 
-    sudo dnf config-manager --enable ol8_olcne14
+    sudo dnf -q config-manager --enable ol8_olcne15
 
-    sudo dnf install -y kubectl git
+    sudo dnf -q install -y kubectl git
   else 
-    sudo yum install -y oracle-olcne-release-el7 > /dev/null 2>&1
+    sudo yum -q install -y oracle-olcne-release-el7
 
-    sudo yum-config-manager --enable ol7_olcne14 > /dev/null 2>&1
+    sudo yum-config-manager --enable ol7_olcne15
 
-    sudo yum install -y kubectl git > /dev/null 2>&1
+    sudo yum -q install -y kubectl git
   fi
 
   mkdir ~/.kube
diff --git a/modules/extensions/scripts/install_kubectx.template.sh b/modules/extensions/scripts/install_kubectx.template.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# Copyright 2022 Oracle Corporation and/or affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
+
+curl -sSfL https://github.com/ahmetb/kubectx/releases/download/v${version}/kubectx_v${version}_linux_$(uname -m).tar.gz | sudo tar zxvf - -C /usr/local --xform='s|^|kubectx/|S'
+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 
+
+echo "alias ktx='kubectx'" >> $HOME/.bashrc
+echo "alias kns='kubens'" >> $HOME/.bashrc
diff --git a/modules/extensions/scripts/secret.template.sh b/modules/extensions/scripts/secret.template.sh
diff --git a/modules/extensions/secrets.tf b/modules/extensions/secrets.tf
@@ -26,10 +26,8 @@ resource "null_resource" "secret" {
 
   provisioner "remote-exec" {
     inline = [
-      "chmod +x $HOME/secret.sh",
-      "$HOME/secret.sh",
+      "if [ -f \"$HOME/secret.sh\" ]; then bash \"$HOME/secret.sh\"; rm -f \"$HOME/secret.sh\";fi",
       "sleep 10",
-      "rm -f $HOME/secret.sh"
     ]
   }
 
diff --git a/modules/extensions/serviceaccount.tf b/modules/extensions/serviceaccount.tf
@@ -23,9 +23,7 @@ resource "null_resource" "create_service_account" {
 
   provisioner "remote-exec" {
     inline = [
-      "chmod +x $HOME/create_service_account.sh",
-      "$HOME/create_service_account.sh",
-      "rm -f $HOME/create_service_account.sh"
+      "if [ -f \"$HOME/create_service_account.sh\" ]; then bash \"$HOME/create_service_account.sh\"; rm -f \"$HOME/create_service_account.sh\";fi",
     ]
   }
 
diff --git a/modules/extensions/templates.tf b/modules/extensions/templates.tf
@@ -46,14 +46,22 @@ locals {
     }
   )
 
-  install_helm_template = templatefile("${path.module}/scripts/install_helm.template.sh", {})
+  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"
+  })
+
   metric_server_template = templatefile("${path.module}/scripts/install_metricserver.template.sh",
     {
       enable_vpa  = var.enable_vpa
@@ -68,7 +76,7 @@ locals {
     }
   )
 
-  secret_template = templatefile("${path.module}/scripts/secret.sh",
+  secret_template = templatefile("${path.module}/scripts/secret.template.sh",
     {
       compartment_id = var.compartment_id
       region         = var.region
diff --git a/modules/oke/cluster.tf b/modules/oke/cluster.tf
@@ -65,5 +65,4 @@ resource "oci_containerengine_cluster" "k8s_cluster" {
 
   vcn_id = var.vcn_id
 
-
 }

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,7 @@ resource "null_resource" "check_worker_active" {`
`27`	`27`
`28`	`28`	`provisioner "remote-exec" {`
`29`	`29`	`inline = [`
`30`		`- "chmod +x $HOME/check_active_worker.sh",`
`31`		`- "$HOME/check_active_worker.sh"`
`32`		`- //"rm -f $HOME/check_active_worker.sh"`
	`30`	`+ "if [ -f \"$HOME/check_active_worker.sh\" ]; then bash \"$HOME/check_active_worker.sh\"; rm -f \"$HOME/check_active_worker.sh\";fi",`
`33`	`31`	`]`
`34`	`32`	`}`
`35`	`33`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,7 @@ resource "null_resource" "install_calico" {`
`23`	`23`
`24`	`24`	`provisioner "remote-exec" {`
`25`	`25`	`inline = [`
`26`		`- "chmod +x $HOME/install_calico.sh",`
`27`		`- "$HOME/install_calico.sh",`
`28`		`- "rm -f $HOME/install_calico.sh"`
	`26`	`+ "if [ -f \"$HOME/install_calico.sh\" ]; then bash \"$HOME/install_calico.sh\"; rm -f \"$HOME/install_calico.sh\";fi",`
`29`	`27`	`]`
`30`	`28`	`}`
`31`	`29`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,9 @@ resource "null_resource" "drain_nodes" {`
`26`	`26`
`27`	`27`	`provisioner "remote-exec" {`
`28`	`28`	`inline = [`
`29`		`- "python3 drainlist.py",`
`30`		`- "chmod +x $HOME/drain.sh",`
`31`		`- "$HOME/drain.sh",`
`32`		`- "cat drainlist.txt >> drained.txt",`
`33`		`- "rm -f drainlist.txt"`
	`29`	`+ "if [ -f \"$HOME/drainlist.py\" ]; then python3 \"$HOME/drainlist.py\"; rm -f \"$HOME/drainlist.py\";fi",`
	`30`	`+ "if [ -f \"$HOME/drain.sh\" ]; then bash \"$HOME/drain.sh\"; rm -f \"$HOME/drain.sh\";fi",`
	`31`	`+ "if [ -f \"$HOME/drainlist.txt\" ]; then cat \"$HOME/drainlist.txt\" >> \"$HOME/drained.txt\"; rm -f \"$HOME/drainlist.txt\";fi",`
`34`	`32`	`]`
`35`	`33`	`}`
`36`	`34`
Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,7 @@ resource "null_resource" "update_dynamic_group" {`
`57`	`57`
`58`	`58`	`provisioner "remote-exec" {`
`59`	`59`	`inline = [`
`60`		`- "chmod +x $HOME/update_dynamic_group.sh",`
`61`		`- "$HOME/update_dynamic_group.sh",`
`62`		`- "rm -f $HOME/update_dynamic_group.sh"`
	`60`	`+ "if [ -f \"$HOME/update_dynamic_group.sh\" ]; then bash $HOME/update_dynamic_group.sh; rm -f \"$HOME/update_dynamic_group.sh\";fi",`
`63`	`61`	`]`
`64`	`62`	`}`
`65`	`63`