Upgrade KServe, upstream manifests (#417)

* Upgrade KNative to 1.8.5. Closes #404

* Upgrade cert-manager to 1.10.2. Closes #405.

* Upgrade ASM to 1.16.2-2. Closes #406

* Upgrade upstream manifests to 1.7.0-rc.1

* Upgrade KServe to 0.10. Closes #408

* Upgrade upstream versions

* Remove unused patches

kubeflow/contrib/kserve/Makefile

@@ -10,17 +10,9 @@ KFCTXT=$(NAME)
 .PHONY: apply
 apply: hydrate
 	# Apply App kserve
-	# To resolve https://github.com/kubeflow/gcp-blueprints/issues/384,
-	# we apply runtime manifests after the corresponding CRDs become available
-	# 1. Move runtime manifests into a separate subdirectory
-	mkdir $(build_dir)/runtimes
-	mv $(build_dir)/serving*clusterservingruntime* $(build_dir)/runtimes/
-	# 2. Apply the remaining manifests
 	kubectl --context=$(KFCTXT) apply -f $(build_dir)
-	# 3. Wait until CRDs become available or exit in 30s
+	# Wait until CRDs become available or exit in 30s
 	kubectl wait --for condition=established --timeout=30s crd/clusterservingruntimes.serving.kserve.io
-	# 4. Apply runtime manifests
-	kubectl --context=$(KFCTXT) apply -f $(build_dir)/runtimes
 	# Patch knative configmap
 	kubectl --context=$(KFCTXT) patch cm config-domain --namespace knative-serving --type merge -p '{"data":{"$(NAME).endpoints.$(PROJECT).cloud.goog": ""}}'
 

kubeflow/contrib/kserve/kustomization.yaml

@@ -8,11 +8,9 @@ commonLabels:
 resources:
 - models-web-app
 - kserve/upstream/kserve_kubeflow.yaml
-# - cluster-role.yaml
-# - web-app-authorization-policy.yaml
+- kserve/upstream/kserve-runtimes.yaml
 patchesStrategicMerge:
-- patches/statefulset.yaml
-# - patches/namespace.yaml
+- patches/deployment.yaml
 - patches/web-app-sidecar.yaml
 - web-app-authorization-policy.yaml
 patchesJson6902:
@@ -23,36 +21,8 @@ patchesJson6902:
     name: serving-cert
     namespace: kubeflow
   path: patches/webhook-certificate.yaml
-- target:
-    version: v1
-    kind: ConfigMap
-    name: kserve-config
-    namespace: kubeflow
-  path: patches/config-param.yaml
 generatorOptions:
   disableNameSuffixHash: true
-# To make namespace for standalone installation kustomizable,
-# variabalize ingress gateway, webhook service name and
-# kserve namespace in webhook configurations
-# configMapGenerator:
-# Copied from kfserving, but converted to patches/config-param.yaml
-# becuase it cannot detect the kserve-config file by kustomize.
-# - name: kserve-config
-#   behavior: replace
-#   literals:
-#   - ingressGateway=kubeflow/kubeflow-gateway
-# - name: kserve-models-web-app-config
-#   behavior: replace
-#   literals:
-#   - USERID_HEADER=kubeflow-userid
 configurations:
 - params.yaml
-- kserve-params.yaml
-vars:
-- name: ingressGateway
-  objref:
-    kind: ConfigMap
-    name: kserve-config
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.ingressGateway
+- kserve-params.yaml

kubeflow/contrib/kserve/patches/statefulset.yaml → kubeflow/contrib/kserve/patches/deployment.yaml

@@ -1,5 +1,5 @@
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata: # kpt-merge: kserve/kserve-controller-manager
   name: kserve-controller-manager
   namespace: kubeflow

kubeflow/pull-upstream.sh

@@ -16,9 +16,9 @@
 
 set -ex
 
-export KUBEFLOW_MANIFESTS_VERSION=v1.6.1
+export KUBEFLOW_MANIFESTS_VERSION=v1.7.0-rc.2
 export KUBEFLOW_MANIFESTS_REPO=https://github.com/kubeflow/manifests.git
-export KUBEFLOW_PIPELINES_VERSION=2.0.0-alpha.6
+export KUBEFLOW_PIPELINES_VERSION=2.0.0-alpha.7
 export KUBEFLOW_PIPELINES_REPO=https://github.com/kubeflow/pipelines.git
 
 # Pull Kubeflow Pipelines upstream manifests.
@@ -104,7 +104,7 @@ if [ -d common/istio/upstream/ ]; then
     rm -rf common/istio/upstream/
 fi
 mkdir -p common/istio
-kpt pkg get "${KUBEFLOW_MANIFESTS_REPO}/common/istio-1-14/@${KUBEFLOW_MANIFESTS_VERSION}" common/istio/upstream/
+kpt pkg get "${KUBEFLOW_MANIFESTS_REPO}/common/istio-1-16/@${KUBEFLOW_MANIFESTS_VERSION}" common/istio/upstream/
 rm common/istio/upstream/Kptfile
 
 if [ -d common/cert-manager/upstream/ ]; then