Merge pull request #2565 from anggao/fix-keda-notebook

Fix keda notebook testing
SeldonIO · Oct 23, 2020 · 9da1f5e · 9da1f5e
2 parents 2f6b3d7 + 7c93b2a
commit 9da1f5e
Show file tree

Hide file tree

Showing 13 changed files with 5,629 additions and 18,851 deletions.
diff --git a/examples/keda/keda_prom_auto_scale.ipynb b/examples/keda/keda_prom_auto_scale.ipynb
@@ -39,7 +39,9 @@
    "source": [
     "## Install Seldon Core\n",
     "\n",
-    "Install Seldon Core as described in [docs](https://docs.seldon.io/projects/seldon-core/en/latest/workflow/install.html)"
+    "Install Seldon Core as described in [docs](https://docs.seldon.io/projects/seldon-core/en/latest/workflow/install.html)\n",
+    "\n",
+    "Make sure add `--set istio.keda=true`"
    ],
    "cell_type": "markdown",
    "metadata": {}
@@ -56,6 +58,15 @@
    "cell_type": "markdown",
    "metadata": {}
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!helm install seldon-core-analytics ../../helm-charts/seldon-core-analytics -n seldon-system --wait"
+   ]
+  },
   {
    "source": [
     "## Install KEDA"

diff --git a/examples/keda/model_with_keda_prom.yaml b/examples/keda/model_with_keda_prom.yaml
@@ -26,8 +26,7 @@ spec:
             serverAddress: http://seldon-core-analytics-prometheus-seldon.seldon-system.svc.cluster.local
             metricName: access_frequency
             threshold: '10'
-            query: rate(seldon_api_executor_client_requests_seconds_count{seldon_app=~"seldon-model-example"}[10s])
-        terminationGracePeriodSeconds: 1
+            query: rate(seldon_api_executor_client_requests_seconds_count{seldon_app=~"seldon-model-example"}[1m])
     graph:
       children: []
       endpoint:

diff --git a/helm-charts/seldon-core-operator/templates/clusterrole_seldon-manager-role.yaml b/helm-charts/seldon-core-operator/templates/clusterrole_seldon-manager-role.yaml
@@ -79,9 +79,9 @@ rules:
   - patch
   - update
 - apiGroups:
-  - keda.sh/v1alpha1
+  - keda.sh
   resources:
-  - ScaledObject
+  - scaledobjects
   verbs:
   - create
   - delete
@@ -91,9 +91,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - keda.sh/v1alpha1
+  - keda.sh
   resources:
-  - ScaledObject/status
+  - scaledobjects/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - keda.sh
+  resources:
+  - scaledobjects/status
   verbs:
   - get
   - patch

diff --git a/...rator/templates/customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml b/...rator/templates/customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml
diff --git a/...or/templates/customresourcedefinition_v1_seldondeployments.machinelearning.seldon.io.yaml b/...or/templates/customresourcedefinition_v1_seldondeployments.machinelearning.seldon.io.yaml
diff --git a/operator/config/crd/bases/machinelearning.seldon.io_seldondeployments.yaml b/operator/config/crd/bases/machinelearning.seldon.io_seldondeployments.yaml
diff --git a/operator/config/crd_v1/bases/machinelearning.seldon.io_seldondeployments.yaml b/operator/config/crd_v1/bases/machinelearning.seldon.io_seldondeployments.yaml
diff --git a/operator/config/rbac/role.yaml b/operator/config/rbac/role.yaml
@@ -74,9 +74,9 @@ rules:
   - patch
   - update
 - apiGroups:
-  - keda.sh/v1alpha1
+  - keda.sh
   resources:
-  - ScaledObject
+  - scaledobjects
   verbs:
   - create
   - delete
@@ -86,9 +86,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - keda.sh/v1alpha1
+  - keda.sh
   resources:
-  - ScaledObject/status
+  - scaledobjects/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - keda.sh
+  resources:
+  - scaledobjects/status
   verbs:
   - get
   - patch

diff --git a/operator/controllers/seldondeployment_controller.go b/operator/controllers/seldondeployment_controller.go
@@ -1675,8 +1675,9 @@ func (r *SeldonDeploymentReconciler) completeServiceCreation(instance *machinele
 // +kubebuilder:rbac:groups=networking.istio.io,resources=destinationrules/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=autoscaling,resources=horizontalpodautoscalers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=autoscaling,resources=horizontalpodautoscalers/status,verbs=get;update;patch
-// +kubebuilder:rbac:groups=keda.sh/v1alpha1,resources=ScaledObject,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=keda.sh/v1alpha1,resources=ScaledObject/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=keda.sh,resources=scaledobjects,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=keda.sh,resources=scaledobjects/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=keda.sh,resources=scaledobjects/finalizers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=policy,resources=poddisruptionbudgets,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=policy,resources=poddisruptionbudgets/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=machinelearning.seldon.io,resources=seldondeployments,verbs=get;list;watch;create;update;patch;delete

diff --git a/python/licenses/license.txt b/python/licenses/license.txt
@@ -147,7 +147,7 @@ SOFTWARE.
 
 
 Markdown
-3.3.1
+3.3.2
 BSD License
 Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)
 Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
@@ -3401,7 +3401,7 @@ limitations under the License.
 
 
 seldon-core
-1.3.0.dev0
+1.4.0.dev0
 Apache 2.0
                                  Apache License
                            Version 2.0, January 2004
@@ -4897,7 +4897,7 @@ Apache Software License
 
 
 urllib3
-1.25.10
+1.25.11
 MIT License
 MIT License
 
@@ -4952,7 +4952,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 zipp
-3.3.0
+3.3.1
 MIT License
 Copyright Jason R. Coombs
 

diff --git a/python/licenses/license_info.csv b/python/licenses/license_info.csv
@@ -4,7 +4,7 @@
 "Flask-OpenTracing","1.1.0","BSD License"
 "Jinja2","2.11.2","BSD License"
 "Keras-Preprocessing","1.1.2","MIT License"
-"Markdown","3.3.1","BSD License"
+"Markdown","3.3.2","BSD License"
 "MarkupSafe","1.1.1","BSD License"
 "PyYAML","5.3.1","MIT License"
 "Werkzeug","1.0.1","BSD License"
@@ -42,7 +42,7 @@
 "requests","2.24.0","Apache Software License"
 "requests-oauthlib","1.3.0","BSD License"
 "rsa","4.6","Apache Software License"
-"seldon-core","1.3.0.dev0","Apache 2.0"
+"seldon-core","1.4.0.dev0","Apache 2.0"
 "six","1.15.0","MIT License"
 "tensorboard","2.3.0","Apache Software License"
 "tensorboard-plugin-wit","1.7.0","Apache 2.0"
@@ -52,6 +52,6 @@
 "threadloop","1.0.2","MIT License"
 "thrift","0.13.0","Apache Software License"
 "tornado","6.0.4","Apache Software License"
-"urllib3","1.25.10","MIT License"
+"urllib3","1.25.11","MIT License"
 "wrapt","1.12.1","BSD License"
-"zipp","3.3.0","MIT License"
+"zipp","3.3.1","MIT License"
diff --git a/testing/scripts/Makefile b/testing/scripts/Makefile
@@ -80,6 +80,7 @@ install_seldon: install_cert_manager
 		../../helm-charts/seldon-core-operator \
 		--namespace seldon-system \
 		--set istio.enabled=true \
+		--set keda.enabled=true \
 		--set istio.gateway=istio-system/seldon-gateway \
 		--set certManager.enabled=false \
 		--set executor.enabled=$(SELDON_E2E_TESTS_USE_EXECUTOR) \
@@ -92,6 +93,8 @@ install_istio:
 	kubectl rollout status deployment.apps/istio-citadel -n istio-system
 	kubectl create -f ../resources/seldon-gateway.yaml -n istio-system
 
+install_keda:
+	kubectl apply -f https://github.com/kedacore/keda/releases/download/v2.0.0-beta/keda-2.0.0-beta.yaml
 
 create_namespaces:
 	kubectl create namespace seldon || echo "Namespace seldon already exists"
@@ -104,7 +107,7 @@ set_namespace:
 install_metrics:
 	kubectl apply -f metrics.yaml
 
-kind_setup: create_namespaces helm_setup install_ambassador install_istio install_jaeger install_seldon set_namespace install_metrics
+kind_setup: create_namespaces helm_setup install_ambassador install_istio install_keda install_jaeger install_seldon set_namespace install_metrics
 port-forward-ambassador:
 	kubectl port-forward $$(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080
 

diff --git a/testing/scripts/test_notebooks.py b/testing/scripts/test_notebooks.py
@@ -87,7 +87,15 @@ def test_istio_canary(self):
     #
 
     def test_keda_prom_auto_scale(self):
-        create_and_run_script("../../examples/keda", "keda_prom_auto_scale")
+        try:
+            create_and_run_script("../../examples/keda", "keda_prom_auto_scale")
+        except CalledProcessError as e:
+            run(
+                f"helm delete seldon-core-analytics --namespace seldon-system",
+                shell=True,
+                check=False,
+            )
+            raise e
 
     #
     # Misc