Merge branch 'main' of https://github.com/kserve/rest-proxy into patch-1

* 'main' of https://github.com/kserve/rest-proxy:
  chore: Build not push on Pull Request (kserve#22)
  Revert "Push multi-arch docker image (#18)" (kserve#21)
  chore: Update dependencies (kserve#19)
  Push multi-arch docker image (#18)

.github/workflows/build-and-push.yml

@@ -38,6 +38,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
+        if: github.event_name == 'push'
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USER }}
@@ -66,6 +67,6 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
-          push: true
+          push: ${{ github.event_name == 'push' }}
           tags: ${{ env.IMAGE_ID }}:${{ env.VERSION }}
           target: runtime

.pre-commit-config.yaml

@@ -13,7 +13,7 @@
 # limitations under the License.
 repos:
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.43.0
+    rev: v1.50.1
     hooks:
       - id: golangci-lint
         entry: golangci-lint run

Dockerfile

@@ -15,10 +15,10 @@
 ###############################################################################
 # Stage 1: Create the develop, test, and build environment
 ###############################################################################
-FROM  registry.access.redhat.com/ubi8/ubi-minimal:8.4 AS develop
+FROM  registry.access.redhat.com/ubi8/ubi-minimal:8.7 AS develop
 
-ARG GOLANG_VERSION=1.16.6
-ARG PROTOC_VERSION=3.14.0
+ARG GOLANG_VERSION=1.18.9
+ARG PROTOC_VERSION=21.12
 
 USER root
 
@@ -53,6 +53,8 @@ RUN set -eux; \
     unzip protoc.zip -x readme.txt -d /usr/local; \
     protoc --version
 
+COPY go.mod go.sum ./
+
 # Install go protoc plugins
 ENV PATH /root/go/bin:$PATH
 RUN go get google.golang.org/protobuf/cmd/protoc-gen-go \
@@ -67,7 +69,6 @@ RUN git init && \
     rm -rf .git
 
 # Download dependiencies before copying the source so they will be cached
-COPY go.mod go.sum ./
 RUN go mod download
 
 ###############################################################################

go.mod

@@ -1,11 +1,36 @@
 module github.com/kserve/rest-proxy
 
-go 1.16
+go 1.18
 
 require (
-	github.com/google/go-cmp v0.5.6
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0
-	google.golang.org/grpc v1.40.0
-	google.golang.org/protobuf v1.27.1
-	sigs.k8s.io/controller-runtime v0.10.0
+	github.com/google/go-cmp v0.5.9
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0
+	google.golang.org/grpc v1.51.0
+	google.golang.org/protobuf v1.28.1
+	sigs.k8s.io/controller-runtime v0.14.1
+)
+
+require (
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/zapr v1.2.3 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/text v0.5.0 // indirect
+	google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/apimachinery v0.26.0 // indirect
+	k8s.io/klog/v2 v2.80.1 // indirect
+	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )