Update Helm chart

Helm/contosomaintenance/Chart.yaml

@@ -1,5 +1,4 @@
 apiVersion: v1
-appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: contosomaintenance
 version: 1.0.0

Helm/contosomaintenance/templates/bot.deployment.yaml

@@ -14,8 +14,8 @@ spec:
       labels:
         app: contosomaintenance-bot
     spec:
-        imagePullSecrets:
+      imagePullSecrets:
-        - name: acr-credentials
+      - name: acr-credentials
       containers:
         - name: contosomaintenance-bot
           image: {{ .Values.containerRegistry }}/{{ .Values.botImageName }}:{{ .Values.botImageTag }}

Helm/contosomaintenance/values.yaml

@@ -1,5 +1,10 @@
-containerRegistry: __ContainerRegistry__
+# containerRegistry: __ContainerRegistry__
-apiImageName: __ApiImageName__
+# apiImageName: __ApiImageName__
-apiImageTag: __ApiImageTag__
+# apiImageTag: __ApiImageTag__
-botImageName: __BotImageName__
+# botImageName: __BotImageName__
-botImageTag: __BotImageTag__
+# botImageTag: __BotImageTag__
+containerRegistry: rothiedemoregistry.azurecr.io
+apiImageName: rothiedemoregistry.azurecr.io/contosomaintenance-api
+apiImageTag: latest
+botImageName: rothiedemoregistry.azurecr.io/contosomaintenance-bot
+botImageTag: latest

Terraform/aks.tf

@@ -1,19 +1,19 @@
 resource "azurerm_kubernetes_cluster" "workshop" {
-  name                = "${var.name}aks"
+  name                = "${var.prefix}${var.resource_name}aks"
-  location            = "${azurerm_resource_group.test.location}"
+  location            = "${azurerm_resource_group.workshop.location}"
-  resource_group_name = "${azurerm_resource_group.test.name}"
+  resource_group_name = "${azurerm_resource_group.workshop.name}"
-  dns_prefix          = "${var.name}aks"
+  dns_prefix          = "${var.prefix}${var.resource_name}aks"
 
   agent_pool_profile {
     name            = "default"
     count           = 3
     vm_size         = "Standard_B2s"
     os_type         = "Linux"
-    os_disk_size_gb = 20
+    os_disk_size_gb = 30
   }
 
   service_principal {
-    client_id     = "{var.sp_client_id}"
+    client_id     = "${var.sp_client_id}"
-    client_secret = "{var.sp_client_secret}"
+    client_secret = "${var.sp_client_secret}"
   }
 }

Terraform/main.tf

@@ -6,14 +6,14 @@ provider "azurerm" {
 # Follow the official guide, to setup the Storage Account:
 # https://docs.microsoft.com/en-us/azure/terraform/terraform-backend
 
-terraform {
+# terraform {
-  backend "azurerm" {
+#   backend "azurerm" {
-    storage_account_name = "__TFSTATE-STORAGE-ACCOUNT-NAME__" # <-- Replace this with your values
+#     storage_account_name = "__TFSTATE-STORAGE-ACCOUNT-NAME__" # <-- Replace this with your values
-    container_name       = "__TFSTATE-CONTAINER-NAME__"       # <-- Replace this with your values
+#     container_name       = "__TFSTATE-CONTAINER-NAME__"       # <-- Replace this with your values
-    access_key           = "__TFSTATE-STORAGE-ACCESS-KEY__"   # <-- Replace this with your values
+#     access_key           = "__TFSTATE-STORAGE-ACCESS-KEY__"   # <-- Replace this with your values
-    key                  = "terraform.tfstate"
+#     key                  = "terraform.tfstate"
-  }
+#   }
-}
+# }
 
 resource "azurerm_resource_group" "workshop" {
   name     = "${var.prefix}${var.resource_name}workshop"