Merge pull request #44 from Prajyot-Parab/main

Mark apikey vars sensitive and fix formatting

Author: k8s-ci-robot

kubetest2-tf/data/config.tf

@@ -4,7 +4,7 @@ variable "cluster_name" {
 
 variable "release_marker" {
   description = "Kubernetes release marker"
-  default = "ci/latest"
+  default     = "ci/latest"
 }
 
 variable "build_version" {
@@ -13,7 +13,7 @@ variable "build_version" {
 
 variable "ssh_private_key" {
   description = "SSH Private Key file's complete path"
-  default = "~/.ssh/id_rsa"
+  default     = "~/.ssh/id_rsa"
 }
 
 variable "kubeconfig_path" {
@@ -22,10 +22,10 @@ variable "kubeconfig_path" {
 
 variable "workers_count" {
   description = "Number of workers in the cluster"
-  default = 1
+  default     = 1
 }
 
 variable "bootstrap_token" {
   description = "Kubeadm bootstrap token used for installing and joining the cluster"
-  default = "abcdef.0123456789abcdef"
+  default     = "abcdef.0123456789abcdef"
 }

kubetest2-tf/data/powervs/instance/main.tf

@@ -1,34 +1,34 @@
 data "ibm_pi_network" "power_network" {
-    pi_network_name      = var.network
-    pi_cloud_instance_id = var.powervs_service_instance_id
+  pi_network_name      = var.network
+  pi_cloud_instance_id = var.powervs_service_instance_id
 }
 
 data "ibm_pi_image" "power_images" {
-    pi_image_name        = var.image_name
-    pi_cloud_instance_id = var.powervs_service_instance_id
+  pi_image_name        = var.image_name
+  pi_cloud_instance_id = var.powervs_service_instance_id
 }
 
 resource "ibm_pi_instance" "pvminstance" {
-    count = var.instance_count
-    pi_memory             = var.memory
-    pi_processors         = var.processors
-    pi_instance_name      = var.instance_count == 1 ? var.vm_name : "${var.vm_name}-${count.index}"
-    pi_proc_type          = var.proc_type
-    pi_image_id           = data.ibm_pi_image.power_images.id
-    pi_key_pair_name      = var.ssh_key_name
-    pi_sys_type           = var.system_type
-    pi_storage_type       = var.storage_tier
-    pi_cloud_instance_id = var.powervs_service_instance_id
-    pi_user_data          = var.user_data
-    # Wait for the WARNING state instead of OK state to save some time because we aren't performing any DLPAR operations
-    # on this LPARS and later in the flow we also have ssh connectivity check to confirm deployed vms are up and running.
-    pi_health_status      = "WARNING"
+  count                = var.instance_count
+  pi_memory            = var.memory
+  pi_processors        = var.processors
+  pi_instance_name     = var.instance_count == 1 ? var.vm_name : "${var.vm_name}-${count.index}"
+  pi_proc_type         = var.proc_type
+  pi_image_id          = data.ibm_pi_image.power_images.id
+  pi_key_pair_name     = var.ssh_key_name
+  pi_sys_type          = var.system_type
+  pi_storage_type      = var.storage_tier
+  pi_cloud_instance_id = var.powervs_service_instance_id
+  pi_user_data         = var.user_data
+  # Wait for the WARNING state instead of OK state to save some time because we aren't performing any DLPAR operations
+  # on this LPARS and later in the flow we also have ssh connectivity check to confirm deployed vms are up and running.
+  pi_health_status = "WARNING"
 
-    pi_network {
-      network_id = data.ibm_pi_network.power_network.id
-    }
-    timeouts {
-      create = "30m"
-      delete = "30m"
-    }
+  pi_network {
+    network_id = data.ibm_pi_network.power_network.id
+  }
+  timeouts {
+    create = "30m"
+    delete = "30m"
+  }
 }

kubetest2-tf/data/powervs/instance/outputs.tf

@@ -1,3 +1,3 @@
 output "addresses" {
-    value = ibm_pi_instance.pvminstance.*.pi_network
+  value = ibm_pi_instance.pvminstance.*.pi_network
 }

kubetest2-tf/data/powervs/instance/provider.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     ibm = {
-      source = "IBM-Cloud/ibm"
+      source  = "IBM-Cloud/ibm"
       version = ">= 1.12.0"
     }
   }

kubetest2-tf/data/powervs/instance/variables.tf

@@ -1,84 +1,85 @@
 
 variable "ibmcloud_api_key" {
-    description = "Denotes the IBM Cloud API key to use"
+  description = "Denotes the IBM Cloud API key to use"
+  sensitive   = true
 }
 
 variable "ibmcloud_region" {
-    description = "Denotes which IBM Cloud region to connect to"
+  description = "Denotes which IBM Cloud region to connect to"
 }
 
 variable "ibmcloud_zone" {
-    description = "Denotes which IBM Cloud zone to connect to - .i.e: eu-de-1 eu-de-2  us-south etc."
+  description = "Denotes which IBM Cloud zone to connect to - .i.e: eu-de-1 eu-de-2  us-south etc."
 }
 
 variable "vm_name" {
-    description = "Name of the VM"
+  description = "Name of the VM"
 }
 
 variable "powervs_service_instance_id" {
-    description = "Power Virtual Server service instance ID"
+  description = "Power Virtual Server service instance ID"
 }
 
 variable "memory" {
-    description = "Amount of memory (GB) to be allocated to the VM"
+  description = "Amount of memory (GB) to be allocated to the VM"
 }
 
 variable "processors" {
-    description = "Number of virtual processors to allocate to the VM"
+  description = "Number of virtual processors to allocate to the VM"
 }
 
 variable "proc_type" {
-    description = "Processor type for the LPAR - shared/dedicated"
-    default     = "shared"
+  description = "Processor type for the LPAR - shared/dedicated"
+  default     = "shared"
 }
 
 variable "ssh_key_name" {
-    description = "SSH key name in IBM Cloud to be used for SSH logins"
+  description = "SSH key name in IBM Cloud to be used for SSH logins"
 }
 
 variable "shareable" {
-    description = "Should the data volume be shared or not - true/false"
-    default     = "false"
+  description = "Should the data volume be shared or not - true/false"
+  default     = "false"
 }
 
 variable "network" {
-    description = "Network that should be attached to the VM - Create this network before running terraform"
+  description = "Network that should be attached to the VM - Create this network before running terraform"
 }
 
 variable "system_type" {
-    description = "Type of system on which the VM should be created - s922/e980"
-    default     = "s922"
+  description = "Type of system on which the VM should be created - s922/e980"
+  default     = "s922"
 }
 
 variable "storage_tier" {
-    description = "I/O operation per second (IOPS) based storage on requirement - tier0, tier1, tier3 or tier5k"
+  description = "I/O operation per second (IOPS) based storage on requirement - tier0, tier1, tier3 or tier5k"
 }
 
 variable "image_name" {
-    description = "Name of the image from which the VM should be deployed - IBM i image name"
+  description = "Name of the image from which the VM should be deployed - IBM i image name"
 }
 
 variable "replication_policy" {
-    description = "Replication policy of the VM"
-    default     = "none"
+  description = "Replication policy of the VM"
+  default     = "none"
 }
 
 variable "replication_scheme" {
-    description = "Replication scheme for the VM"
-    default     = "suffix"
+  description = "Replication scheme for the VM"
+  default     = "suffix"
 }
 
 variable "replicants" {
-    description = "Number of VM instances to deploy"
-    default     = "1"
+  description = "Number of VM instances to deploy"
+  default     = "1"
 }
 
 variable "user_data" {
-    description = "User data in base64 encoded format"
-    default = ""
+  description = "User data in base64 encoded format"
+  default     = ""
 }
 
 variable "instance_count" {
-    description = "Number of instances"
-    default = 1
-}
+  description = "Number of instances"
+  default     = 1
+}

kubetest2-tf/data/powervs/main.tf

@@ -5,55 +5,55 @@ data "ibm_pi_network" "existing_net" {
 }
 
 resource "ibm_pi_network" "public_network" {
-  count                   = var.powervs_network_name == "" ? 1 : 0
-  pi_network_name           = "${var.cluster_name}-pub-net"
-  pi_cloud_instance_id      = var.powervs_service_id
-  pi_network_type           = "pub-vlan"
-  pi_dns = [ "8.8.4.4", "8.8.8.8"]
+  count                = var.powervs_network_name == "" ? 1 : 0
+  pi_network_name      = "${var.cluster_name}-pub-net"
+  pi_cloud_instance_id = var.powervs_service_id
+  pi_network_type      = "pub-vlan"
+  pi_dns               = ["8.8.4.4", "8.8.8.8"]
 }
 
 module "master" {
   source = "./instance"
 
-  ibmcloud_api_key = var.powervs_api_key
-  image_name = var.powervs_image_name
-  memory = var.controlplane_powervs_memory
-  network = var.powervs_network_name == "" ? ibm_pi_network.public_network[0].network_id : data.ibm_pi_network.existing_net[0].id
+  ibmcloud_api_key            = var.powervs_api_key
+  image_name                  = var.powervs_image_name
+  memory                      = var.controlplane_powervs_memory
+  network                     = var.powervs_network_name == "" ? ibm_pi_network.public_network[0].network_id : data.ibm_pi_network.existing_net[0].id
   powervs_service_instance_id = var.powervs_service_id
-  processors = var.controlplane_powervs_processors
-  ssh_key_name = var.powervs_ssh_key
-  system_type = var.powervs_system_type
-  storage_tier = var.powervs_storage_tier
-  vm_name = "${var.cluster_name}-master"
-  ibmcloud_region = var.powervs_region
-  ibmcloud_zone = var.powervs_zone
+  processors                  = var.controlplane_powervs_processors
+  ssh_key_name                = var.powervs_ssh_key
+  system_type                 = var.powervs_system_type
+  storage_tier                = var.powervs_storage_tier
+  vm_name                     = "${var.cluster_name}-master"
+  ibmcloud_region             = var.powervs_region
+  ibmcloud_zone               = var.powervs_zone
 }
 
 module "workers" {
-  source = "./instance"
+  source         = "./instance"
   instance_count = var.workers_count
 
-  ibmcloud_api_key = var.powervs_api_key
-  image_name = var.powervs_image_name
-  memory = var.powervs_memory
-  network = var.powervs_network_name == "" ? ibm_pi_network.public_network[0].network_id : data.ibm_pi_network.existing_net[0].id
+  ibmcloud_api_key            = var.powervs_api_key
+  image_name                  = var.powervs_image_name
+  memory                      = var.powervs_memory
+  network                     = var.powervs_network_name == "" ? ibm_pi_network.public_network[0].network_id : data.ibm_pi_network.existing_net[0].id
   powervs_service_instance_id = var.powervs_service_id
-  processors = var.powervs_processors
-  ssh_key_name = var.powervs_ssh_key
-  system_type = var.powervs_system_type
-  storage_tier = var.powervs_storage_tier
-  vm_name = "${var.cluster_name}-worker"
-  ibmcloud_region = var.powervs_region
-  ibmcloud_zone = var.powervs_zone
+  processors                  = var.powervs_processors
+  ssh_key_name                = var.powervs_ssh_key
+  system_type                 = var.powervs_system_type
+  storage_tier                = var.powervs_storage_tier
+  vm_name                     = "${var.cluster_name}-worker"
+  ibmcloud_region             = var.powervs_region
+  ibmcloud_zone               = var.powervs_zone
 }
 
 resource "null_resource" "wait-for-master-completes" {
   connection {
-    type = "ssh"
-    user = "root"
-    host = module.master.addresses[0][0].external_ip
+    type        = "ssh"
+    user        = "root"
+    host        = module.master.addresses[0][0].external_ip
     private_key = file(var.ssh_private_key)
-    timeout = "20m"
+    timeout     = "20m"
   }
   provisioner "remote-exec" {
     inline = [
@@ -65,11 +65,11 @@ resource "null_resource" "wait-for-master-completes" {
 resource "null_resource" "wait-for-workers-completes" {
   count = var.workers_count
   connection {
-    type = "ssh"
-    user = "root"
-    host = module.workers.addresses[count.index][0].external_ip
+    type        = "ssh"
+    user        = "root"
+    host        = module.workers.addresses[count.index][0].external_ip
     private_key = file(var.ssh_private_key)
-    timeout = "15m"
+    timeout     = "15m"
   }
   provisioner "remote-exec" {
     inline = [

kubetest2-tf/data/powervs/output.tf

@@ -1,24 +1,24 @@
 output "masters" {
-  value = module.master.addresses[*][0].external_ip
+  value       = module.master.addresses[*][0].external_ip
   description = "k8s master node IP addresses"
 }
 
 output "workers" {
-  value = module.workers.addresses[*][0].external_ip
+  value       = module.workers.addresses[*][0].external_ip
   description = "k8s worker node IP addresses"
 }
 
 output "masters_private" {
-  value = module.master.addresses[*][0].ip_address
+  value       = module.master.addresses[*][0].ip_address
   description = "k8s master nodes private IP addresses"
 }
 
 output "workers_private" {
-  value = module.workers.addresses[*][0].ip_address
+  value       = module.workers.addresses[*][0].ip_address
   description = "k8s worker nodes private IP addresses"
 }
 
 output "network" {
-  value = ibm_pi_network.public_network
+  value       = ibm_pi_network.public_network
   description = "Network used for the deployment"
 }

kubetest2-tf/data/powervs/provider.tf

@@ -1,14 +1,14 @@
 terraform {
   required_providers {
     ibm = {
-      source = "IBM-Cloud/ibm"
+      source  = "IBM-Cloud/ibm"
       version = ">= 1.12.0"
     }
   }
 }
 
 provider "ibm" {
   ibmcloud_api_key = var.powervs_api_key
-  region = var.powervs_region
-  zone = var.powervs_zone
+  region           = var.powervs_region
+  zone             = var.powervs_zone
 }