release: Update KServe/dependencies

.github/workflows/fvt.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.18.7'
+          go-version: '1.19'
 
       - name: Start Minikube
         uses: medyagh/setup-minikube@v0.0.11

.golangci.yaml

@@ -34,7 +34,7 @@ run:
   # which dirs to skip: issues from them won't be reported;
   # can use regexp here: generated.*, regexp is applied on full path;
   # default value is empty list, but default dirs are skipped independently
-  # from this option's value (see skip-dirs-use-default).
+  # of this option's value (see skip-dirs-use-default).
   # "/" will be replaced by current OS file path separator to properly work
   # on Windows.
   # skip-dirs:
@@ -215,7 +215,7 @@ linters-settings:
 
 issues:
   # List of regexps of issue texts to exclude, empty list by default.
-  # But independently from this option we use default exclude patterns,
+  # But independently of this option we use default exclude patterns,
   # it can be disabled by `exclude-use-default: false`. To list all
   # excluded by default patterns execute `golangci-lint run --help`
   # exclude:
@@ -243,6 +243,11 @@ issues:
         - staticcheck
       text: "SA9003:"
 
+    # Exclude some deprecation errors
+    - linters:
+        - staticcheck
+      text: "SA1019:"
+
     # Exclude lll issues for long lines with go:generate
     - linters:
         - lll

Dockerfile.develop

@@ -15,7 +15,7 @@
 ###############################################################################
 # Create the develop, test, and build environment
 ###############################################################################
-FROM registry.access.redhat.com/ubi8/go-toolset:1.18
+FROM registry.access.redhat.com/ubi8/go-toolset:1.19
 
 # 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,
@@ -90,16 +90,23 @@ RUN true\
 # won't invalidate earlier download layers
 RUN go mod download
 
-# Install controller-gen
+# Export the Go binary path for controller-gen and ginkgo CLIs
+ENV PATH $HOME/go/bin:$PATH
+
+# Install controller-gen to generate util code and Kubernetes YAMLs for API changes
+RUN true \
+    && go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION} \
+    && controller-gen --version \
+    && true
+
+# Install the Ginkgo test framework
 RUN true \
-    && mkdir /tmp/controller-gen-tmp && cd /tmp/controller-gen-tmp \
-    && go mod init tmp \
-    && go get sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION} \
-    && rm -rf /tmp/controller-gen-tmp \
+    && go install github.com/onsi/ginkgo/v2/ginkgo \
+    && ginkgo version \
     && true
 
-RUN go install github.com/onsi/ginkgo/v2/ginkgo
-ENV PATH=/root/go/bin/:$PATH
+# For GitHub Action 'lint', work around error "detected dubious ownership in repository at '/workspace'"
+RUN git config --system --add safe.directory /workspace
 
-# the ubi/go-toolset image doesn't define ENTRYPOINT or CMD, but we need it to run 'make develop'
+# The ubi/go-toolset image doesn't define ENTRYPOINT or CMD, but we need it to run 'make develop'
 CMD /bin/bash

Makefile

@@ -28,7 +28,7 @@ IMG ?= kserve/modelmesh-controller:latest
 # Namespace to deploy model-serve into
 NAMESPACE ?= "model-serving"
 
-CONTROLLER_GEN_VERSION ?= "v0.7.0"
+CONTROLLER_GEN_VERSION ?= "v0.8.0"
 
 CRD_OPTIONS ?= "crd:maxDescLen=0"
 
@@ -54,7 +54,7 @@ test:
 # Run fvt tests. This requires an etcd, kubernetes connection, and model serving installation. Ginkgo CLI is used to run them in parallel
 .PHONY: fvt
 fvt:
-	ginkgo -v -procs=2 --progress --fail-fast fvt/predictor fvt/scaleToZero fvt/storage fvt/hpa --timeout=50m
+	ginkgo -v -procs=2 --fail-fast fvt/predictor fvt/scaleToZero fvt/storage fvt/hpa --timeout=50m
 
 
 # Command to regenerate the grpc go files from the proto files
@@ -146,7 +146,7 @@ generate: controller-gen
 
 # Build the final runtime docker image
 .PHONY: build
-build:
+build: build.develop
 	./scripts/build_docker.sh --target runtime --engine $(ENGINE)
 
 # Build the develop docker image
@@ -181,11 +181,7 @@ controller-gen:
 ifeq (, $(shell which controller-gen))
 	@{ \
 	set -e ;\
-	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
-	cd $$CONTROLLER_GEN_TMP_DIR ;\
-	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION} ;\
-	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION} ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
 else

apis/serving/v1alpha1/predictor_types.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package v1alpha1
 
 import (

apis/serving/v1alpha1/predictor_types_test.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package v1alpha1
 
 import (

apis/serving/v1alpha1/servingruntime_types.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package v1alpha1
 
 import (

apis/serving/v1alpha1/servingruntime_webhook.go

@@ -1,17 +1,17 @@
-//Copyright 2021 IBM Corporation
+// Copyright 2021 IBM Corporation
 //
-//Licensed under the Apache License, Version 2.0 (the "License");
-//you may not use this file except in compliance with the License.
-//You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-//Unless required by applicable law or agreed to in writing, software
-//distributed under the License is distributed on an "AS IS" BASIS,
-//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//See the License for the specific language governing permissions and
-//limitations under the License.
+//     http://www.apache.org/licenses/LICENSE-2.0
 //
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package v1alpha1
 
 import (
@@ -29,7 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
-//+kubebuilder:webhook:path=/validate-serving-modelmesh-io-v1alpha1-servingruntime,mutating=false,failurePolicy=fail,sideEffects=None,groups=serving.kserve.io,resources=servingruntimes;clusterservingruntimes,verbs=create;update,versions=v1alpha1,name=servingruntime.modelmesh-webhook-server.default,admissionReviewVersions=v1
+// +kubebuilder:webhook:path=/validate-serving-modelmesh-io-v1alpha1-servingruntime,mutating=false,failurePolicy=fail,sideEffects=None,groups=serving.kserve.io,resources=servingruntimes;clusterservingruntimes,verbs=create;update,versions=v1alpha1,name=servingruntime.modelmesh-webhook-server.default,admissionReviewVersions=v1
 type ServingRuntimeWebhook struct {
 	Client  client.Client
 	decoder *admission.Decoder

apis/serving/v1alpha1/servingruntime_webhook_test.go

@@ -1,18 +1,17 @@
-/*
-Copyright 2021 IBM Corporation
+// Copyright 2021 IBM Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
 package v1alpha1
 
 import (

config/crd/bases/serving.kserve.io_clusterservingruntimes.yaml

@@ -1,5 +1,4 @@
-# Copied from https://github.com/kserve/kserve/blob/335dfbcc461a3b2127354aeb7df2414fb11ddfe3/config/crd/serving.kserve.io_clusterservingruntimes.yaml
-#
+# Copied from https://github.com/kserve/kserve/blob/v0.11.0-rc0/config/crd/serving.kserve.io_clusterservingruntimes.yaml
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata: