diff --git a/.github/workflows/fvt-base.yml b/.github/workflows/fvt-base.yml index 472e9ed2..2707fcb8 100644 --- a/.github/workflows/fvt-base.yml +++ b/.github/workflows/fvt-base.yml @@ -38,7 +38,7 @@ jobs: - name: Setup go uses: actions/setup-go@v4 with: - go-version: '1.19' + go-version: '1.20' - name: Start Minikube uses: medyagh/setup-minikube@v0.0.13 diff --git a/Dockerfile b/Dockerfile index c9dd0c7b..b8335857 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ ############################################################################### # Stage 2: Copy build assets to create the smallest final runtime image ############################################################################### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7 AS runtime +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 AS runtime ARG USER=2000 ARG IMAGE_VERSION diff --git a/Dockerfile.develop b/Dockerfile.develop index 46ee1356..bdd425bf 100644 --- a/Dockerfile.develop +++ b/Dockerfile.develop @@ -15,7 +15,7 @@ ############################################################################### # Create the develop, test, and build environment ############################################################################### -FROM registry.access.redhat.com/ubi8/go-toolset:1.19 +FROM registry.access.redhat.com/ubi8/go-toolset:1.20 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope # don't provide "default" values (e.g. 'ARG TARGETARCH=amd64') for non-buildx environments, @@ -23,7 +23,7 @@ FROM registry.access.redhat.com/ubi8/go-toolset:1.19 ARG TARGETOS ARG TARGETARCH -ARG OPENSHIFT_VERSION=4.9 +ARG OPENSHIFT_VERSION=4.12 ARG KUSTOMIZE_VERSION=4.5.2 ARG KUBEBUILDER_VERSION=v3.11.0 ARG CONTROLLER_GEN_VERSION=v0.11.4 @@ -110,7 +110,7 @@ RUN true \ # Use setup-envtest for kubebuilder to use K8s version 1.23+ for autoscaling/v2 (HPA) RUN true \ && go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest \ - && setup-envtest use 1.23 \ + && setup-envtest use 1.26 \ && true # For GitHub Action 'lint', work around error "detected dubious ownership in repository at '/workspace'" diff --git a/config/crd/bases/serving.kserve.io_clusterservingruntimes.yaml b/config/crd/bases/serving.kserve.io_clusterservingruntimes.yaml index 2b434b83..425a60b0 100644 --- a/config/crd/bases/serving.kserve.io_clusterservingruntimes.yaml +++ b/config/crd/bases/serving.kserve.io_clusterservingruntimes.yaml @@ -1,4 +1,4 @@ -# Copied from https://github.com/kserve/kserve/blob/v0.11.1/config/crd/serving.kserve.io_clusterservingruntimes.yaml +# Copied from https://github.com/kserve/kserve/blob/v0.11.2/config/crd/serving.kserve.io_clusterservingruntimes.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/config/crd/bases/serving.kserve.io_inferenceservices.yaml b/config/crd/bases/serving.kserve.io_inferenceservices.yaml index d572d99c..9b981900 100644 --- a/config/crd/bases/serving.kserve.io_inferenceservices.yaml +++ b/config/crd/bases/serving.kserve.io_inferenceservices.yaml @@ -1,4 +1,4 @@ -# Copied from https://github.com/kserve/kserve/blob/v0.11.1/config/crd/serving.kserve.io_inferenceservices.yaml +# Copied from https://github.com/kserve/kserve/blob/v0.11.2/config/crd/serving.kserve.io_inferenceservices.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/config/crd/bases/serving.kserve.io_servingruntimes.yaml b/config/crd/bases/serving.kserve.io_servingruntimes.yaml index 68083880..edf8d26b 100644 --- a/config/crd/bases/serving.kserve.io_servingruntimes.yaml +++ b/config/crd/bases/serving.kserve.io_servingruntimes.yaml @@ -1,4 +1,4 @@ -# Copied from https://github.com/kserve/kserve/blob/v0.11.1/config/crd/serving.kserve.io_servingruntimes.yaml +# Copied from https://github.com/kserve/kserve/blob/v0.11.2/config/crd/serving.kserve.io_servingruntimes.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/go.mod b/go.mod index 71c8c1dd..a81ee15e 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/kserve/modelmesh-serving -go 1.19 +go 1.20 require ( github.com/dereklstinson/cifar v0.0.0-20200421171932-5722a3b6a0c7 github.com/go-logr/logr v1.2.4 github.com/golang/protobuf v1.5.3 github.com/google/go-cmp v0.5.9 - github.com/kserve/kserve v0.11.1 + github.com/kserve/kserve v0.11.2 github.com/manifestival/controller-runtime-client v0.4.0 github.com/manifestival/manifestival v0.7.1 github.com/moverest/mnist v0.0.0-20160628192128-ec5d9d203b59 @@ -99,7 +99,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect golang.org/x/crypto v0.14.0 // indirect - golang.org/x/net v0.14.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect golang.org/x/sys v0.15.0 // indirect golang.org/x/term v0.15.0 // indirect diff --git a/go.sum b/go.sum index 9a5086b4..d4149aa7 100644 --- a/go.sum +++ b/go.sum @@ -416,8 +416,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kserve/kserve v0.11.1 h1:3gh2mmCkw2tbzhbN2zKKxtqDjt71V1K2MwpaiXF4KJI= -github.com/kserve/kserve v0.11.1/go.mod h1:qCEKO7gXwWm8sx4LGrKHYjK+SKVWQ35gAEVaE1a0Wug= +github.com/kserve/kserve v0.11.2 h1:ZYwj3/04JrwIiqIrVjPhcX5umHFj3gHAhbtghfseoPo= +github.com/kserve/kserve v0.11.2/go.mod h1:x44/b0J4y8kqNUuxcHP386jN3BAk5DRoLvhebnF+VP8= github.com/logrusorgru/aurora/v3 v3.0.0 h1:R6zcoZZbvVcGMvDCKo45A9U/lzYyzl5NfYIvznmDfE4= github.com/logrusorgru/aurora/v3 v3.0.0/go.mod h1:vsR12bk5grlLvLXAYrBsb5Oc/N+LxAlxggSjiwMnCUc= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= diff --git a/scripts/deploy/iks/test-fvt.sh b/scripts/deploy/iks/test-fvt.sh index 5dd14ef4..27025d82 100644 --- a/scripts/deploy/iks/test-fvt.sh +++ b/scripts/deploy/iks/test-fvt.sh @@ -41,8 +41,8 @@ run_fvt() { export KUBECONFIG=~/.kube/config rm -rf /usr/local/go - wget https://go.dev/dl/go1.19.9.linux-amd64.tar.gz - tar -C /usr/local -xzf go1.19.9.linux-amd64.tar.gz + wget https://go.dev/dl/go1.20.4.linux-amd64.tar.gz + tar -C /usr/local -xzf go1.20.4.linux-amd64.tar.gz go install github.com/onsi/ginkgo/v2/ginkgo export PATH=/root/go/bin/:$PATH