Skip to content

Commit

Permalink
Use cloned repo for conformance testing
Browse files Browse the repository at this point in the history
Signed-off-by: Dyanngg <[email protected]>
  • Loading branch information
Dyanngg committed Jul 21, 2023
1 parent d56c7b0 commit eedd6c7
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 888 deletions.
6 changes: 4 additions & 2 deletions ci/kind/test-netpol-v2-conformance-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,11 @@ function run_test {
export KUBE_CONTAINER_RUNTIME_ENDPOINT=unix:///run/containerd/containerd.sock
export KUBE_CONTAINER_RUNTIME_NAME=containerd

pushd "$(dirname "$0")"/../../test/e2e/adminnetworkpolicy
# TODO: use https://github.com/kubernetes-sigs/network-policy-api when conformance test config timeout and go dependency is fixed
git clone https://github.com/Dyanngg/network-policy-api.git
pushd network-policy-api/conformance
go mod download
go test -v -timeout=15m
go test -v --debug=true -timeout=15m
popd
}

Expand Down
4 changes: 4 additions & 0 deletions cmd/antrea-controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,10 @@ func run(o *Options) error {
informerFactory.Start(stopCh)
crdInformerFactory.Start(stopCh)
if features.DefaultFeatureGate.Enabled(features.AdminNetworkPolicy) {
// TODO(yang): When the AdminNetworkPolicy graduates to Beta, we need a better mechanism in Antrea controller
// so that 1. the policyInformerFactory is only started if the AdminNetworkPolicy CRD types are installed in
// the cluster 2. It retries periodically so that when the CRDs are installed, the policyInformerFactory starts
// watching and handles policy events.
policyInformerFactory.Start(stopCh)
}

Expand Down
80 changes: 0 additions & 80 deletions test/e2e/adminnetworkpolicy/conformance_test.go

This file was deleted.

97 changes: 0 additions & 97 deletions test/e2e/adminnetworkpolicy/go.mod

This file was deleted.

Loading

0 comments on commit eedd6c7

Please sign in to comment.