Skip to content

Commit 7dca024

Browse files
akshaysnguptaakshaysngupta
authored
cp: k8s client upgrade and image change (#1636)
* upgrade k8s go-client version to 1.30 (#1633) * upgrade go-client version * update go version * fix tests * Add publish script for helm and images; upgrade binary image to ubuntu 22.04 (#1635) * helm and docker scripts * update images * upload to account
1 parent 66dda36 commit 7dca024

File tree

15 files changed

+250
-378
lines changed

15 files changed

+250
-378
lines changed

‎.github/workflows/merge-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Set up Go
3434
uses: actions/[email protected]
3535
with:
36-
go-version: '1.19.2'
36+
go-version: '1.22.5'
3737
- name: Go and Helm lint check
3838
run: make lint-all
3939
- name: Go vet

‎Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ARG BUILDPLATFORM=linux/amd64
22
ARG BUILD_BASE_IMAGE
3+
ARG BINARY_BASE_IMAGE
34

45
FROM --platform=$BUILDPLATFORM $BUILD_BASE_IMAGE AS build
56
WORKDIR /azure
@@ -29,7 +30,7 @@ RUN make build \
2930

3031
#RUN ldd ./bin/appgw-ingress 2>&1 | grep 'not a dynamic executable'
3132

32-
FROM ubuntu:20.04 AS final
33+
FROM $BINARY_BASE_IMAGE AS final
3334
COPY --from=build /azure/bin/appgw-ingress /appgw-ingress
3435
RUN apt-get update
3536
RUN apt-get install -y ca-certificates openssl

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ GO_BINARY_NAME ?= appgw-ingress
1515
GOOS ?= linux
1616
GARCH ?= arm64
1717

18-
BUILD_BASE_IMAGE ?= golang:1.19.5
18+
BUILD_BASE_IMAGE ?= golang:1.22.5-bookworm
19+
BINARY_BASE_IMAGE ?= ubuntu:22.04
1920

2021
REPO ?= appgwreg.azurecr.io
2122
IMAGE_NAME = public/azure-application-gateway/kubernetes-ingress-staging
@@ -57,6 +58,7 @@ build-image-multi-arch:
5758
@docker buildx build $(IMAGE_RESULT_FLAG) \
5859
--platform $(IMAGE_PLATFORMS) \
5960
--build-arg "BUILD_BASE_IMAGE=$(BUILD_BASE_IMAGE)" \
61+
--build-arg "BINARY_BASE_IMAGE=$(BINARY_BASE_IMAGE) \
6062
--build-arg "BUILD_TAG=$(BUILD_TAG)" \
6163
--build-arg "BUILD_DATE=$(BUILD_DATE)" \
6264
--build-arg "GIT_HASH=$(GIT_HASH)" \

‎go.mod‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/Azure/application-gateway-kubernetes-ingress
22

3-
go 1.19
3+
go 1.22.0
4+
5+
toolchain go1.22.4
46

57
require (
68
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible
@@ -14,15 +16,15 @@ require (
1416
github.com/knative/pkg v0.0.0-20190619032946-d90a9bc97dde
1517
github.com/kylelemons/godebug v1.1.0
1618
github.com/onsi/ginkgo v1.16.4
17-
github.com/onsi/ginkgo/v2 v2.7.0
18-
github.com/onsi/gomega v1.24.1
19+
github.com/onsi/ginkgo/v2 v2.15.0
20+
github.com/onsi/gomega v1.31.0
1921
github.com/prometheus/client_golang v1.7.1
2022
github.com/spf13/pflag v1.0.5
2123
gopkg.in/yaml.v2 v2.4.0
22-
k8s.io/api v0.20.0-beta.1
23-
k8s.io/apimachinery v0.20.0-beta.1
24-
k8s.io/client-go v0.20.0-beta.1
25-
k8s.io/klog/v2 v2.70.1
24+
k8s.io/api v0.30.3
25+
k8s.io/apimachinery v0.30.3
26+
k8s.io/client-go v0.30.3
27+
k8s.io/klog/v2 v2.120.1
2628
)
2729

2830
require (
@@ -39,48 +41,54 @@ require (
3941
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4042
github.com/davecgh/go-spew v1.1.1 // indirect
4143
github.com/dimchansky/utfbom v1.1.1 // indirect
44+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4245
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4346
github.com/fsnotify/fsnotify v1.4.9 // indirect
44-
github.com/go-logr/logr v1.2.3 // indirect
47+
github.com/go-logr/logr v1.4.1 // indirect
48+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
49+
github.com/go-openapi/jsonreference v0.20.2 // indirect
50+
github.com/go-openapi/swag v0.22.3 // indirect
51+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
4552
github.com/gogo/protobuf v1.3.2 // indirect
4653
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
47-
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
48-
github.com/golang/protobuf v1.5.2 // indirect
49-
github.com/google/go-cmp v0.5.9 // indirect
54+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
55+
github.com/golang/protobuf v1.5.4 // indirect
56+
github.com/google/gnostic-models v0.6.8 // indirect
57+
github.com/google/go-cmp v0.6.0 // indirect
5058
github.com/google/gofuzz v1.2.0 // indirect
51-
github.com/google/uuid v1.1.2 // indirect
52-
github.com/googleapis/gnostic v0.4.1 // indirect
53-
github.com/hashicorp/golang-lru v0.5.1 // indirect
59+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
60+
github.com/google/uuid v1.3.0 // indirect
5461
github.com/imdario/mergo v0.3.13 // indirect
62+
github.com/josharian/intern v1.0.0 // indirect
5563
github.com/json-iterator/go v1.1.12 // indirect
56-
github.com/kr/text v0.2.0 // indirect
64+
github.com/mailru/easyjson v0.7.7 // indirect
5765
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
5866
github.com/mitchellh/go-homedir v1.1.0 // indirect
5967
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6068
github.com/modern-go/reflect2 v1.0.2 // indirect
61-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
69+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6270
github.com/nxadm/tail v1.4.8 // indirect
6371
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect
6472
github.com/pkg/errors v0.9.1 // indirect
6573
github.com/prometheus/client_model v0.2.0 // indirect
6674
github.com/prometheus/common v0.26.0 // indirect
6775
github.com/prometheus/procfs v0.8.0 // indirect
68-
github.com/stretchr/testify v1.7.1 // indirect
69-
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
70-
golang.org/x/net v0.3.0 // indirect
71-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
72-
golang.org/x/sys v0.3.0 // indirect
73-
golang.org/x/term v0.3.0 // indirect
74-
golang.org/x/text v0.5.0 // indirect
75-
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
76+
golang.org/x/crypto v0.21.0 // indirect
77+
golang.org/x/net v0.23.0 // indirect
78+
golang.org/x/oauth2 v0.10.0 // indirect
79+
golang.org/x/sys v0.18.0 // indirect
80+
golang.org/x/term v0.18.0 // indirect
81+
golang.org/x/text v0.14.0 // indirect
82+
golang.org/x/time v0.3.0 // indirect
83+
golang.org/x/tools v0.18.0 // indirect
7684
google.golang.org/appengine v1.6.7 // indirect
77-
google.golang.org/protobuf v1.28.0 // indirect
78-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
85+
google.golang.org/protobuf v1.33.0 // indirect
7986
gopkg.in/inf.v0 v0.9.1 // indirect
8087
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8188
gopkg.in/yaml.v3 v3.0.1 // indirect
82-
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488 // indirect
83-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
84-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
89+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
90+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
91+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
92+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
8593
sigs.k8s.io/yaml v1.3.0 // indirect
8694
)

0 commit comments

Comments
 (0)