From 0303f45f2ec50900ad5a6988d39b8f2519e4be33 Mon Sep 17 00:00:00 2001
From: Bengt Fredh <bengt.rino.fredh@digdir.no>
Date: Wed, 16 Oct 2024 12:07:41 +0200
Subject: [PATCH] add gh action admin-test-aks

---
 .github/workflows/admin-test-aks-rg-deploy.yml      | 13 +++++++------
 .../admin-test-aks-rg/terraform.tfvars              |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/admin-test-aks-rg-deploy.yml b/.github/workflows/admin-test-aks-rg-deploy.yml
index c820f2bf..52cae8f4 100644
--- a/.github/workflows/admin-test-aks-rg-deploy.yml
+++ b/.github/workflows/admin-test-aks-rg-deploy.yml
@@ -1,11 +1,11 @@
-name: Altinn Monitor Test rg
+name: admin-test-aks-rg deploy
 
 on:
   push:
     branches:
       - main
     paths:
-      - .github/workflows/altinn-monitor-test-rg-deploy.yml
+      - .github/workflows/admin-test-aks-rg-deploy.yml
       - actions/terraform/apply/**
       - actions/terraform/plan/**
       - infrastructure/adminservices-test/altinn-monitor-test-rg/**
@@ -13,10 +13,10 @@ on:
     branches:
       - main
     paths:
-      - .github/workflows/altinn-monitor-test-rg-deploy.yml
+      - .github/workflows/admin-test-aks-rg-deploy.yml
       - actions/terraform/apply/**
       - actions/terraform/plan/**
-      - infrastructure/adminservices-test/altinn-monitor-test-rg/**
+      - infrastructure/adminservices-test/admin-test-aks-rg/**
   workflow_dispatch:
     inputs:
       log_level:
@@ -33,10 +33,11 @@ on:
 
 env:
   ENVIRONMENT: test
-  TF_STATE_NAME: altinn-monitor-test-rg.tfstate
-  TF_PROJECT: ./infrastructure/adminservices-test/altinn-monitor-test-rg
+  TF_STATE_NAME: admin-test-aks-rg.tfstate
+  TF_PROJECT: ./infrastructure/adminservices-test/admin-test-aks-rg
   ARM_CLIENT_ID: ${{ vars.TF_AZURE_CLIENT_ID }}
   ARM_SUBSCRIPTION_ID: 1ce8e9af-c2d6-44e7-9c5e-099a308056fe
+  TF_VAR_altinncr_id: ${{ vars.ALTINNCR_ID }}
 
 permissions:
   id-token: write
diff --git a/infrastructure/adminservices-test/admin-test-aks-rg/terraform.tfvars b/infrastructure/adminservices-test/admin-test-aks-rg/terraform.tfvars
index 3314fb31..e867aee4 100644
--- a/infrastructure/adminservices-test/admin-test-aks-rg/terraform.tfvars
+++ b/infrastructure/adminservices-test/admin-test-aks-rg/terraform.tfvars
@@ -19,4 +19,4 @@ pool_configs = {
 }
 kubernetes_version = "1.29"
 aks_sku_tier       = "Free"
-altinncr_id        = "/subscriptions/a6e9ee7d-2b65-41e1-adfb-0c8c23515cf9/resourceGroups/acr/providers/Microsoft.ContainerRegistry/registries/altinncr"
+# altinncr_id        = "/subscriptions/a6e9ee7d-2b65-41e1-adfb-0c8c23515cf9/resourceGroups/acr/providers/Microsoft.ContainerRegistry/registries/altinncr"