Update manifests for v0.13.0 (#239)

* Update manifests for v0.13.0 * CI with 3.5.0 * Bump microk8s to 1.26
canonical · Jun 18, 2024 · d3bfd54 · d3bfd54
1 parent 0015736
commit d3bfd54
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 689 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -55,8 +55,9 @@ jobs:
         uses: charmed-kubernetes/actions-operator@main
         with:
           provider: microk8s
-          channel: 1.25-strict/stable
+          channel: 1.26-strict/stable
           juju-channel: 3.5/stable
+          bootstrap-options: "--agent-version 3.5.0"
           microk8s-addons: "dns storage rbac metallb:10.64.140.43-10.64.140.49"
           charmcraft-channel: latest/candidate
       - run: |

diff --git a/charms/kserve-controller/config.yaml b/charms/kserve-controller/config.yaml
@@ -18,7 +18,6 @@ options:
     default: | 
       configmap__agent : ''
       configmap__batcher : ''
-      configmap__explainers__alibi : ''
       configmap__explainers__art : ''
       configmap__logger : ''
       configmap__router : ''

diff --git a/charms/kserve-controller/metadata.yaml b/charms/kserve-controller/metadata.yaml
@@ -18,7 +18,7 @@ resources:
   kserve-controller-image:
     type: oci-image
     description: OCI image for kserve controller
-    upstream-source: kserve/kserve-controller:v0.12.1
+    upstream-source: kserve/kserve-controller:v0.13.0
   kube-rbac-proxy-image:
     type: oci-image
     description: OCI image for kube rbac proxy

diff --git a/charms/kserve-controller/src/charm.py b/charms/kserve-controller/src/charm.py
@@ -403,7 +403,6 @@ def get_images(
 
         # This are special cases comfigmap where they need to be split into image and version
         for image_name in [
-            "configmap__explainers__alibi",
             "configmap__explainers__art",
         ]:
             images[f"{image_name}__image"], images[f"{image_name}__version"] = images[

diff --git a/charms/kserve-controller/src/default-custom-images.json b/charms/kserve-controller/src/default-custom-images.json
@@ -1,21 +1,20 @@
 {
-    "configmap__agent": "kserve/agent:v0.12.1",
-    "configmap__batcher": "kserve/agent:v0.12.1",
-    "configmap__explainers__alibi": "kserve/alibi-explainer:latest",
+    "configmap__agent": "kserve/agent:v0.13.0",
+    "configmap__batcher": "kserve/agent:v0.13.0",
     "configmap__explainers__art": "kserve/art-explainer:latest",
-    "configmap__logger": "kserve/agent:v0.12.1",
-    "configmap__router": "kserve/router:v0.12.1",
-    "configmap__storageInitializer": "kserve/storage-initializer:v0.12.1",
-    "serving_runtimes__huggingfaceserver": "kserve/huggingfaceserver:v0.12.1",
-    "serving_runtimes__lgbserver": "kserve/lgbserver:v0.12.1",
+    "configmap__logger": "kserve/agent:v0.13.0",
+    "configmap__router": "kserve/router:v0.13.0",
+    "configmap__storageInitializer": "kserve/storage-initializer:v0.13.0",
+    "serving_runtimes__huggingfaceserver": "kserve/huggingfaceserver:v0.13.0",
+    "serving_runtimes__lgbserver": "kserve/lgbserver:v0.13.0",
     "serving_runtimes__kserve_mlserver": "docker.io/seldonio/mlserver:1.3.2",
-    "serving_runtimes__paddleserver": "kserve/paddleserver:v0.12.1",
-    "serving_runtimes__pmmlserver": "kserve/pmmlserver:v0.12.1",
-    "serving_runtimes__sklearnserver": "kserve/sklearnserver:v0.12.1",
+    "serving_runtimes__paddleserver": "kserve/paddleserver:v0.13.0",
+    "serving_runtimes__pmmlserver": "kserve/pmmlserver:v0.13.0",
+    "serving_runtimes__sklearnserver": "kserve/sklearnserver:v0.13.0",
     "serving_runtimes__tensorflow_serving": "tensorflow/serving:2.6.2",
     "serving_runtimes__torchserve": "pytorch/torchserve-kfs:0.9.0",
     "serving_runtimes__tritonserver": "nvcr.io/nvidia/tritonserver:23.05-py3",
-    "serving_runtimes__xgbserver": "kserve/xgbserver:v0.12.1"
+    "serving_runtimes__xgbserver": "kserve/xgbserver:v0.13.0"
 }
 
 

diff --git a/charms/kserve-controller/src/templates/auth_manifests.yaml.j2 b/charms/kserve-controller/src/templates/auth_manifests.yaml.j2
@@ -95,9 +95,7 @@ rules:
   verbs:
   - create
   - get
-  - list
   - update
-  - watch
 - apiGroups:
   - ""
   resources:
@@ -134,18 +132,14 @@ rules:
   - create
   - delete
   - get
-  - list
   - patch
   - update
-  - watch
 - apiGroups:
   - ""
   resources:
   - serviceaccounts
   verbs:
   - get
-  - list
-  - watch
 - apiGroups:
   - ""
   resources:

diff --git a/charms/kserve-controller/src/templates/configmap_manifests.yaml.j2 b/charms/kserve-controller/src/templates/configmap_manifests.yaml.j2
@@ -44,10 +44,6 @@ data:
     }
   explainers: |-
     {
-        "alibi": {
-            "image" : "{{ configmap__explainers__alibi__image }}",
-            "defaultImageVersion": "{{ configmap__explainers__alibi__version }}"
-        },
         "art": {
             "image" : "{{ configmap__explainers__art__image }}",
             "defaultImageVersion": "{{ configmap__explainers__art__version }}"