fix master e2e tests

.gitignore

@@ -173,7 +173,7 @@ doc/source/_static/cluster-manager
 python/build/
 python/dist/
 testing/scripts/proto
-
+testing/scripts/test.log
 python/.coverage
 
 testing/scripts/tensorflow

helm-charts/seldon-core-operator/templates/clusterrole_seldon-manager-sas-role.yaml

@@ -19,6 +19,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - ''
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - ''
   resources:

operator/README.md

@@ -24,6 +24,7 @@ Start a kind cluster
 
 ```
 kind create cluster
+export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 ```
 
 Install CRD and cert-manager
@@ -60,7 +61,13 @@ When running update tls certificates locally
 make tls-extract
 ```
 
-Now delete the cluster Deployment as we will run the manager locally. After which you can run locally:
+Now delete the cluster Deployment as we will run the manager locally:
+
+```
+kubectl delete deployment -n seldon-system seldon-controller-manager
+``` 
+
+Now we can run locally:
 
 ```
 make run

operator/api/v1alpha2/seldondeployment_webhook.go

@@ -122,7 +122,10 @@ func GetPort(name string, ports []corev1.ContainerPort) *corev1.ContainerPort {
 }
 
 func IsPrepack(pu *PredictiveUnit) bool {
-	return len(*pu.Implementation) > 0 && *pu.Implementation != SIMPLE_MODEL && *pu.Implementation != SIMPLE_ROUTER && *pu.Implementation != RANDOM_ABTEST && *pu.Implementation != AVERAGE_COMBINER
+    fmt.Println("checking whether isPrepack "+string(*pu.Implementation))
+	isPrepack := len(*pu.Implementation) > 0 && *pu.Implementation != SIMPLE_MODEL && *pu.Implementation != SIMPLE_ROUTER && *pu.Implementation != RANDOM_ABTEST && *pu.Implementation != AVERAGE_COMBINER && *pu.Implementation != UNKNOWN_IMPLEMENTATION
+	fmt.Println(strconv.FormatBool(isPrepack))
+	return isPrepack
 }
 
 func GetPrepackServerConfig(serverName string) PredictorServerConfig {

operator/config/rbac/role_sas.yaml

@@ -14,6 +14,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+    - ""
+  resources:
+    - configmaps
+  verbs:
+    - get
+    - list
+    - watch
 - apiGroups:
   - ""
   resources:

operator/controllers/seldondeployment_prepackaged_servers.go

@@ -276,13 +276,16 @@ func createStandaloneModelServers(r *SeldonDeploymentReconciler, mlDep *machinel
 		deploy = createDeploymentWithoutEngine(depName, seldonId, sPodSpec, p, mlDep)
 	}
 
-	ServerConfig := machinelearningv1alpha2.GetPrepackServerConfig(string(*pu.Implementation))
+	if machinelearningv1alpha2.IsPrepack(pu) {
 
-	if err := addModelDefaultServers(r, pu, p, deploy, ServerConfig); err != nil {
-		return err
-	}
-	if err := addTFServerContainer(r, pu, p, deploy, ServerConfig); err != nil {
-		return err
+		ServerConfig := machinelearningv1alpha2.GetPrepackServerConfig(string(*pu.Implementation))
+
+		if err := addModelDefaultServers(r, pu, p, deploy, ServerConfig); err != nil {
+			return err
+		}
+		if err := addTFServerContainer(r, pu, p, deploy, ServerConfig); err != nil {
+			return err
+		}
 	}
 
 	if !existing {

testing/scripts/README.md

@@ -14,10 +14,14 @@ Activate kind kubernetes config:
 export KUBECONFIG="$(kind get kubeconfig-path)"
 ```
 
-Then to run the tests:
+Then to run the tests and log output to a file:
 
 ```
-make test
+make test > test.log
 ```
 
-
+To also follow controller logs in a separate terminal:
+```
+export KUBECONFIG="$(kind get kubeconfig-path)"
+kubectl logs -f -n seldon-system $(kubectl get pods -n seldon-system -l app=seldon -o jsonpath='{.items[0].metadata.name}')
+```