Skip to content

Commit 832086a

Browse files
committed
avoid kindnet network policies
1 parent 1005ed1 commit 832086a

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.github/workflows/e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ jobs:
120120

121121
- name: Install kube-network-policies
122122
run: |
123+
# stop kindnet of applying network policies
124+
kubectl -n kube-system set image ds kindnet kindnet-cni=docker.io/kindest/kindnetd:v20230809-80a64d96
123125
# preload kube-network-policies image
124126
docker load --input kube-network-policies-image.tar
125127
/usr/local/bin/kind load docker-image registry.k8s.io/networking/kube-network-policies:test --name ${{ env.KIND_CLUSTER_NAME}}
126128
sed -i s#registry.k8s.io/networking/kube-network-policies.*#registry.k8s.io/networking/kube-network-policies:test# install.yaml
127129
/usr/local/bin/kubectl apply -f ./install.yaml
128-
# stop kindnet of checking network policies
129-
kubectl -n kube-system delete clusterrolebinding kindnet
130130
131131
- name: Get Cluster status
132132
run: |

.github/workflows/npa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ jobs:
109109

110110
- name: Install kube-network-policies
111111
run: |
112+
# stop kindnet of applying network policies
113+
kubectl -n kube-system set image ds kindnet kindnet-cni=docker.io/kindest/kindnetd:v20230809-80a64d96
112114
/usr/local/bin/kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/network-policy-api/main/config/crd/experimental/policy.networking.k8s.io_adminnetworkpolicies.yaml
113115
/usr/local/bin/kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/network-policy-api/main/config/crd/experimental/policy.networking.k8s.io_baselineadminnetworkpolicies.yaml
114116
# preload kube-network-policies image
115117
docker load --input kube-network-policies-image.tar
116118
/usr/local/bin/kind load docker-image registry.k8s.io/networking/kube-network-policies:test --name ${{ env.KIND_CLUSTER_NAME}}
117119
sed -i s#registry.k8s.io/networking/kube-network-policies.*#registry.k8s.io/networking/kube-network-policies:test# install-anp.yaml
118120
/usr/local/bin/kubectl apply -f ./install-anp.yaml
119-
# stop kindnet of checking network policies
120-
kubectl -n kube-system delete clusterrolebinding kindnet
121121
122122
- name: Get Cluster status
123123
run: |

hack/ci/e2e.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@ EOF
136136
# Patch kube-proxy to set the verbosity level
137137
kubectl patch -n kube-system daemonset/kube-proxy \
138138
--type='json' -p='[{"op": "add", "path": "/spec/template/spec/containers/0/command/-", "value": "--v='"${KIND_CLUSTER_LOG_LEVEL}"'" }]'
139+
140+
# stop kindnet of applying network policies
141+
kubectl -n kube-system set image ds kindnet kindnet-cni=docker.io/kindest/kindnetd:v20230809-80a64d96
139142
}
140143

141144
# run e2es with ginkgo-e2e.sh
@@ -208,8 +211,6 @@ run_tests() {
208211
}
209212

210213
install_kube_network_policy() {
211-
# stop kindnet of checking network policies
212-
kubectl -n kube-system delete clusterrolebinding kindnet
213214
# Install kube-network-policies
214215
export IMAGE_NAME="registry.k8s.io/networking/kube-network-policies"
215216
# Build the image

tests/setup_suite.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ EOF
3434
printf '%s' "${_install}" | kubectl apply -f -
3535
kubectl wait --for=condition=ready pods --namespace=kube-system -l k8s-app=kube-network-policies
3636
37-
# stop kindnet of checking network policies
38-
kubectl -n kube-system delete clusterrolebinding kindnet
37+
# stop kindnet of applying network policies
38+
kubectl -n kube-system set image ds kindnet kindnet-cni=docker.io/kindest/kindnetd:v20230809-80a64d96
3939
4040
# Expose a webserver in the default namespace
4141
kubectl run web --image=httpd:2 --labels="app=web" --expose --port=80

0 commit comments

Comments
 (0)