Fix DP installation scripts for custom NP controller

Author: jaydeokar

scripts/lib/network-policy.sh

@@ -87,11 +87,11 @@ function install_network_policy_helm(){
     fi
 
     echo "Updating annotations and labels on existing resources"
-    for kind in daemonSet clusterRole clusterRoleBinding serviceAccount; do
-      echo "setting annotations and labels on $kind/aws-node"
-      kubectl -n kube-system annotate --overwrite $kind aws-node meta.helm.sh/release-name=aws-vpc-cni || echo "Unable to annotate $kind/aws-node"
-      kubectl -n kube-system annotate --overwrite $kind aws-node meta.helm.sh/release-namespace=kube-system || echo "Unable to annotate $kind/aws-node"
-      kubectl -n kube-system label --overwrite $kind aws-node app.kubernetes.io/managed-by=Helm || echo "Unable to label $kind/aws-node"
+    resources=("daemonSet/aws-node" "clusterRole/aws-node" "clusterRoleBinding/aws-node" "serviceAccount/aws-node" "configmap/amazon-vpc-cni") 
+    for kind in ${resources[@]}; do
+      echo "setting annotations and labels on $kind"
+      kubectl -n kube-system annotate --overwrite $kind meta.helm.sh/release-name=aws-vpc-cni meta.helm.sh/release-namespace=kube-system || echo "Unable to annotate $kind"
+      kubectl -n kube-system label --overwrite $kind app.kubernetes.io/managed-by=Helm || echo "Unable to label $kind"
     done
 
     echo "Installing/Updating the aws-vpc-cni helm chart with enableNetworkPolicy=true"

scripts/lib/verify_test_results.py

@@ -15,9 +15,9 @@ def verify_results(file_name,ip_family):
     # expected_results maintains a mapping of the test number and the number of sub-tests that are expected to pass for v4/v6 clusters
     # For the test numbers not included in this map, it is expected that all the sub-tests should be passing
     if ip_family == "IPv6":
-        expected_results={ 2:80, 3:80, 8:80, 12:80, 23:80, 25:80, 26:80, 28:80,29:80, 31:77, 98:80, 102:72, 104:72, 106:72, 108:72, 111:80, 112:80 }
+        expected_results={ 2:80, 3:80, 8:80, 12:64, 23:80, 25:80, 26:80, 28:80, 29:80, 31:50, 98:80, 102:72, 104:72, 106:72, 108:72, 111:80, 112:80 }
     else:
-        expected_results={ 2:80, 3:80, 8:80, 12:80, 23:80, 25:80, 26:80, 28:80, 29:80, 31:80, 98:80, 111:80, 112:80 }
+        expected_results={ 2:80, 3:80, 8:80, 12:80, 23:80, 25:80, 26:80, 28:80, 29:80, 31:50, 98:80, 111:80, 112:80 }
 
     start="starting test case"
     wrong="wrong"

scripts/update-controller-image-dataplane.sh

@@ -3,7 +3,7 @@
 
 # Parameters:
 # KUBECONFIG: path to the kubeconfig file, default ~/.kube/config
-# AMAZON_NP_CONTROLLER: node agent image
+# AMAZON_NP_CONTROLLER: Custom network policy controller image
 
 set -e
 DIR=$(cd "$(dirname "$0")"; pwd)
@@ -13,7 +13,7 @@ kubectl apply -k config/default
 
 if [[ ! -z $AMAZON_NP_CONTROLLER ]];then
     echo "Setting the Controller Image: $AMAZON_NP_CONTROLLER"
-    kubectl set image deployment.v1.apps/amazon-network-policy-controller-k8s controller=$AMAZON_NP_CONTROLLER
+    kubectl set image -n kube-system deployment.v1.apps/amazon-network-policy-controller-k8s controller=$AMAZON_NP_CONTROLLER
 fi
 
 echo "Restarting the Controller"