Skip to content

Commit 02e3af9

Browse files
authored
bump nginx and Go, remove tag file and old CI jobs (#11037)
* bump nginx and remove tag file * Bump go, remove old CI jobs
1 parent 7a75538 commit 02e3af9

File tree

5 files changed

+5
-28
lines changed

5 files changed

+5
-28
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767
- 'charts/ingress-nginx/**/*'
6868
- 'NGINX_BASE'
6969
baseimage:
70+
- 'NGINX_BASE'
7071
- 'images/nginx-1.25/**'
7172
7273
test-go:
@@ -141,7 +142,7 @@ jobs:
141142
needs.changes.outputs.baseimage == 'true'
142143
run: |
143144
export TAG=$(cat images/nginx-1.25/TAG)
144-
cd images/nginx-1.25/rootfs && docker buildx build --platform=${{ env.PLATFORMS }} --load -t gcr.io/k8s-staging-ingress-nginx/nginx-1.25:${TAG} .
145+
cd images/nginx-1.25/rootfs && docker buildx build --platform=${{ env.PLATFORMS }} --load -t registry.k8s.io/ingress-nginx/nginx-1.25:${TAG} .
145146
146147
- name: Build images
147148
env:
@@ -151,7 +152,7 @@ jobs:
151152
run: |
152153
echo "building images..."
153154
export TAGNGINX=$(cat images/nginx-1.25/TAG)
154-
make BASE_IMAGE=gcr.io/k8s-staging-ingress-nginx/nginx-1.25:${TAGNGINX} clean-image build image image-chroot
155+
make BASE_IMAGE=registry.k8s.io/ingress-nginx/nginx-1.25:${TAGNGINX} clean-image build image image-chroot
155156
make -C test/e2e-image image
156157
157158
echo "creating images cache..."

.github/workflows/images.yaml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -167,29 +167,6 @@ jobs:
167167
run: |
168168
cd images/ && make NAME=kube-webhook-certgen test test-e2e
169169
170-
nginx:
171-
runs-on: ubuntu-latest
172-
needs: changes
173-
if: |
174-
(needs.changes.outputs.nginx == 'true')
175-
steps:
176-
- name: Checkout
177-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
178-
- name: nginx-base-image
179-
run: |
180-
cd images/nginx/rootfs && docker build -t docker.io/nginx-test-workflow/nginx:${{ github.sha }} .
181-
- name: Run Trivy on NGINX Image
182-
uses: aquasecurity/trivy-action@master
183-
with:
184-
image-ref: 'docker.io/nginx-test-workflow/nginx:${{ github.sha }}'
185-
format: 'sarif'
186-
ignore-unfixed: true
187-
output: 'trivy-results.sarif'
188-
- name: Upload Trivy scan results to GitHub Security tab
189-
uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
190-
with:
191-
sarif_file: 'trivy-results.sarif'
192-
193170
opentelemetry:
194171
runs-on: ubuntu-latest
195172
env:

GOLANG_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.21.6
1+
1.22.0

NGINX_BASE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
registry.k8s.io/ingress-nginx/nginx:v20231208-4c39e6acc@sha256:03508408458d00ba4e219d2693ba2a039ba66d4151ab9b43794f61877e0abb73
1+
registry.k8s.io/ingress-nginx/nginx-1.25:v0.0.5@sha256:cdafd6c9d36e23414ce41330a482f9136ce82fac46802809681f61cdcd5ad0bb

TAG

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)