From c6d0d140a41e1aee682583df21d9f1b69a4955c0 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 10 Dec 2020 17:37:04 +0000 Subject: [PATCH 1/2] Use newest manifest in k8s tests --- test/840_weave_kube_3_test.sh | 2 +- test/860_weave_kube_portmap_3_test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/840_weave_kube_3_test.sh b/test/840_weave_kube_3_test.sh index 940661d9..7abc32f3 100755 --- a/test/840_weave_kube_3_test.sh +++ b/test/840_weave_kube_3_test.sh @@ -52,7 +52,7 @@ fi # Ensure Kubernetes uses locally built container images and inject code coverage environment variable (or do nothing depending on $COVERAGE): sed -e "s%imagePullPolicy: Always%imagePullPolicy: Never%" \ -e "s%env:%$WEAVE_ENV_VARS%" \ - "$(dirname "$0")/../prog/weave-kube/weave-daemonset-k8s-1.9.yaml" | run_on "$HOST1" "$KUBECTL apply -n kube-system -f -" + "$(dirname "$0")/../prog/weave-kube/weave-daemonset-k8s-1.11.yaml" | run_on "$HOST1" "$KUBECTL apply -n kube-system -f -" sleep 2 diff --git a/test/860_weave_kube_portmap_3_test.sh b/test/860_weave_kube_portmap_3_test.sh index 99d50d6d..f30c4bdb 100755 --- a/test/860_weave_kube_portmap_3_test.sh +++ b/test/860_weave_kube_portmap_3_test.sh @@ -50,7 +50,7 @@ function setup_kubernetes_cluster { # Ensure Kubernetes uses locally built container images and inject code coverage environment variable (or do nothing depending on $COVERAGE): sed -e "s%imagePullPolicy: Always%imagePullPolicy: Never%" \ -e "s%env:%$COVERAGE_ARGS%" \ - "$(dirname "$0")/../prog/weave-kube/weave-daemonset-k8s-1.7.yaml" | run_on "$HOST1" "$KUBECTL apply -n kube-system -f -" + "$(dirname "$0")/../prog/weave-kube/weave-daemonset-k8s-1.11.yaml" | run_on "$HOST1" "$KUBECTL apply -n kube-system -f -" } function weave_connected { From a0ac81b3b4cae6d0dcaf3732fd91cedefc89f720 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 10 Dec 2020 17:38:53 +0000 Subject: [PATCH 2/2] Stop running in host PID namespace We shouldn't need this --- prog/weave-kube/weave-daemonset-k8s-1.11.yaml | 2 +- prog/weave-kube/weave-daemonset-k8s-1.6.yaml | 2 +- prog/weave-kube/weave-daemonset-k8s-1.7.yaml | 2 +- prog/weave-kube/weave-daemonset-k8s-1.8.yaml | 2 +- prog/weave-kube/weave-daemonset-k8s-1.9.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/prog/weave-kube/weave-daemonset-k8s-1.11.yaml b/prog/weave-kube/weave-daemonset-k8s-1.11.yaml index 03deabd3..4561b072 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.11.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.11.yaml @@ -177,7 +177,7 @@ items: readOnly: false hostNetwork: true dnsPolicy: ClusterFirstWithHostNet - hostPID: true + hostPID: false restartPolicy: Always securityContext: seLinuxOptions: {} diff --git a/prog/weave-kube/weave-daemonset-k8s-1.6.yaml b/prog/weave-kube/weave-daemonset-k8s-1.6.yaml index 5245283e..1439a669 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.6.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.6.yaml @@ -148,7 +148,7 @@ items: securityContext: privileged: true hostNetwork: true - hostPID: true + hostPID: false restartPolicy: Always securityContext: seLinuxOptions: {} diff --git a/prog/weave-kube/weave-daemonset-k8s-1.7.yaml b/prog/weave-kube/weave-daemonset-k8s-1.7.yaml index 4fc69f3e..de0c7fcc 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.7.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.7.yaml @@ -164,7 +164,7 @@ items: mountPath: /run/xtables.lock readOnly: false hostNetwork: true - hostPID: true + hostPID: false restartPolicy: Always securityContext: seLinuxOptions: {} diff --git a/prog/weave-kube/weave-daemonset-k8s-1.8.yaml b/prog/weave-kube/weave-daemonset-k8s-1.8.yaml index 40fc4a73..110a4a88 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.8.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.8.yaml @@ -173,7 +173,7 @@ items: mountPath: /run/xtables.lock readOnly: false hostNetwork: true - hostPID: true + hostPID: false restartPolicy: Always securityContext: seLinuxOptions: {} diff --git a/prog/weave-kube/weave-daemonset-k8s-1.9.yaml b/prog/weave-kube/weave-daemonset-k8s-1.9.yaml index 019995c2..782ec3de 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.9.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.9.yaml @@ -177,7 +177,7 @@ items: readOnly: false hostNetwork: true dnsPolicy: ClusterFirstWithHostNet - hostPID: true + hostPID: false restartPolicy: Always securityContext: seLinuxOptions: {}