Merge pull request #61 from spolti/sync

Sync

Author: spolti

.pre-commit-config.yaml

@@ -13,7 +13,7 @@
 # limitations under the License.
 repos:
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.51.1
+    rev: v1.60.3
     hooks:
       - id: golangci-lint
         log_file: .pre-commit.log

Dockerfile

@@ -15,7 +15,7 @@
 ###############################################################################
 # Stage 1: Create the developer image for the BUILDPLATFORM only
 ###############################################################################
-ARG GOLANG_VERSION=1.21
+ARG GOLANG_VERSION=1.22
 ARG BUILD_BASE=develop
 FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi8/go-toolset:$GOLANG_VERSION AS develop
 
@@ -25,19 +25,20 @@ USER root
 ENV HOME=/root
 
 # Install build and dev tools
-# NOTE: Require python38 to install pre-commit
+# python is required for pre-commit
 RUN --mount=type=cache,target=/root/.cache/dnf:rw \
     dnf install --setopt=cachedir=/root/.cache/dnf -y --nodocs \
       nodejs \
-      python38 \
-    && ln -sf /usr/bin/python3 /usr/bin/python \
-    && ln -sf /usr/bin/pip3 /usr/bin/pip \
+      python3.11  \
+      python3.11-pip \
+    && alternatives --set python /usr/bin/python3.11 \
+    && alternatives --install /usr/bin/pip pip /usr/bin/pip3.11 1 \
     && true
 
 # Install pre-commit
 ENV PIP_CACHE_DIR=/root/.cache/pip
 RUN --mount=type=cache,target=/root/.cache/pip \
-    pip install pre-commit
+    /usr/bin/pip install pre-commit
 
 # When using the BuildKit backend, Docker predefines a set of ARG variables with
 # information on the platform of the node performing the build (build platform)
@@ -140,7 +141,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 ###############################################################################
 # Stage 3: Copy binaries only to create the smallest final runtime image
 ###############################################################################
-FROM registry.access.redhat.com/ubi8/ubi-micro:latest as runtime
+FROM registry.access.redhat.com/ubi9/ubi-micro:9.5 as runtime
 
 ARG USER=2000
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/kserve/rest-proxy
 
-go 1.21
+go 1.22.9
 
 require (
 	github.com/google/go-cmp v0.6.0

proxy/main.go

@@ -34,12 +34,13 @@ import (
 )
 
 const (
-	restProxyPortEnvVar     = "REST_PROXY_LISTEN_PORT"
-	restProxyGrpcMaxMsgSize = "REST_PROXY_GRPC_MAX_MSG_SIZE_BYTES"
-	restProxyGrpcPortEnvVar = "REST_PROXY_GRPC_PORT"
-	restProxyTlsEnvVar      = "REST_PROXY_USE_TLS"
-	tlsCertEnvVar           = "MM_TLS_KEY_CERT_PATH"
-	tlsKeyEnvVar            = "MM_TLS_PRIVATE_KEY_PATH"
+	restProxyPortEnvVar       = "REST_PROXY_LISTEN_PORT"
+	restProxyGrpcMaxMsgSize   = "REST_PROXY_GRPC_MAX_MSG_SIZE_BYTES"
+	restProxyGrpcPortEnvVar   = "REST_PROXY_GRPC_PORT"
+	restProxyTlsEnvVar        = "REST_PROXY_USE_TLS"
+	restProxySkipVerifyEnvVar = "REST_PROXY_SKIP_VERIFY"
+	tlsCertEnvVar             = "MM_TLS_KEY_CERT_PATH"
+	tlsKeyEnvVar              = "MM_TLS_PRIVATE_KEY_PATH"
 )
 
 var (
@@ -85,8 +86,20 @@ func run() error {
 	var transportCreds credentials.TransportCredentials
 	if useTLS, ok := os.LookupEnv(restProxyTlsEnvVar); ok && useTLS == "true" {
 		logger.Info("Using TLS")
+
+		skipVerifyBool := false
+		skipVerify, ok := os.LookupEnv(restProxySkipVerifyEnvVar)
+		if ok {
+			var err error
+			skipVerifyBool, err = strconv.ParseBool(skipVerify)
+			if err != nil {
+				logger.Error(err, "Failed to parse %s=%s to bool", restProxySkipVerifyEnvVar, skipVerify)
+				skipVerifyBool = false
+			}
+		}
+
 		transportCreds = credentials.NewTLS(&tls.Config{
-			InsecureSkipVerify: true,
+			InsecureSkipVerify: skipVerifyBool,
 		})
 	} else {
 		logger.Info("Not using TLS")