diff --git a/Helm/contosomaintenance/Chart.yaml b/Helm/contosomaintenance/Chart.yaml index 4c84e4a..f529ce3 100644 --- a/Helm/contosomaintenance/Chart.yaml +++ b/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 diff --git a/Helm/contosomaintenance/templates/bot.deployment.yaml b/Helm/contosomaintenance/templates/bot.deployment.yaml index 3874c2c..d7d8b3a 100644 --- a/Helm/contosomaintenance/templates/bot.deployment.yaml +++ b/Helm/contosomaintenance/templates/bot.deployment.yaml @@ -14,8 +14,8 @@ spec: labels: app: contosomaintenance-bot spec: - imagePullSecrets: - - name: acr-credentials + imagePullSecrets: + - name: acr-credentials containers: - name: contosomaintenance-bot image: {{ .Values.containerRegistry }}/{{ .Values.botImageName }}:{{ .Values.botImageTag }} diff --git a/Helm/contosomaintenance/values.yaml b/Helm/contosomaintenance/values.yaml index ae7565d..833eed7 100644 --- a/Helm/contosomaintenance/values.yaml +++ b/Helm/contosomaintenance/values.yaml @@ -1,5 +1,10 @@ -containerRegistry: __ContainerRegistry__ -apiImageName: __ApiImageName__ -apiImageTag: __ApiImageTag__ -botImageName: __BotImageName__ -botImageTag: __BotImageTag__ \ No newline at end of file +# containerRegistry: __ContainerRegistry__ +# apiImageName: __ApiImageName__ +# apiImageTag: __ApiImageTag__ +# botImageName: __BotImageName__ +# botImageTag: __BotImageTag__ +containerRegistry: rothiedemoregistry.azurecr.io +apiImageName: rothiedemoregistry.azurecr.io/contosomaintenance-api +apiImageTag: latest +botImageName: rothiedemoregistry.azurecr.io/contosomaintenance-bot +botImageTag: latest \ No newline at end of file diff --git a/Terraform/aks.tf b/Terraform/aks.tf index ab3181b..a47eca9 100644 --- a/Terraform/aks.tf +++ b/Terraform/aks.tf @@ -1,19 +1,19 @@ resource "azurerm_kubernetes_cluster" "workshop" { - name = "${var.name}aks" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - dns_prefix = "${var.name}aks" + name = "${var.prefix}${var.resource_name}aks" + location = "${azurerm_resource_group.workshop.location}" + resource_group_name = "${azurerm_resource_group.workshop.name}" + 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_secret = "{var.sp_client_secret}" + client_id = "${var.sp_client_id}" + client_secret = "${var.sp_client_secret}" } } diff --git a/Terraform/main.tf b/Terraform/main.tf index f547999..1d2c9d7 100644 --- a/Terraform/main.tf +++ b/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 { - backend "azurerm" { - storage_account_name = "__TFSTATE-STORAGE-ACCOUNT-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 - key = "terraform.tfstate" - } -} +# terraform { +# backend "azurerm" { +# storage_account_name = "__TFSTATE-STORAGE-ACCOUNT-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 +# key = "terraform.tfstate" +# } +# } resource "azurerm_resource_group" "workshop" { name = "${var.prefix}${var.resource_name}workshop"