Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #2519

Merged
merged 10 commits into from
Mar 22, 2022
Merged

Update dependencies #2519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5a0374f
Bump NGINX to 1.21.6
lucacome Mar 17, 2022
a53877f
Bump NGINX Plus to R26
lucacome Mar 17, 2022
c8e699b
Update OpenTracing
lucacome Mar 17, 2022
b263dca
Update UBI labels for certification
lucacome Mar 17, 2022
74b7982
Update deps and CI
lucacome Mar 18, 2022
353d2a5
Update Debian to Bullseye and Alpine to 3.15
lucacome Mar 18, 2022
24dd64d
Update Go to 1.17
lucacome Mar 18, 2022
f76fe8b
Update Go deps
lucacome Mar 18, 2022
3189998
Remove golangci-lint from Go deps
lucacome Mar 18, 2022
b7965d9
Update UBI base image
lucacome Mar 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions .github/workflows/edge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
pull_request:
branches:
- master
- release-1.12
paths-ignore:
- 'docs/**'
- 'docs-web/**'
Expand All @@ -30,7 +31,7 @@ defaults:

env:
DOCKER_BUILDKIT: 1
K8S_VERSION: 1.20.2
K8S_VERSION: 1.20.15
K8S_TIMEOUT: 75s
HELM_CHART_DIR: deployments/helm-chart
HELM_CHART_VERSION: 0.0.0-edge
Expand Down Expand Up @@ -99,12 +100,9 @@ jobs:
runs-on: ubuntu-20.04
needs: binary
strategy:
fail-fast: false
matrix:
image: [debian, alpine, opentracing, ubi]
ubi_version: ["8"]
include:
- image: ubi
ubi_version: 7
steps:
- name: Checkout Repository
uses: actions/checkout@v2
Expand Down Expand Up @@ -139,7 +137,6 @@ jobs:
build-args: |
BUILD_OS=${{ matrix.image }}
NGINX_VERSION=${{ steps.commit.outputs.nginx_version }}
UBI_VERSION=${{ matrix.ubi_version }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
Expand All @@ -164,6 +161,7 @@ jobs:
runs-on: ubuntu-20.04
needs: [binary, unit-tests]
strategy:
fail-fast: false
matrix:
include:
- image: debian
Expand Down Expand Up @@ -327,6 +325,7 @@ jobs:
needs: [smoke-tests, helm-tests]
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
strategy:
fail-fast: false
matrix:
include:
- tag: edge
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
runs-on: ubuntu-20.04
needs: [binary]
strategy:
fail-fast: false
matrix:
include:
- tag: ${{ needs.binary.outputs.version }}
Expand All @@ -70,7 +71,7 @@ jobs:
platforms: linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x
- tag: ${{ needs.binary.outputs.version }}-ubi
type: ubi
platforms: linux/arm64,linux/amd64
platforms: linux/arm64,linux/amd64,linux/s390x
steps:
- name: Checkout Repository
uses: actions/checkout@v2
Expand Down Expand Up @@ -109,14 +110,15 @@ jobs:
with:
file: build/Dockerfile
context: '.'
no-cache: true
cache-to: type=local,dest=/tmp/.buildx-${{ matrix.image }}-cache
target: goreleaser
tags: nginx/nginx-ingress:${{ matrix.tag }}
platforms: ${{ matrix.platforms }}
push: true
build-args: |
BUILD_OS=${{ matrix.type }}
IC_VERSION=${GITHUB_REF#refs/tags/}
IC_VERSION=${{ GITHUB_REF#refs/tags/ }}
NGINX_VERSION=${{ steps.commit.outputs.nginx_version }}
DATE=${{ steps.commit.outputs.date }}
GIT_COMMIT=${{ github.sha }}
Expand Down
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ all: test lint verify-codegen update-crds debian-image

.PHONY: lint
lint: ## Run linter
go run github.com/golangci/golangci-lint/cmd/golangci-lint run
@git fetch
docker run --pull always --rm -v $(shell pwd):/kubernetes-ingress -w /kubernetes-ingress -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:latest git diff -p origin/master > /tmp/diff.patch && golangci-lint --color always run -v --new-from-patch=/tmp/diff.patch

.PHONY: test
test: ## Run tests
Expand Down Expand Up @@ -73,7 +74,7 @@ debian-image-plus: build ## Create Docker image for Ingress Controller (nginx pl

.PHONY: debian-image-nap-plus
debian-image-nap-plus: build ## Create Docker image for Ingress Controller (nginx plus with nap)
$(DOCKER_CMD) $(PLUS_ARGS) --build-arg BUILD_OS=debian-plus-nap --build-arg FILES=nap-common
$(DOCKER_CMD) $(PLUS_ARGS) --build-arg BUILD_OS=debian-plus-nap --build-arg FILES=nap-common --build-arg DEBIAN_VERSION=buster-slim

.PHONY: openshift-image
openshift-image: build ## Create Docker image for Ingress Controller (ubi)
Expand All @@ -85,7 +86,7 @@ openshift-image-plus: build ## Create Docker image for Ingress Controller (ubi w

.PHONY: openshift-image-nap-plus
openshift-image-nap-plus: build ## Create Docker image for Ingress Controller (ubi with plus and nap)
$(DOCKER_CMD) $(PLUS_ARGS) --secret id=rhel_license,src=rhel_license --build-arg BUILD_OS=ubi-plus-nap --build-arg FILES=nap-common --build-arg UBI_VERSION=7
$(DOCKER_CMD) $(PLUS_ARGS) --secret id=rhel_license,src=rhel_license --build-arg BUILD_OS=ubi-plus-nap --build-arg FILES=nap-common

.PHONY: debian-image-opentracing
debian-image-opentracing: build ## Create Docker image for Ingress Controller (with opentracing)
Expand Down