Added AcrPush role for cicd canary managed identity. Removed for prod…

… and c2 cluster cleanup, as it is not running on them (#1402)
equinor · Jul 18, 2024 · b142e37 · b142e37
1 parent 5915afc
commit b142e37
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/terraform/subscriptions/s940/c2/common/main.tf b/terraform/subscriptions/s940/c2/common/main.tf
@@ -98,10 +98,10 @@ module "radix-id-acr-workflows" {
       issuer  = "https://token.actions.githubusercontent.com"
       subject = "repo:equinor/radix-acr-cleanup:ref:refs/heads/release"
     }
-    radix-cluster-cleanup-master = {
-      name    = "radix-cluster-cleanup-release"
+    radix-cicd-canary-release = {
+      name    = "radix-cicd-canary-release"
       issuer  = "https://token.actions.githubusercontent.com"
-      subject = "repo:equinor/radix-cluster-cleanup:ref:refs/heads/release"
+      subject = "repo:equinor/radix-cicd-canary:ref:refs/heads/release"
     },
   }
 }

diff --git a/terraform/subscriptions/s940/prod/common/main.tf b/terraform/subscriptions/s940/prod/common/main.tf
@@ -96,10 +96,10 @@ module "radix-id-acr-workflows" {
       issuer  = "https://token.actions.githubusercontent.com"
       subject = "repo:equinor/radix-acr-cleanup:ref:refs/heads/release"
     }
-    radix-cluster-cleanup-master = {
-      name    = "radix-cluster-cleanup-release"
+    radix-cicd-canary-release = {
+      name    = "radix-cicd-canaryp-release"
       issuer  = "https://token.actions.githubusercontent.com"
-      subject = "repo:equinor/radix-cluster-cleanup:ref:refs/heads/release"
+      subject = "repo:equinor/radix-cicd-canary:ref:refs/heads/release"
     },
   }
 }

diff --git a/terraform/subscriptions/s941/dev/common/main.tf b/terraform/subscriptions/s941/dev/common/main.tf
@@ -91,8 +91,12 @@ module "radix-id-acr-workflows" {
       issuer  = "https://token.actions.githubusercontent.com"
       subject = "repo:equinor/radix-cluster-cleanup:ref:refs/heads/master"
     },
+    radix-cicd-canary-master = {
+      name    = "radix-cicd-canary-master"
+      issuer  = "https://token.actions.githubusercontent.com"
+      subject = "repo:equinor/radix-cicd-canary:ref:refs/heads/master"
+    },
   }
-
 }
 
 

diff --git a/terraform/subscriptions/s941/playground/common/main.tf b/terraform/subscriptions/s941/playground/common/main.tf
@@ -86,11 +86,16 @@ module "radix-id-acr-workflows" {
       issuer  = "https://token.actions.githubusercontent.com"
       subject = "repo:equinor/radix-acr-cleanup:ref:refs/heads/release"
     }
-    radix-cluster-cleanup-master = {
+    radix-cluster-cleanup-release = {
       name    = "radix-cluster-cleanup-release"
       issuer  = "https://token.actions.githubusercontent.com"
       subject = "repo:equinor/radix-cluster-cleanup:ref:refs/heads/release"
     },
+    radix-cicd-canary-release = {
+      name    = "radix-cicd-canary-release"
+      issuer  = "https://token.actions.githubusercontent.com"
+      subject = "repo:equinor/radix-cicd-canary:ref:refs/heads/release"
+    },
   }
 }