From 941233c28a73f5d06007fed78cec2766786856e1 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Fri, 3 Nov 2023 14:33:05 +0100
Subject: [PATCH 01/23] test github build

---
 .github/workflows/radix-operator-pr.yml | 86 ++++++++++++++++++++++---
 operator.Dockerfile                     | 10 +--
 2 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index e2a899326..ad17de7ec 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -3,24 +3,94 @@ on:
   pull_request:
     branches:
     - master
+
+permissions:
+  id-token: write
+
 jobs:
   build-operator:
     name: Build-operator
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Build operator image
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - uses: azure/login@v1
+      with:
+        client-id: 6e96429a-3ad5-40ee-b961-6de864d878fc
+        tenant-id: 3aa4a235-b6e2-48d5-9195-7fcf05b459b0
+        subscription-id: 16ede44b-1f74-40a5-b428-46cca9a5741b
+
+    - name: ACR Login
+      run: 'az acr login --name radixdev --subscription ${{ env.AZURE_SUBSCRIPTION_ID }}'
+
+    - name: ACR Login
+      run: 'az acr login --name radixplayground --subscription ${{ env.AZURE_SUBSCRIPTION_ID }}'
+
+    - name: Create tag
+      id: tag
       env:
-        REF: ${{ github. sha }}
-        DOCKER_BUILDKIT: 1
-      run: docker build -t radix-operator:${REF##*/} -f operator.Dockerfile .
+        GITHUB_SHA: ${{github.sha}}
+      run: |
+        sha=${GITHUB_SHA::8}
+        ts=$(date +%s)
+        build_id=${GITHUB_REF_NAME}-${sha}-${ts}
+        
+        echo "IMAGE_TAG=$build_id" >> $GITHUB_OUTPUTS
+
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v5
+      with:
+        push: true
+        file: operator.Dockerfile
+        tags: |
+          radixdev.azurecr.io/radix-operator-test:${{ steps.tag.outputs.IMAGE_TAG }}
+          radixplayground.azurecr.io/radix-operator-test:${{ steps.tag.outputs.IMAGE_TAG }}
+        cache-from: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache
+        cache-to: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache,mode=max
+
+
   build-pipeline:
     name: Build-pipeline
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Build pipeline image
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - uses: azure/login@v1
+      with:
+        client-id: 6e96429a-3ad5-40ee-b961-6de864d878fc
+        tenant-id: 3aa4a235-b6e2-48d5-9195-7fcf05b459b0
+        subscription-id: 16ede44b-1f74-40a5-b428-46cca9a5741b
+
+    - name: ACR Login
+      run: 'az acr login --name radixdev --subscription ${{ env.AZURE_SUBSCRIPTION_ID }}'
+
+    - name: ACR Login
+      run: 'az acr login --name radixplayground --subscription ${{ env.AZURE_SUBSCRIPTION_ID }}'
+
+    - name: Create tag
+      id: tag
       env:
-        REF: ${{ github. sha }}
-        DOCKER_BUILDKIT: 1
-      run: docker build -t radix-operator:${REF##*/} -f pipeline.Dockerfile .
\ No newline at end of file
+        GITHUB_SHA: ${{github.sha}}
+      run: |
+        sha=${GITHUB_SHA::8}
+        ts=$(date +%s)
+        build_id=${GITHUB_REF_NAME}-${sha}-${ts}
+        
+        echo "IMAGE_TAG=$build_id" >> $GITHUB_OUTPUTS
+
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v5
+      with:
+        push: true
+        file: pipeline.Dockerfile
+        tags: |
+          radixdev.azurecr.io/radix-pipeline-test:${{ steps.tag.outputs.IMAGE_TAG }}
+          radixplayground.azurecr.io/radix-pipeline-test:${{ steps.tag.outputs.IMAGE_TAG }}
+        cache-from: type=registry,ref=radixdev.azurecr.io/radix-pipeline-test:buildcache
+        cache-to: type=registry,ref=radixdev.azurecr.io/radix-pipeline-test:buildcache,mode=max
diff --git a/operator.Dockerfile b/operator.Dockerfile
index fcabfe1f6..36533490f 100644
--- a/operator.Dockerfile
+++ b/operator.Dockerfile
@@ -8,25 +8,25 @@ WORKDIR /go/src/github.com/equinor/radix-operator/
 
 # Install project dependencies
 COPY go.mod go.sum ./
-RUN go mod download
+RUN --mount=type=cache,id=cache,target=/root/.cache go mod download
 # Copy project code
 COPY ./radix-operator ./radix-operator
 COPY ./pkg ./pkg
 
 FROM base as run-staticcheck
-RUN go install honnef.co/go/tools/cmd/staticcheck@2023.1.3
-RUN staticcheck `go list ./... | grep -v "pkg/client"` && touch /staticcheck.done
+RUN --mount=type=cache,id=cache,target=/root/.cache go install honnef.co/go/tools/cmd/staticcheck@2023.1.3
+RUN --mount=type=cache,id=cache,target=/root/.cache staticcheck `go list ./... | grep -v "pkg/client"` && touch /staticcheck.done
 
 FROM base as tester
 # Run tests
-RUN go vet `go list ./... | grep -v "pkg/client"` && \
+RUN --mount=type=cache,id=cache,target=/root/.cache go vet `go list ./... | grep -v "pkg/client"` && \
     CGO_ENABLED=0 GOOS=linux go test `go list ./... | grep -v "pkg/client"` && \
     touch /tests.done
 
 FROM base as builder
 # Build
 WORKDIR /go/src/github.com/equinor/radix-operator/radix-operator/
-RUN CGO_ENABLED=0 GOOS=linux go build -ldflags "-s -w" -a -installsuffix cgo -o ./rootfs/radix-operator
+RUN --mount=type=cache,id=cache,target=/root/.cache CGO_ENABLED=0 GOOS=linux go build -ldflags "-s -w" -a -installsuffix cgo -o ./rootfs/radix-operator
 RUN addgroup -S -g 1000 radix-operator
 RUN adduser -S -u 1000 -G radix-operator radix-operator
 

From 4bd67f668f5082668fa14528e331d8104669a60e Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Fri, 3 Nov 2023 14:56:57 +0100
Subject: [PATCH 02/23] test client id

---
 .github/workflows/radix-operator-pr.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index ad17de7ec..8a2ba0976 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -24,10 +24,10 @@ jobs:
         subscription-id: 16ede44b-1f74-40a5-b428-46cca9a5741b
 
     - name: ACR Login
-      run: 'az acr login --name radixdev --subscription ${{ env.AZURE_SUBSCRIPTION_ID }}'
+      run: 'az acr login --name radixdev'
 
     - name: ACR Login
-      run: 'az acr login --name radixplayground --subscription ${{ env.AZURE_SUBSCRIPTION_ID }}'
+      run: 'az acr login --name radixplayground'
 
     - name: Create tag
       id: tag
@@ -68,10 +68,10 @@ jobs:
         subscription-id: 16ede44b-1f74-40a5-b428-46cca9a5741b
 
     - name: ACR Login
-      run: 'az acr login --name radixdev --subscription ${{ env.AZURE_SUBSCRIPTION_ID }}'
+      run: 'az acr login --name radixdev'
 
     - name: ACR Login
-      run: 'az acr login --name radixplayground --subscription ${{ env.AZURE_SUBSCRIPTION_ID }}'
+      run: 'az acr login --name radixplayground'
 
     - name: Create tag
       id: tag

From 2b69584bff692628ebb56cfbd16895715671be7e Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Fri, 3 Nov 2023 14:58:29 +0100
Subject: [PATCH 03/23] test client id

---
 .github/workflows/radix-operator-pr.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 8a2ba0976..72734b04e 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -24,10 +24,10 @@ jobs:
         subscription-id: 16ede44b-1f74-40a5-b428-46cca9a5741b
 
     - name: ACR Login
-      run: 'az acr login --name radixdev'
+      run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'
 
     - name: ACR Login
-      run: 'az acr login --name radixplayground'
+      run: 'az acr login --name radixplayground --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'
 
     - name: Create tag
       id: tag
@@ -68,10 +68,10 @@ jobs:
         subscription-id: 16ede44b-1f74-40a5-b428-46cca9a5741b
 
     - name: ACR Login
-      run: 'az acr login --name radixdev'
+      run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'
 
     - name: ACR Login
-      run: 'az acr login --name radixplayground'
+      run: 'az acr login --name radixplayground --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'
 
     - name: Create tag
       id: tag

From acee9317984340348f329f6cc2c59f6247749305 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Fri, 3 Nov 2023 15:04:46 +0100
Subject: [PATCH 04/23] simplofy test

---
 .github/workflows/radix-operator-pr.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 72734b04e..3ecd33665 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -26,9 +26,6 @@ jobs:
     - name: ACR Login
       run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'
 
-    - name: ACR Login
-      run: 'az acr login --name radixplayground --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'
-
     - name: Create tag
       id: tag
       env:
@@ -45,9 +42,7 @@ jobs:
       with:
         push: true
         file: operator.Dockerfile
-        tags: |
-          radixdev.azurecr.io/radix-operator-test:${{ steps.tag.outputs.IMAGE_TAG }}
-          radixplayground.azurecr.io/radix-operator-test:${{ steps.tag.outputs.IMAGE_TAG }}
+        tags:  radixdev.azurecr.io/radix-operator-test:${{ steps.tag.outputs.IMAGE_TAG }}
         cache-from: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache
         cache-to: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache,mode=max
 
@@ -70,9 +65,6 @@ jobs:
     - name: ACR Login
       run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'
 
-    - name: ACR Login
-      run: 'az acr login --name radixplayground --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'
-
     - name: Create tag
       id: tag
       env:
@@ -91,6 +83,5 @@ jobs:
         file: pipeline.Dockerfile
         tags: |
           radixdev.azurecr.io/radix-pipeline-test:${{ steps.tag.outputs.IMAGE_TAG }}
-          radixplayground.azurecr.io/radix-pipeline-test:${{ steps.tag.outputs.IMAGE_TAG }}
         cache-from: type=registry,ref=radixdev.azurecr.io/radix-pipeline-test:buildcache
         cache-to: type=registry,ref=radixdev.azurecr.io/radix-pipeline-test:buildcache,mode=max

From 6f6a9891e2ed8a06f012d3d1153f0a5a16b6cd57 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Fri, 3 Nov 2023 15:07:07 +0100
Subject: [PATCH 05/23] grant github access

---
 .github/workflows/radix-operator-pr.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 3ecd33665..147ab6edd 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -23,6 +23,13 @@ jobs:
         tenant-id: 3aa4a235-b6e2-48d5-9195-7fcf05b459b0
         subscription-id: 16ede44b-1f74-40a5-b428-46cca9a5741b
 
+    - name: Get GitHub Public IP
+      id: github_public_ip
+      run: echo "ipv4=$(curl 'https://ifconfig.me/ip')" >> $GITHUB_OUTPUT
+
+    - name: Add GitHub IP to StorageAccount
+      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
+
     - name: ACR Login
       run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'
 
@@ -46,6 +53,8 @@ jobs:
         cache-from: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache
         cache-to: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache,mode=max
 
+    - name: Revoke GitHub IP on StorageAccount
+      run: az acr network-rule remove --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
 
   build-pipeline:
     name: Build-pipeline
@@ -62,6 +71,13 @@ jobs:
         tenant-id: 3aa4a235-b6e2-48d5-9195-7fcf05b459b0
         subscription-id: 16ede44b-1f74-40a5-b428-46cca9a5741b
 
+    - name: Get GitHub Public IP
+      id: github_public_ip
+      run: echo "ipv4=$(curl 'https://ifconfig.me/ip')" >> $GITHUB_OUTPUT
+
+    - name: Add GitHub IP to StorageAccount
+      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
+
     - name: ACR Login
       run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'
 
@@ -85,3 +101,7 @@ jobs:
           radixdev.azurecr.io/radix-pipeline-test:${{ steps.tag.outputs.IMAGE_TAG }}
         cache-from: type=registry,ref=radixdev.azurecr.io/radix-pipeline-test:buildcache
         cache-to: type=registry,ref=radixdev.azurecr.io/radix-pipeline-test:buildcache,mode=max
+
+    - name: Revoke GitHub IP on StorageAccount
+      run: az acr network-rule remove --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
+

From 34a86b599ba89f530341e094f535aa52f25f2d30 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 10:00:01 +0100
Subject: [PATCH 06/23] test github action

---
 .github/workflows/radix-operator-pr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 147ab6edd..e8166c312 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -59,6 +59,7 @@ jobs:
   build-pipeline:
     name: Build-pipeline
     runs-on: ubuntu-latest
+    if: false
     steps:
     - uses: actions/checkout@v3
 

From a33bdc770988f3a05861e4bb822ca2785a14cd43 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 10:08:53 +0100
Subject: [PATCH 07/23] always cleanup firewall rules

---
 .github/workflows/radix-operator-pr.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index e8166c312..6412e9b35 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -28,6 +28,7 @@ jobs:
       run: echo "ipv4=$(curl 'https://ifconfig.me/ip')" >> $GITHUB_OUTPUT
 
     - name: Add GitHub IP to StorageAccount
+      id: update_firewall
       run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
 
     - name: ACR Login
@@ -54,8 +55,10 @@ jobs:
         cache-to: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache,mode=max
 
     - name: Revoke GitHub IP on StorageAccount
+      if: ${{ failure() && steps.update_firewall.conclusion == "success" }}
       run: az acr network-rule remove --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
 
+
   build-pipeline:
     name: Build-pipeline
     runs-on: ubuntu-latest

From 145e3899cd5bab29047798fd4bc346b11cf9441f Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 10:29:28 +0100
Subject: [PATCH 08/23] always cleanup firewall rules

---
 .github/workflows/radix-operator-pr.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 6412e9b35..a622a7ffa 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -27,9 +27,9 @@ jobs:
       id: github_public_ip
       run: echo "ipv4=$(curl 'https://ifconfig.me/ip')" >> $GITHUB_OUTPUT
 
-    - name: Add GitHub IP to StorageAccount
+    - name: Add GitHub IP to ACR
       id: update_firewall
-      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
+      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 2
 
     - name: ACR Login
       run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'

From fe90604ce81baedd36c42a72b0b88847bab930e5 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 11:58:48 +0100
Subject: [PATCH 09/23] always cleanup firewall rules

---
 .github/workflows/radix-operator-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index a622a7ffa..9579a7d62 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -55,7 +55,7 @@ jobs:
         cache-to: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache,mode=max
 
     - name: Revoke GitHub IP on StorageAccount
-      if: ${{ failure() && steps.update_firewall.conclusion == "success" }}
+      if: success() || steps.update_firewall.conclusion == 'success'
       run: az acr network-rule remove --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
 
 

From a7ed8d75aa29fc6e3ee3f098fde26e38132ed42a Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 12:02:14 +0100
Subject: [PATCH 10/23] sleep...

---
 .github/workflows/radix-operator-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 9579a7d62..ae2b3162f 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Add GitHub IP to ACR
       id: update_firewall
-      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 2
+      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 20
 
     - name: ACR Login
       run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'

From c170c22cab33b074c6016c6e155ae3f78afeee57 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 12:03:43 +0100
Subject: [PATCH 11/23] sleep...

---
 .github/workflows/radix-operator-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index ae2b3162f..84d87dc5b 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Add GitHub IP to ACR
       id: update_firewall
-      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 20
+      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 30
 
     - name: ACR Login
       run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'

From e120d37916b7b4a9b9d9b1ad19b003c56d6295e7 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 12:13:39 +0100
Subject: [PATCH 12/23] don't sleep

---
 .github/workflows/radix-operator-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 84d87dc5b..0a04b70d6 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Add GitHub IP to ACR
       id: update_firewall
-      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 30
+      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
 
     - name: ACR Login
       run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'

From b1e38d61432139c7196639d56bf278b872fcfd91 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 12:16:59 +0100
Subject: [PATCH 13/23] fix ref

---
 .github/workflows/radix-operator-pr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 0a04b70d6..0a955bdc3 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -38,6 +38,7 @@ jobs:
       id: tag
       env:
         GITHUB_SHA: ${{github.sha}}
+        GITHUB_REF_NAME: ${{github.ref }}
       run: |
         sha=${GITHUB_SHA::8}
         ts=$(date +%s)

From b77920d0c1553a42677e74d0a3a88c73bc15fd83 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 12:17:29 +0100
Subject: [PATCH 14/23] sleep...

---
 .github/workflows/radix-operator-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 0a955bdc3..da042b515 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Add GitHub IP to ACR
       id: update_firewall
-      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
+      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 30
 
     - name: ACR Login
       run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'

From bb07554009d16bfd07ea4dfbed319c816063f110 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 12:22:58 +0100
Subject: [PATCH 15/23] sleep...

---
 .github/workflows/radix-operator-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index da042b515..33aab1000 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Add GitHub IP to ACR
       id: update_firewall
-      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 30
+      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 60
 
     - name: ACR Login
       run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'

From 193c7517fb0b1c4c0e39500625b8a1dadd18cdaf Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 12:28:31 +0100
Subject: [PATCH 16/23] image tag

---
 .github/workflows/radix-operator-pr.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 33aab1000..115b76160 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -38,20 +38,19 @@ jobs:
       id: tag
       env:
         GITHUB_SHA: ${{github.sha}}
-        GITHUB_REF_NAME: ${{github.ref }}
       run: |
         sha=${GITHUB_SHA::8}
         ts=$(date +%s)
-        build_id=${GITHUB_REF_NAME}-${sha}-${ts}
+        build_id=nightly-${sha}-${ts}
         
-        echo "IMAGE_TAG=$build_id" >> $GITHUB_OUTPUTS
+        echo "tag=$build_id" >> $GITHUB_OUTPUTS
 
     - name: Build and push Docker images
       uses: docker/build-push-action@v5
       with:
         push: true
         file: operator.Dockerfile
-        tags:  radixdev.azurecr.io/radix-operator-test:${{ steps.tag.outputs.IMAGE_TAG }}
+        tags:  radixdev.azurecr.io/radix-operator-test:${{ steps.tag.outputs.tag }}
         cache-from: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache
         cache-to: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache,mode=max
 

From a4e8e0f60d391e3daa5c4f3110b161bb8861eefc Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 12:28:51 +0100
Subject: [PATCH 17/23] image tag

---
 .github/workflows/radix-operator-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 115b76160..dcc647722 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -43,7 +43,7 @@ jobs:
         ts=$(date +%s)
         build_id=nightly-${sha}-${ts}
         
-        echo "tag=$build_id" >> $GITHUB_OUTPUTS
+        echo "tag=${build_id}" >> $GITHUB_OUTPUTS
 
     - name: Build and push Docker images
       uses: docker/build-push-action@v5

From 9deda68a694fb87738200f5a1764eb5ecf106467 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 13:00:30 +0100
Subject: [PATCH 18/23] relogin

---
 .github/workflows/radix-operator-pr.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index dcc647722..87bc5e537 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -31,6 +31,12 @@ jobs:
       id: update_firewall
       run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 60
 
+    - uses: azure/login@v1
+      with:
+        client-id: 6e96429a-3ad5-40ee-b961-6de864d878fc
+        tenant-id: 3aa4a235-b6e2-48d5-9195-7fcf05b459b0
+        subscription-id: 16ede44b-1f74-40a5-b428-46cca9a5741b
+
     - name: ACR Login
       run: 'az acr login --name radixdev --subscription 16ede44b-1f74-40a5-b428-46cca9a5741b'
 

From f3dd4afb153e364f533ec897e361f410cb84d3fa Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 13:04:37 +0100
Subject: [PATCH 19/23] relogin

---
 .github/workflows/radix-operator-pr.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 87bc5e537..0a40f784c 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Add GitHub IP to ACR
       id: update_firewall
-      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 60
+      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
 
     - uses: azure/login@v1
       with:
@@ -48,15 +48,14 @@ jobs:
         sha=${GITHUB_SHA::8}
         ts=$(date +%s)
         build_id=nightly-${sha}-${ts}
-        
-        echo "tag=${build_id}" >> $GITHUB_OUTPUTS
+        echo "image_tag=${build_id}" >> "$GITHUB_OUTPUTS"
 
     - name: Build and push Docker images
       uses: docker/build-push-action@v5
       with:
         push: true
         file: operator.Dockerfile
-        tags:  radixdev.azurecr.io/radix-operator-test:${{ steps.tag.outputs.tag }}
+        tags:  radixdev.azurecr.io/radix-operator-test:${{ steps.tag.outputs.image_tag }}
         cache-from: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache
         cache-to: type=registry,ref=radixdev.azurecr.io/radix-operator-test:buildcache,mode=max
 

From 8fb72237759c15cae56b9ce00f148bed06907072 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 13:05:49 +0100
Subject: [PATCH 20/23] relogin

---
 .github/workflows/radix-operator-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 0a40f784c..82be33d15 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Add GitHub IP to ACR
       id: update_firewall
-      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState
+      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 60
 
     - uses: azure/login@v1
       with:

From dc9a24720d481e410367ba3a4b7e5b7057ecbe9a Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 13:19:46 +0100
Subject: [PATCH 21/23] relogin

---
 .github/workflows/radix-operator-pr.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 82be33d15..3aefcd15d 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Add GitHub IP to ACR
       id: update_firewall
-      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 60
+      run: az acr network-rule add --name radixdev --ip-address  ${{ steps.github_public_ip.outputs.ipv4 }} --query provisioningState && sleep 10
 
     - uses: azure/login@v1
       with:
@@ -45,7 +45,7 @@ jobs:
       env:
         GITHUB_SHA: ${{github.sha}}
       run: |
-        sha=${GITHUB_SHA::8}
+        sha=${GITHUB_SHA:0:8}
         ts=$(date +%s)
         build_id=nightly-${sha}-${ts}
         echo "image_tag=${build_id}" >> "$GITHUB_OUTPUTS"

From 7aea662fd9cfe6191331e7b104e0e9741e3852c7 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 13:22:30 +0100
Subject: [PATCH 22/23] relogin

---
 .github/workflows/radix-operator-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/radix-operator-pr.yml b/.github/workflows/radix-operator-pr.yml
index 3aefcd15d..23bbdaa6b 100644
--- a/.github/workflows/radix-operator-pr.yml
+++ b/.github/workflows/radix-operator-pr.yml
@@ -48,7 +48,7 @@ jobs:
         sha=${GITHUB_SHA:0:8}
         ts=$(date +%s)
         build_id=nightly-${sha}-${ts}
-        echo "image_tag=${build_id}" >> "$GITHUB_OUTPUTS"
+        echo "image_tag=${build_id}" >> "$GITHUB_OUTPUT"
 
     - name: Build and push Docker images
       uses: docker/build-push-action@v5

From 52b242735ae14717d1b7323a0455ed9814f6ca51 Mon Sep 17 00:00:00 2001
From: Richard Hagen <richard.hagen@bouvet.no>
Date: Mon, 6 Nov 2023 13:34:08 +0100
Subject: [PATCH 23/23] relogin

---
 radix-operator/main.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/radix-operator/main.go b/radix-operator/main.go
index 17bfc9dcc..d6d455dd0 100644
--- a/radix-operator/main.go
+++ b/radix-operator/main.go
@@ -53,6 +53,8 @@ func main() {
 	cfg := config.NewConfig()
 	setLogLevel(cfg.LogLevel)
 
+	print("hello world")
+
 	registrationControllerThreads, applicationControllerThreads, environmentControllerThreads, deploymentControllerThreads, jobControllerThreads, alertControllerThreads, kubeClientRateLimitBurst, kubeClientRateLimitQPS, err := getInitParams()
 	if err != nil {
 		panic(err)