DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump Golang to 1.19 #8932 (#8970)

Browse source 
* fix: convert to LF line endings

Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>

* Pin exact Go bugfix versions for CI jobs

Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>

* Bump go.mod and Dockerfiles to Go 1.19.0

Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>

Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>
This commit is contained in:
Ismayil Mirzali 2022-08-26 19:22:25 +03:00 committed by GitHub
parent 9b29898746
commit 26bc6e4e50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/ci.yaml vendored
View file

@ -70,11 +70,11 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
- name: Set up Go 1.18 - name: Set up Go 1.19.0
id: go id: go
uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a # v3.2.0 uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a # v3.2.0
with: with:
go-version: '1.18.2' go-version: '1.19.0'
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8 #v2.0.0 uses: docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8 #v2.0.0
@ -136,7 +136,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a # v3.2.0 uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a # v3.2.0
with: with:
go-version: '1.18.2' go-version: '1.19.0'
- name: cache - name: cache
uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 # v3 uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 # v3
@ -406,12 +406,12 @@ jobs:
version: v0.14.0 version: v0.14.0
image: kindest/node:v1.21.12 image: kindest/node:v1.21.12
- name: Set up Go 1.18 - name: Set up Go 1.19.0
id: go id: go
if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }} if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }}
uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a # v3.2.0 uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a # v3.2.0
with: with:
go-version: '1.18.2' go-version: '1.19.0'
- name: kube-webhook-certgen image build - name: kube-webhook-certgen image build
if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }} if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }}

2
.github/workflows/plugin.yaml vendored
View file

@ -21,7 +21,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 # v3.2.0 uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 # v3.2.0
with: with:
go-version: 1.18 go-version: 1.19.0
- name: Run GoReleaser - name: Run GoReleaser
uses: goreleaser/goreleaser-action@68acf3b1adf004ac9c2f0a4259e85c5f66e99bef # v3.0.0 uses: goreleaser/goreleaser-action@68acf3b1adf004ac9c2f0a4259e85c5f66e99bef # v3.0.0

2
go.mod
View file

@ -1,6 +1,6 @@
module k8s.io/ingress-nginx module k8s.io/ingress-nginx
go 1.18 go 1.19
require ( require (
github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a

2
images/custom-error-pages/rootfs/Dockerfile
View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM golang:1.18.2-alpine as builder FROM golang:1.19.0-alpine as builder
RUN apk add git RUN apk add git
WORKDIR /go/src/k8s.io/ingress-nginx/images/custom-error-pages WORKDIR /go/src/k8s.io/ingress-nginx/images/custom-error-pages

2
images/custom-error-pages/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/custom-error-pages module k8s.io/ingress-nginx/custom-error-pages
go 1.18 go 1.19
require github.com/prometheus/client_golang v1.11.0 require github.com/prometheus/client_golang v1.11.0

2
images/ext-auth-example-authsvc/rootfs/Dockerfile
View file

@ -1,4 +1,4 @@
FROM golang:1.18.2-alpine3.15 as builder FROM golang:1.19.0-alpine3.16 as builder
RUN mkdir /authsvc RUN mkdir /authsvc
WORKDIR /authsvc WORKDIR /authsvc
COPY . ./ COPY . ./

2
images/ext-auth-example-authsvc/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module example.com/authsvc module example.com/authsvc
go 1.18 go 1.19
require k8s.io/apimachinery v0.23.1 require k8s.io/apimachinery v0.23.1

2
images/kube-webhook-certgen/rootfs/Dockerfile
View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM --platform=$BUILDPLATFORM golang:1.18.2 as builder FROM --platform=$BUILDPLATFORM golang:1.19.0 as builder
ARG BUILDPLATFORM ARG BUILDPLATFORM
ARG TARGETARCH ARG TARGETARCH

2
images/kube-webhook-certgen/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module github.com/jet/kube-webhook-certgen module github.com/jet/kube-webhook-certgen
go 1.18 go 1.19
require ( require (
github.com/onrik/logrus v0.9.0 github.com/onrik/logrus v0.9.0

2
images/test-runner/Makefile
View file

@ -39,7 +39,7 @@ build: ensure-buildx
--progress=$(PROGRESS) \ --progress=$(PROGRESS) \
--pull \ --pull \
--build-arg BASE_IMAGE=$(NGINX_BASE_IMAGE) \ --build-arg BASE_IMAGE=$(NGINX_BASE_IMAGE) \
--build-arg GOLANG_VERSION=1.18.2 \ --build-arg GOLANG_VERSION=1.19.0 \
--build-arg ETCD_VERSION=3.4.3-0 \ --build-arg ETCD_VERSION=3.4.3-0 \
--build-arg K8S_RELEASE=v1.24.2 \ --build-arg K8S_RELEASE=v1.24.2 \
--build-arg RESTY_CLI_VERSION=0.27 \ --build-arg RESTY_CLI_VERSION=0.27 \