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

bumped go version to 1.18.1 (#8578)

Browse source
This commit is contained in:
Long Wu Yuan 2022-05-12 00:15:03 +05:30 committed by GitHub
parent 61fcca3a3a
commit 24b8e32b08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 52 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,11 +69,11 @@ jobs:
- name: Checkout
uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
- name: Set up Go 1.17
- name: Set up Go 1.18
id: go
uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2
with:
go-version: '1.17.6'
go-version: '1.18.2'
- name: Set up Docker Buildx
id: buildx
@ -133,7 +133,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2
with:
go-version: '1.17.6'
go-version: '1.18.2'
- name: cache
uses: actions/download-artifact@f023be2c48cc18debc3bacd34cb396e0295e2869 # v2
@ -403,12 +403,12 @@ jobs:
version: v0.11.1
image: kindest/node:v1.21.1
- name: Set up Go 1.17
- name: Set up Go 1.18
id: go
if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }}
uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2
with:
go-version: '1.17.6'
go-version: '1.18.2'
- name: kube-webhook-certgen image build
if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }}

2
go.mod
View file

@ -1,6 +1,6 @@
module k8s.io/ingress-nginx
go 1.17
go 1.18
require (
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
# limitations under the License.
FROM golang:1.17-alpine as builder
FROM golang:1.18.2-alpine as builder
RUN apk add git
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
go 1.17
go 1.18
require github.com/prometheus/client_golang v1.11.0

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

@ -1,4 +1,4 @@
FROM golang:1.17.6-alpine3.15 as builder
FROM golang:1.18.2-alpine3.15 as builder
RUN mkdir /authsvc
WORKDIR /authsvc
COPY . ./
@ -7,4 +7,4 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o authsvc authsvc.go
FROM gcr.io/distroless/base-debian11
COPY --from=builder /authsvc/authsvc /
EXPOSE 8080
ENTRYPOINT ["/authsvc"]
ENTRYPOINT ["/authsvc"]

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

@ -1,8 +1,7 @@
module example.com/authsvc
go 1.17
go 1.18
require (
github.com/google/uuid v1.1.2 // indirect
k8s.io/apimachinery v0.23.1 // indirect
)
require k8s.io/apimachinery v0.23.1
require github.com/google/uuid v1.1.2 // indirect

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

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

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

@ -1,14 +1,48 @@
module github.com/jet/kube-webhook-certgen
go 1.16
go 1.18
require (
github.com/onrik/logrus v0.9.0
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.1.3
github.com/tidwall/gjson v1.14.0 // indirect
k8s.io/api v0.22.6
k8s.io/apimachinery v0.22.6
k8s.io/client-go v0.22.6
k8s.io/kube-aggregator v0.22.6
)
require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/imdario/mergo v0.3.5 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tidwall/gjson v1.14.0 // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/klog/v2 v2.9.0 // indirect
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

2
images/test-runner/Makefile
View file

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