Skip to content

Commit

Permalink
bump nginx and Go, remove tag file and old CI jobs (#11037)
Browse files Browse the repository at this point in the history
* bump nginx and remove tag file

* Bump go, remove old CI jobs
  • Loading branch information
rikatz authored Feb 28, 2024
1 parent 7a75538 commit 02e3af9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 28 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
- 'charts/ingress-nginx/**/*'
- 'NGINX_BASE'
baseimage:
- 'NGINX_BASE'
- 'images/nginx-1.25/**'
test-go:
Expand Down Expand Up @@ -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:
Expand All @@ -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..."
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion GOLANG_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.6
1.22.0
2 changes: 1 addition & 1 deletion NGINX_BASE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
registry.k8s.io/ingress-nginx/nginx:v20231208-4c39e6acc@sha256:03508408458d00ba4e219d2693ba2a039ba66d4151ab9b43794f61877e0abb73
registry.k8s.io/ingress-nginx/nginx-1.25:v0.0.5@sha256:cdafd6c9d36e23414ce41330a482f9136ce82fac46802809681f61cdcd5ad0bb
1 change: 0 additions & 1 deletion TAG

This file was deleted.

0 comments on commit 02e3af9

Please sign in to comment.