Allow operator to build and push for both master and release branch (#…

…1538)
equinor · Dec 10, 2024 · 68aa921 · 68aa921
1 parent 4fcd7f7
commit 68aa921
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/terraform/subscriptions/s940/c2/common/main.tf b/terraform/subscriptions/s940/c2/common/main.tf
@@ -132,6 +132,11 @@ module "radix-id-acr-workflows" {
       issuer  = "https://token.actions.githubusercontent.com"
       subject = "repo:equinor/radix-tekton:ref:refs/heads/release"
     },
+    radix-operator-master = {
+      name    = "radix-operator-master"
+      issuer  = "https://token.actions.githubusercontent.com"
+      subject = "repo:equinor/radix-operator:ref:refs/heads/master"
+    },
     radix-operator-release = {
       name    = "radix-operator-release"
       issuer  = "https://token.actions.githubusercontent.com"

diff --git a/terraform/subscriptions/s940/prod/common/main.tf b/terraform/subscriptions/s940/prod/common/main.tf
@@ -129,6 +129,11 @@ module "radix-id-acr-workflows" {
       issuer  = "https://token.actions.githubusercontent.com"
       subject = "repo:equinor/radix-tekton:ref:refs/heads/release"
     },
+    radix-operator-master = {
+      name    = "radix-operator-master"
+      issuer  = "https://token.actions.githubusercontent.com"
+      subject = "repo:equinor/radix-operator:ref:refs/heads/master"
+    },
     radix-operator-release = {
       name    = "radix-operator-release"
       issuer  = "https://token.actions.githubusercontent.com"

diff --git a/terraform/subscriptions/s941/dev/common/main.tf b/terraform/subscriptions/s941/dev/common/main.tf
@@ -134,6 +134,11 @@ module "radix-id-acr-workflows" {
       issuer  = "https://token.actions.githubusercontent.com"
       subject = "repo:equinor/radix-operator:ref:refs/heads/master"
     },
+    radix-operator-release = {
+      name    = "radix-operator-release"
+      issuer  = "https://token.actions.githubusercontent.com"
+      subject = "repo:equinor/radix-operator:ref:refs/heads/release"
+    },
     radix-velero-plugin-master = {
       name    = "radix-velero-plugin-master"
       issuer  = "https://token.actions.githubusercontent.com"

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