Merge branch 'master' into hotfix-code-tidy

Author: mark-au

locals.tf

@@ -110,7 +110,7 @@ locals {
     nsg_ids      = module.network.nsg_ids
     subnet_id    = lookup(module.network.subnet_ids, "masters")
     subnet_label = module.network.master_subnet_dns_label
-    subnet_mask  = cidrnetmask(cidrsubnet(var.vcn_cidr, var.newbits["master"], var.netnum["master"]))
+    subnet_mask  = cidrnetmask(cidrsubnet(var.vcn_cidr, var.newbits["masters"], var.netnum["masters"]))
   }
 
   # operator module parameters

modules/loadbalancer/loadbalancer.tf

@@ -41,5 +41,5 @@ resource "oci_load_balancer_listener" "https_listener" {
   name                     = "https"
   default_backend_set_name = oci_load_balancer_backend_set.ingress_controller[1].name
   port                     = 443
-  protocol                 = "HTTP"
+  protocol                 = "TCP"
 }

modules/network/locals.tf

@@ -5,7 +5,7 @@ locals {
   # subnet cidrs - used by subnets
   bastion_subnet  = cidrsubnet(var.olcne_network_vcn.vcn_cidr, var.olcne_network_vcn.newbits["bastion"], var.olcne_network_vcn.netnum["bastion"])
   int_lb_subnet   = cidrsubnet(var.olcne_network_vcn.vcn_cidr, var.olcne_network_vcn.newbits["lb"], var.olcne_network_vcn.netnum["int_lb"])
-  master_subnet   = cidrsubnet(var.olcne_network_vcn.vcn_cidr, var.olcne_network_vcn.newbits["master"], var.olcne_network_vcn.netnum["master"])
+  master_subnet   = cidrsubnet(var.olcne_network_vcn.vcn_cidr, var.olcne_network_vcn.newbits["masters"], var.olcne_network_vcn.netnum["masters"])
   operator_subnet = cidrsubnet(var.olcne_network_vcn.vcn_cidr, var.olcne_network_vcn.newbits["operator"], var.olcne_network_vcn.netnum["operator"])
   pub_lb_subnet   = cidrsubnet(var.olcne_network_vcn.vcn_cidr, var.olcne_network_vcn.newbits["lb"], var.olcne_network_vcn.netnum["pub_lb"])
   worker_subnet   = cidrsubnet(var.olcne_network_vcn.vcn_cidr, var.olcne_network_vcn.newbits["workers"], var.olcne_network_vcn.netnum["workers"])

modules/operator/scripts/install_helm.template.sh

@@ -4,16 +4,7 @@
 
 echo 'Installing Helm'
 
-wget https://get.helm.sh/helm-v"${helm_version}"-linux-amd64.tar.gz 2> /dev/null
-
-
-tar zxvf helm-v"${helm_version}"-linux-amd64.tar.gz 2> /dev/null
-
-sudo mv linux-amd64/helm /usr/local/bin 2> /dev/null
-
-rm -f helm-v"${helm_version}"-linux-amd64.tar.gz 2> /dev/null
-
-rm -rf linux-amd64 2> /dev/null
+sudo yum install -y helm-${helm_version} 2> /dev/null
 
 helm repo add stable https://kubernetes-charts.storage.googleapis.com 2> /dev/null