Revert "Add primary UDN net-attach-def (kubevirt#1841)"

This reverts commit ccb7ca2. Signed-off-by: Ram Lavi <[email protected]>
RamLavi · Dec 16, 2024 · 5fbf07a · 5fbf07a
1 parent af0368a
commit 5fbf07a
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 114 deletions.
diff --git a/data/kubevirt-ipam-controller/004-primary-udn-kubevirt-binding-networkattachdef.yaml b/data/kubevirt-ipam-controller/004-primary-udn-kubevirt-binding-networkattachdef.yaml
diff --git a/go.mod b/go.mod
@@ -15,7 +15,6 @@ require (
 	github.com/go-git/go-git/v5 v5.11.0
 	github.com/gobwas/glob v0.2.3
 	github.com/google/go-github/v32 v32.1.0
-	github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.3.0
 	github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20231024120544-6a3ba1a680b4
 	github.com/machadovilaca/operator-observability v0.0.19-0.20240326121036-9f2e5a31675f
 	github.com/onsi/ginkgo/v2 v2.11.0
@@ -145,6 +144,7 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.3.0 // indirect
 	github.com/kevinburke/rest v0.0.0-20210506044642-5611499aa33c // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/compress v1.16.0 // indirect

diff --git a/hack/components/bump-kubevirt-ipam-controller.sh b/hack/components/bump-kubevirt-ipam-controller.sh
@@ -148,7 +148,7 @@ echo 'Adjust kubevirt-ipam-controller to CNAO'
 
 echo 'Copy manifests'
 shopt -s extglob
-rm -rf data/kubevirt-ipam-controller/!(002-rbac.yaml|004-primary-udn-kubevirt-binding-networkattachdef.yaml)
+rm -rf data/kubevirt-ipam-controller/!(002-rbac.yaml)
 
 # CRD
 crd_manifest="https://raw.githubusercontent.com/k8snetworkplumbingwg/ipamclaims/${IPAMCLAIMS_CRD_VERSION}/artifacts/k8s.cni.cncf.io_ipamclaims.yaml"

diff --git a/pkg/components/components.go b/pkg/components/components.go
@@ -754,9 +754,6 @@ func GetClusterRole(allowMultus bool) *rbacv1.ClusterRole {
 					"get",
 					"list",
 					"watch",
-					"create",
-					"update",
-					"delete",
 				},
 			},
 		},

diff --git a/pkg/network/kubevirt_ipam_controller_test.go b/pkg/network/kubevirt_ipam_controller_test.go
diff --git a/test/check/check.go b/test/check/check.go
@@ -13,7 +13,6 @@ import (
 	. "github.com/onsi/gomega"
 
 	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
-	k8snetworkplumbingwgv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	testenv "github.com/kubevirt/cluster-network-addons-operator/test/env"
 	conditionsv1 "github.com/openshift/custom-resource-status/conditions/v1"
 	securityapi "github.com/openshift/origin/pkg/security/apis/security"
@@ -347,10 +346,6 @@ func checkForComponent(component *Component) error {
 		errsAppend(checkForPrometheusRule(component.PrometheusRule))
 	}
 
-	if component.NetworkAttachmentDefinition != "" {
-		errsAppend(checkForNetworkAttachmentDefinition(component.NetworkAttachmentDefinition))
-	}
-
 	return errsToErr(errs)
 }
 
@@ -394,10 +389,6 @@ func checkForComponentRemoval(component *Component) error {
 		errsAppend(checkForPrometheusRuleRemoval(component.PrometheusRule))
 	}
 
-	if component.NetworkAttachmentDefinition != "" {
-		errsAppend(checkForNetworkAttachmentDefinitionRemoval(component.NetworkAttachmentDefinition))
-	}
-
 	return errsToErr(errs)
 }
 
@@ -658,21 +649,6 @@ func checkForPrometheusRule(name string) error {
 	return nil
 }
 
-func checkForNetworkAttachmentDefinition(name string) error {
-	networkAttachmentDefinition := k8snetworkplumbingwgv1.NetworkAttachmentDefinition{}
-	err := testenv.Client.Get(context.Background(), types.NamespacedName{Name: name, Namespace: corev1.NamespaceDefault}, &networkAttachmentDefinition)
-	if err != nil {
-		return err
-	}
-
-	err = checkRelationshipLabels(networkAttachmentDefinition.GetLabels(), "NetworkAttachmentDefinition", name)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func checkRelationshipLabels(labels map[string]string, kind, name string) error {
 	expectedValues := map[string]string{
 		names.COMPONENT_LABEL_KEY:  names.COMPONENT_LABEL_DEFAULT_VALUE,
@@ -732,14 +708,6 @@ func checkForPrometheusRuleRemoval(name string) error {
 	return isNotFound("PrometheusRule", name, err)
 }
 
-func checkForNetworkAttachmentDefinitionRemoval(name string) error {
-	err := testenv.Client.Get(context.Background(), types.NamespacedName{Name: name, Namespace: corev1.NamespaceDefault}, &k8snetworkplumbingwgv1.NetworkAttachmentDefinition{})
-	if err != nil && isKindNotFound(err) {
-		return nil
-	}
-	return isNotFound("NetworkAttachmentDefinition", name, err)
-}
-
 func getMonitoringEndpoint() (*corev1.Endpoints, error) {
 	By("Finding CNAO prometheus endpoint")
 	endpoint := &corev1.Endpoints{}
@@ -844,10 +812,6 @@ func isNotSupportedKind(err error) bool {
 	return strings.Contains(err.Error(), "no kind is registered for the type")
 }
 
-func isKindNotFound(err error) bool {
-	return strings.Contains(err.Error(), "no matches for kind")
-}
-
 func configToYaml(gvk schema.GroupVersionKind) string {
 	config := GetConfig(gvk)
 	manifest, err := yaml.Marshal(config)

diff --git a/test/check/components.go b/test/check/components.go
@@ -20,7 +20,6 @@ type Component struct {
 	Service                      string
 	ServiceMonitor               string
 	PrometheusRule               string
-	NetworkAttachmentDefinition  string
 }
 
 var (
@@ -88,12 +87,11 @@ var (
 		Deployments:        []string{"secondary-dns"},
 	}
 	KubevirtIpamController = Component{
-		ComponentName:               "KubevirtIpamController",
-		ClusterRole:                 "kubevirt-ipam-controller-manager-role",
-		ClusterRoleBinding:          "kubevirt-ipam-controller-manager-rolebinding",
-		Deployments:                 []string{"kubevirt-ipam-controller-manager"},
-		DaemonSets:                  []string{"passt-binding-cni"},
-		NetworkAttachmentDefinition: "primary-udn-kubevirt-binding",
+		ComponentName:      "KubevirtIpamController",
+		ClusterRole:        "kubevirt-ipam-controller-manager-role",
+		ClusterRoleBinding: "kubevirt-ipam-controller-manager-rolebinding",
+		Deployments:        []string{"kubevirt-ipam-controller-manager"},
+		DaemonSets:         []string{"passt-binding-cni"},
 	}
 	AllComponents = []Component{
 		KubeMacPoolComponent,

diff --git a/test/e2e/workflow/deployment_test.go b/test/e2e/workflow/deployment_test.go
@@ -91,10 +91,9 @@ var _ = Describe("NetworkAddonsConfig", func() {
 			Entry(
 				KubevirtIpamController.ComponentName,
 				cnao.NetworkAddonsConfigSpec{
-					Multus:                 &cnao.Multus{},
 					KubevirtIpamController: &cnao.KubevirtIpamController{},
 				},
-				[]Component{MultusComponent, KubevirtIpamController},
+				[]Component{KubevirtIpamController},
 			),
 		)
 		It("should deploy prometheus if NetworkAddonsConfigSpec is not empty", func() {

diff --git a/test/env/env.go b/test/env/env.go
@@ -1,7 +1,6 @@
 package env
 
 import (
-	k8snetworkplumbingwgv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	. "github.com/onsi/gomega"
 
 	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
@@ -40,8 +39,6 @@ func Start() {
 	ExpectWithOffset(1, err).NotTo(HaveOccurred())
 	err = monitoringv1.AddToScheme(scheme.Scheme)
 	ExpectWithOffset(1, err).NotTo(HaveOccurred())
-	err = k8snetworkplumbingwgv1.AddToScheme(scheme.Scheme)
-	ExpectWithOffset(1, err).NotTo(HaveOccurred())
 
 	// +kubebuilder:scaffold:scheme