Changes for linux vm

source changes to . ./
2.  if [[ ]]  changed to if [].
3. Chart updates

Author: ssahadevan-mendix

.gitignore

@@ -11,3 +11,4 @@ configure.yaml
 configure-temp.yaml
 tout.txt
 terraform.tfstate.backup
+do-diff.sh

Readme.md

@@ -18,20 +18,13 @@
     Terraform is installed
     kubectl
     helm
-    helm repo add stable https://charts.helm.sh/stable
-    helm repo add nginx-stable https://helm.nginx.com/stable
-    helm repo add grafana https://grafana.github.io/helm-charts
-    helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
-    helm repo update
 
 ## Update env.sh
     update env.sh
     update terraform.tfvars
 
 ## To Execute
 
-     update env.sh
-
      terraform init
      terraform plan
      terraform apply --auto-approve

env.sh

@@ -23,6 +23,9 @@ export MENDIX_NAMESPACE=mendix
 
 # Used in do-all.sh to download the right mxpc-cli version
 mendixOperatorVersion=2.10.1
-os=macos-amd64
+# For Mac
+# os=macos-amd64
+# For Linux
+os=linux-amd64
 
 export KUBE_CONFIG_PATH=~/.kube/config

generate-yamls.sh

@@ -1,8 +1,7 @@
-#!/bin/bash
 #Get the  external IP address ip.nip.io
 
 # Find the load balancer IP address
-source getLbIp.sh
+. ./getLbIp.sh
 echo "Ingress Loadbalancer IP is :" $lbIp
 
 #Replace address in configure-template.yaml and write to configure.yaml

getLbIp.sh

@@ -1,8 +1,7 @@
-#!/bin/bash
 # Find the load balancer IP address
 echo "Starting $0..."
 lbIp=""
-while [[ ${#lbIp} -le 5 ]]
+while [ ${#lbIp} -le 5 ]
 do
   echo "$0: Checking if Loadbancer IP is assigned ... "
   lbIp=$(kubectl get svc  | grep -i LoadBalancer | grep -v pending | awk '{ print $4 }' )

install-grafana-prometheus.sh

@@ -1,12 +1,11 @@
-#!/bin/bash
 # Instructions here - https://docs.mendix.com/developerportal/deploy/private-cloud-monitor
 
 NAMESPACE=grafana
 kubectl create ns $NAMESPACE
 
 # Sets the LB IP in environment variables
 # source ensure the exported value of lbIp is available here
-source getLbIp.sh
+. ./getLbIp.sh
 
 #grafanaDomain=grafana.3.130.181.104.nip.io
 grafanaDomain=grafana.$lbIp.nip.io

main.tf

@@ -28,7 +28,7 @@ resource "azurerm_kubernetes_cluster" "default" {
   default_node_pool {
     name            = "default"
     node_count      = 2
-    vm_size         = "Standard_A8_v2"
+    vm_size         = "Standard_A4_v2"
     os_disk_size_gb = 30
   }
 
@@ -49,8 +49,8 @@ resource "azurerm_kubernetes_cluster" "default" {
 
 provider "kubernetes" {
   host                   = "${azurerm_kubernetes_cluster.default.kube_config.0.host}"
- # username               = "${azurerm_kubernetes_cluster.default.kube_config.0.username}"
- # password               = "${azurerm_kubernetes_cluster.default.kube_config.0.password}"
+  #username               = "${azurerm_kubernetes_cluster.default.kube_config.0.username}"
+  #password               = "${azurerm_kubernetes_cluster.default.kube_config.0.password}"
   client_certificate     = "${base64decode(azurerm_kubernetes_cluster.default.kube_config.0.client_certificate)}"
   client_key             = "${base64decode(azurerm_kubernetes_cluster.default.kube_config.0.client_key)}"
   cluster_ca_certificate = "${base64decode(azurerm_kubernetes_cluster.default.kube_config.0.cluster_ca_certificate)}"
@@ -60,8 +60,8 @@ provider "kubernetes" {
 provider "helm" {
   kubernetes {
   host                   = "${azurerm_kubernetes_cluster.default.kube_config.0.host}"
- # username               = "${azurerm_kubernetes_cluster.default.kube_config.0.username}"
- # password               = "${azurerm_kubernetes_cluster.default.kube_config.0.password}"
+  #username               = "${azurerm_kubernetes_cluster.default.kube_config.0.username}"
+  #password               = "${azurerm_kubernetes_cluster.default.kube_config.0.password}"
   client_certificate     = "${base64decode(azurerm_kubernetes_cluster.default.kube_config.0.client_certificate)}"
   client_key             = "${base64decode(azurerm_kubernetes_cluster.default.kube_config.0.client_key)}"
   cluster_ca_certificate = "${base64decode(azurerm_kubernetes_cluster.default.kube_config.0.cluster_ca_certificate)}"

validate.sh

@@ -1,4 +1,3 @@
-#!/bin/bash
 expectedResult=15
 
 sleep 20
@@ -10,7 +9,7 @@ kubectl get pods --all-namespaces | grep Running
 podsRunning=$(kubectl get pods --all-namespaces | grep Running | wc -l)
 #echo $podsRunning
 
-if [[ $podsRunning -ge $expectedResult ]];
+if [ $podsRunning -ge $expectedResult ];
 then
   echo "Result: Count of pods running "
   echo "$0 - Success: Number of running pods is " $podsRunning
@@ -26,7 +25,7 @@ sleep 20
 
 demoPodsExpected=1
 demoPodsRunning=$(kubectl get pods --all-namespaces | grep -i demo-master |  grep Running | wc -l)
-if [[ $demoPodsRunning -eq $demoPodsExpected ]];
+if [ $demoPodsRunning -eq $demoPodsExpected ];
 then
   echo "Result: Checking Application Pods "
   echo "$0 - Success: Number of running demo application pods is " $demoPodsRunning