From a94dde3c7e5a016255c94567c9eb5a7d0668f21c Mon Sep 17 00:00:00 2001 From: Adolfo Duarte Date: Thu, 3 Nov 2022 23:30:54 -0700 Subject: [PATCH] added coment explaninig package cloning changes return err for all config controllers when cluster not found adds check of cluster ownership --- addons/controllers/antrea/antreaconfig_controller.go | 2 +- addons/controllers/calico/calicoconfig_controller.go | 2 +- .../kappcontrollerconfig_controller.go | 2 +- .../clusterbootstrapclone/clusterbootstrapclone.go | 11 ++++++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/addons/controllers/antrea/antreaconfig_controller.go b/addons/controllers/antrea/antreaconfig_controller.go index 9f5ee5efbd0..994363c09bb 100644 --- a/addons/controllers/antrea/antreaconfig_controller.go +++ b/addons/controllers/antrea/antreaconfig_controller.go @@ -80,7 +80,7 @@ func (r *AntreaConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request if apierrors.IsNotFound(err) && cluster != nil { log.Info(fmt.Sprintf("'%s/%s' is listed as owner reference but could not be found", cluster.Namespace, cluster.Name)) - return ctrl.Result{}, nil + return ctrl.Result{}, err } log.Error(err, "could not determine owner cluster") return ctrl.Result{}, err diff --git a/addons/controllers/calico/calicoconfig_controller.go b/addons/controllers/calico/calicoconfig_controller.go index 1671625480d..8b9a7dc1c48 100644 --- a/addons/controllers/calico/calicoconfig_controller.go +++ b/addons/controllers/calico/calicoconfig_controller.go @@ -78,7 +78,7 @@ func (r *CalicoConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request if apierrors.IsNotFound(err) && cluster != nil { log.Info(fmt.Sprintf("'%s/%s' is listed as owner reference but could not be found", cluster.Namespace, cluster.Name)) - return ctrl.Result{}, nil + return ctrl.Result{}, err } log.Error(err, "could not determine owner cluster") return ctrl.Result{}, err diff --git a/addons/controllers/kapp-controller/kappcontrollerconfig_controller.go b/addons/controllers/kapp-controller/kappcontrollerconfig_controller.go index 6fb2f9f7ea8..47ac8ae061a 100644 --- a/addons/controllers/kapp-controller/kappcontrollerconfig_controller.go +++ b/addons/controllers/kapp-controller/kappcontrollerconfig_controller.go @@ -73,7 +73,7 @@ func (r *KappControllerConfigReconciler) Reconcile(ctx context.Context, req ctrl if apierrors.IsNotFound(err) && cluster != nil { r.Log.Info(fmt.Sprintf("'%s/%s' is listed as owner reference but could not be found", cluster.Namespace, cluster.Name)) - return ctrl.Result{}, nil + return ctrl.Result{}, err } r.Log.Info("could not determine owner cluster") return ctrl.Result{}, err diff --git a/addons/pkg/util/clusterbootstrapclone/clusterbootstrapclone.go b/addons/pkg/util/clusterbootstrapclone/clusterbootstrapclone.go index 2135c31c1be..82e7be32c25 100644 --- a/addons/pkg/util/clusterbootstrapclone/clusterbootstrapclone.go +++ b/addons/pkg/util/clusterbootstrapclone/clusterbootstrapclone.go @@ -380,7 +380,16 @@ func (h *Helper) HandleExistingClusterBootstrap(clusterBootstrap *runtanzuv1alph packages = packagesToBeCloned } } else { - // packages with values from inline need to be cloned. + // packages with values from inline need to be cloned for two cases: + // + // 1. When no Clusterbootstrap is given by user and clusterbootstraptemplate + // is cloned as clusterbootstrap but resolved tkr is not set - In this + // case the providers are already cloned so providers have to be cloned again + // + // 2. When full clusterbootstrap without tkr annotation is given by user. + // In this case we only want to handle inline packages for creating + // secret. The providers are expected to be present in the + // clusternamespace, created by user before clusterbootstrap is created. var nonEmptyInlinePackages []*runtanzuv1alpha3.ClusterBootstrapPackage for _, cbPackage := range packages { if cbPackage != nil && cbPackage.ValuesFrom != nil && cbPackage.ValuesFrom.Inline != nil {