Merge pull request #113 from Treehopper/master

Update az Container, Terraform and Kubernetes Versions.

kubernetes/cloud/azure/terraform/main.tf

@@ -1,6 +1,13 @@
-provider "azurerm" {
-  version = "=2.5.0"
+terraform {
+  required_providers {
+    azurerm = {
+      source = "hashicorp/azurerm"
+      version = "=2.5.0"
+    }
+  }
+}
 
+provider "azurerm" {
   subscription_id = var.subscription_id
   client_id       = var.serviceprinciple_id
   client_secret   = var.serviceprinciple_key

kubernetes/cloud/azure/terraform/modules/k8s/k8s.tf

@@ -1,6 +1,5 @@
 
 provider "kubernetes" {
-    load_config_file       = "false"
     host                   =  var.host
     client_certificate     =  var.client_certificate
     client_key             =  var.client_key
@@ -38,11 +37,11 @@ resource "kubernetes_deployment" "example" {
           name  = "example"
 
           resources {
-            limits {
+            limits = {
               cpu    = "0.5"
               memory = "512Mi"
             }
-            requests {
+            requests = {
               cpu    = "250m"
               memory = "50Mi"
             }

kubernetes/cloud/azure/terraform/readme.md

@@ -11,7 +11,7 @@ We'll need the Azure CLI to gather information so we can build our Terraform fil
 
 ```
 # Run Azure CLI
-docker run -it --rm -v ${PWD}:/work -w /work --entrypoint /bin/sh mcr.microsoft.com/azure-cli:2.6.0
+docker run -it --rm -v ${PWD}:/work -w /work --entrypoint /bin/sh mcr.microsoft.com/azure-cli:2.30.0
 
 ```
 
@@ -62,7 +62,7 @@ For extra reference you can also take a look at the Microsoft Docs: [here](https
 ```
 # Get Terraform
 
-curl -o /tmp/terraform.zip -LO https://releases.hashicorp.com/terraform/0.12.28/terraform_0.12.28_linux_amd64.zip
+curl -o /tmp/terraform.zip -LO https://releases.hashicorp.com/terraform/1.0.11/terraform_1.0.11_linux_amd64.zip
 
 unzip /tmp/terraform.zip
 chmod +x terraform && mv terraform /usr/local/bin/

kubernetes/cloud/azure/terraform/variables.tf

@@ -19,5 +19,5 @@ variable "location" {
 }
 
 variable "kubernetes_version" {
-    default = "1.16.10"
+    default = "1.22.2"
 }