From 00ca5293b32753f0123f6c5328ad63cc444b5656 Mon Sep 17 00:00:00 2001
From: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>
Date: Wed, 28 Feb 2024 10:48:17 -0300
Subject: [PATCH] Bump go, remove old CI jobs

---
 .github/workflows/ci.yaml     |  5 +++--
 .github/workflows/images.yaml | 23 -----------------------
 GOLANG_VERSION                |  2 +-
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d7d20a246a9..32915f4c2c2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -67,6 +67,7 @@ jobs:
               - 'charts/ingress-nginx/**/*'
               - 'NGINX_BASE'
             baseimage:
+              - 'NGINX_BASE'
               - 'images/nginx-1.25/**'
 
   test-go:
@@ -141,7 +142,7 @@ jobs:
           needs.changes.outputs.baseimage == 'true'
         run: |
             export TAG=$(cat images/nginx-1.25/TAG)
-            cd images/nginx-1.25/rootfs && docker buildx build --platform=${{ env.PLATFORMS }} --load -t gcr.io/k8s-staging-ingress-nginx/nginx-1.25:${TAG} .
+            cd images/nginx-1.25/rootfs && docker buildx build --platform=${{ env.PLATFORMS }} --load -t registry.k8s.io/ingress-nginx/nginx-1.25:${TAG} .
     
       - name: Build images
         env:
@@ -151,7 +152,7 @@ jobs:
         run: |
           echo "building images..."
           export TAGNGINX=$(cat images/nginx-1.25/TAG)
-          make BASE_IMAGE=gcr.io/k8s-staging-ingress-nginx/nginx-1.25:${TAGNGINX} clean-image build image image-chroot
+          make BASE_IMAGE=registry.k8s.io/ingress-nginx/nginx-1.25:${TAGNGINX} clean-image build image image-chroot
           make -C test/e2e-image image
 
           echo "creating images cache..."
diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
index 93092d80bbf..d125586e4d5 100644
--- a/.github/workflows/images.yaml
+++ b/.github/workflows/images.yaml
@@ -167,29 +167,6 @@ jobs:
       run: |
         cd images/ && make NAME=kube-webhook-certgen test test-e2e
 
-  nginx:
-    runs-on: ubuntu-latest
-    needs: changes
-    if: |
-      (needs.changes.outputs.nginx == 'true')
-    steps:
-    - name: Checkout
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-    - name: nginx-base-image
-      run: |
-        cd images/nginx/rootfs && docker build -t docker.io/nginx-test-workflow/nginx:${{ github.sha }} .
-    - name: Run Trivy on NGINX Image
-      uses: aquasecurity/trivy-action@master
-      with:
-        image-ref: 'docker.io/nginx-test-workflow/nginx:${{ github.sha }}'
-        format: 'sarif'
-        ignore-unfixed: true
-        output: 'trivy-results.sarif'
-    - name: Upload Trivy scan results to GitHub Security tab
-      uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
-      with:
-        sarif_file: 'trivy-results.sarif'
-
   opentelemetry:
     runs-on: ubuntu-latest
     env:
diff --git a/GOLANG_VERSION b/GOLANG_VERSION
index 6e83421e4fd..80a81c0e7fc 100644
--- a/GOLANG_VERSION
+++ b/GOLANG_VERSION
@@ -1 +1 @@
-1.21.6
\ No newline at end of file
+1.22.0
\ No newline at end of file