Merge pull request #3876 from weaveworks/k8s-disable-hostpid

For K8s, stop running in host PID namespace
This commit is contained in:
Bryan Boreham authored and GitHub committed 2020-12-17 16:53:42 +00:00
commit d81e908d1a
7 files changed
+7 -7

No files matched your search

@@ -177,7 +177,7 @@ items:
readOnly: false
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
hostPID: true
hostPID: false
restartPolicy: Always
securityContext:
seLinuxOptions: {}
+1 -1
View File
@@ -148,7 +148,7 @@ items:
securityContext:
privileged: true
hostNetwork: true
hostPID: true
hostPID: false
restartPolicy: Always
securityContext:
seLinuxOptions: {}
+1 -1
View File
@@ -164,7 +164,7 @@ items:
mountPath: /run/xtables.lock
readOnly: false
hostNetwork: true
hostPID: true
hostPID: false
restartPolicy: Always
securityContext:
seLinuxOptions: {}
+1 -1
View File
@@ -173,7 +173,7 @@ items:
mountPath: /run/xtables.lock
readOnly: false
hostNetwork: true
hostPID: true
hostPID: false
restartPolicy: Always
securityContext:
seLinuxOptions: {}
+1 -1
View File
@@ -177,7 +177,7 @@ items:
readOnly: false
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
hostPID: true
hostPID: false
restartPolicy: Always
securityContext:
seLinuxOptions: {}
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 {