Rebase and resolve comments

Signed-off-by: Yang Ding <[email protected]>
antrea-io · Feb 28, 2022 · 2c34d57 · 2c34d57
1 parent 7dcd678
commit 2c34d57
Show file tree

Hide file tree

Showing 6 changed files with 595 additions and 522 deletions.
diff --git a/multicluster/apis/multicluster/v1alpha1/resourceexport_webhook.go b/multicluster/apis/multicluster/v1alpha1/resourceexport_webhook.go
@@ -58,7 +58,7 @@ func (r *ResourceExport) Default() {
 		r.Labels[common.SourceKind] = common.AntreaClusterNetworkPolicyKind
 	}
 	if r.DeletionTimestamp.IsZero() && !common.StringExistsInSlice(r.Finalizers, common.ResourceExportFinalizer) {
-		r.Finalizers = []string{common.ResourceExportFinalizer}
+		r.Finalizers = append(r.Finalizers, common.ResourceExportFinalizer)
 	}
 }
 

diff --git a/multicluster/controllers/multicluster/commonarea/acnpimport_controller.go b/multicluster/controllers/multicluster/commonarea/acnpimport_controller.go
@@ -0,0 +1,158 @@
+/*
+Copyright 2022 Antrea Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package commonarea
+
+import (
+	"context"
+	"errors"
+
+	apiequality "k8s.io/apimachinery/pkg/api/equality"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/klog/v2"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	multiclusterv1alpha1 "antrea.io/antrea/multicluster/apis/multicluster/v1alpha1"
+	"antrea.io/antrea/multicluster/controllers/multicluster/common"
+	"antrea.io/antrea/pkg/apis/crd/v1alpha1"
+)
+
+func (r *ResourceImportReconciler) handleResImpUpdateForClusterNetworkPolicy(ctx context.Context, resImp *multiclusterv1alpha1.ResourceImport) (ctrl.Result, error) {
+	acnpImpName := types.NamespacedName{
+		Namespace: "",
+		Name:      resImp.Spec.Name,
+	}
+	acnpName := types.NamespacedName{
+		Namespace: "",
+		Name:      common.AntreaMCSPrefix + resImp.Spec.Name,
+	}
+	klog.InfoS("Updating ACNP and ACNPImport corresponding to ResourceImport",
+		"acnp", acnpName.String(), "resourceimport", klog.KObj(resImp))
+
+	acnp := &v1alpha1.ClusterNetworkPolicy{}
+	err := r.localClusterClient.Get(ctx, acnpName, acnp)
+	acnpNotFound := apierrors.IsNotFound(err)
+	if err != nil && !acnpNotFound {
+		return ctrl.Result{}, err
+	}
+	if !acnpNotFound {
+		if _, ok := acnp.Annotations[common.AntreaMCACNPAnnotation]; !ok {
+			err := errors.New("unable to import Antrea ClusterNetworkPolicy which conflicts with existing one")
+			klog.ErrorS(err, "", "acnp", klog.KObj(acnp))
+			return ctrl.Result{}, err
+		}
+	}
+	acnpObj := getMCAntreaClusterPolicy(resImp)
+	tierKind, tierName := &v1alpha1.Tier{}, acnpObj.Spec.Tier
+	err = r.localClusterClient.Get(ctx, types.NamespacedName{Namespace: "", Name: tierName}, tierKind)
+	tierNotFound := apierrors.IsNotFound(err)
+	if !tierNotFound {
+		if acnpNotFound {
+			if err = r.localClusterClient.Create(ctx, acnpObj, &client.CreateOptions{}); err != nil {
+				klog.ErrorS(err, "failed to create imported Antrea ClusterNetworkPolicy", "acnp", klog.KObj(acnpObj))
+				return ctrl.Result{}, err
+			}
+		} else if !apiequality.Semantic.DeepEqual(acnp.Spec, acnpObj.Spec) {
+			acnp.Spec = acnpObj.Spec
+			if err = r.localClusterClient.Update(ctx, acnp, &client.UpdateOptions{}); err != nil {
+				klog.ErrorS(err, "failed to update imported Antrea ClusterNetworkPolicy", "acnp", klog.KObj(acnpObj))
+				return ctrl.Result{}, err
+			}
+		}
+	} else if tierNotFound && !acnpNotFound {
+		if err = r.localClusterClient.Delete(ctx, acnpObj, &client.DeleteOptions{}); err != nil {
+			klog.ErrorS(err, "failed to delete imported Antrea ClusterNetworkPolicy that no longer has a valid Tier for the current cluster", "acnp", klog.KObj(acnpObj))
+			return ctrl.Result{}, err
+		}
+	}
+	acnpImp := &multiclusterv1alpha1.ACNPImport{}
+	err = r.localClusterClient.Get(ctx, acnpImpName, acnpImp)
+	acnpImpNotFound := apierrors.IsNotFound(err)
+	if err != nil && !acnpImpNotFound {
+		klog.ErrorS(err, "failed to get existing ACNPImports")
+		return ctrl.Result{}, err
+	}
+	acnpImpObj := getACNPImport(resImp, tierNotFound)
+	if acnpImpNotFound {
+		err := r.localClusterClient.Create(ctx, acnpImpObj, &client.CreateOptions{})
+		if err != nil {
+			klog.ErrorS(err, "failed to create ACNPImport", "acnpimport", klog.KObj(acnpImpObj))
+			return ctrl.Result{}, err
+		}
+		r.installedResImports.Add(*resImp)
+	}
+	patchACNPImportStatus := false
+	if len(acnpImp.Status.Conditions) == 0 {
+		acnpImp.Status = acnpImpObj.Status
+		patchACNPImportStatus = true
+	} else {
+		if acnpImp.Status.Conditions[0].Status != acnpImpObj.Status.Conditions[0].Status {
+			acnpImp.Status = acnpImpObj.Status
+			patchACNPImportStatus = true
+		}
+	}
+	if patchACNPImportStatus {
+		if err := r.localClusterClient.Status().Update(ctx, acnpImp); err != nil {
+			klog.ErrorS(err, "failed to update acnpImport status", "acnpImport", klog.KObj(acnpImp))
+		}
+	}
+	return ctrl.Result{}, nil
+}
+
+func (r *ResourceImportReconciler) handleResImpDeleteForClusterNetworkPolicy(ctx context.Context, resImp *multiclusterv1alpha1.ResourceImport) (ctrl.Result, error) {
+	acnpImpName := types.NamespacedName{
+		Namespace: "",
+		Name:      resImp.Spec.Name,
+	}
+	acnpName := types.NamespacedName{
+		Namespace: "",
+		Name:      common.AntreaMCSPrefix + resImp.Spec.Name,
+	}
+	klog.InfoS("Deleting ACNP and ACNPImport corresponding to ResourceImport",
+		"acnp", acnpName.String(), "resourceimport", klog.KObj(resImp))
+
+	var err error
+	cleanupACNPImport := func() (ctrl.Result, error) {
+		acnpImp := &multiclusterv1alpha1.ACNPImport{}
+		err = r.localClusterClient.Get(ctx, acnpImpName, acnpImp)
+		if err != nil {
+			return ctrl.Result{}, client.IgnoreNotFound(err)
+		}
+		err = r.localClusterClient.Delete(ctx, acnpImp, &client.DeleteOptions{})
+		if err != nil {
+			return ctrl.Result{}, client.IgnoreNotFound(err)
+		}
+		return ctrl.Result{}, nil
+	}
+
+	acnp := &v1alpha1.ClusterNetworkPolicy{}
+	err = r.localClusterClient.Get(ctx, acnpName, acnp)
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			klog.V(2).InfoS("ACNP corresponding to ResourceImport has already been deleted",
+				"acnp", acnpName.String(), "resourceimport", klog.KObj(resImp))
+			return cleanupACNPImport()
+		}
+		return ctrl.Result{}, err
+	}
+	err = r.localClusterClient.Delete(ctx, acnp, &client.DeleteOptions{})
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+	return cleanupACNPImport()
+}