Merge pull request #1457 from FabianKramm/pluginv2

refactor: improve plugin v2

.goreleaser.yaml

@@ -80,6 +80,14 @@ archives:
     builds_info:
       group: root
       owner: root
+  - id: syncer_archives
+    format: binary
+    builds:
+      - vcluster
+    name_template: "syncer-{{ .Os }}-{{ .Arch }}"
+    builds_info:
+      group: root
+      owner: root
 
 sboms:
   - id: vcluster_sbom

cmd/vcluster/cmd/start.go

@@ -76,17 +76,17 @@ func NewStartCommand() *cobra.Command {
 
 func ExecuteStart(ctx context.Context, options *options.VirtualClusterOptions) error {
 	// set suffix
-	translate.Suffix = options.Name
-	if translate.Suffix == "" {
-		translate.Suffix = options.DeprecatedSuffix
+	translate.VClusterName = options.Name
+	if translate.VClusterName == "" {
+		translate.VClusterName = options.DeprecatedSuffix
 	}
-	if translate.Suffix == "" {
-		translate.Suffix = "vcluster"
+	if translate.VClusterName == "" {
+		translate.VClusterName = "vcluster"
 	}
 
 	// set service name
 	if options.ServiceName == "" {
-		options.ServiceName = translate.Suffix
+		options.ServiceName = translate.VClusterName
 	}
 
 	// get current namespace
@@ -115,7 +115,7 @@ func ExecuteStart(ctx context.Context, options *options.VirtualClusterOptions) e
 		inClusterClient,
 		currentNamespace,
 		currentNamespace,
-		translate.Suffix,
+		translate.VClusterName,
 		options,
 	)
 	if err != nil {

pkg/controllers/generic/import_syncer.go

@@ -153,7 +153,7 @@ func (s *importer) ExcludePhysical(pObj client.Object) bool {
 func (s *importer) excludeObject(obj client.Object) bool {
 	// check if back sync is disabled eg. for service account token secrets
 	if obj.GetAnnotations() != nil &&
-		obj.GetAnnotations()[translate.SkipBacksyncInMultiNamespaceMode] == "true" {
+		obj.GetAnnotations()[translate.SkipBackSyncInMultiNamespaceMode] == "true" {
 		return true
 	}
 

pkg/controllers/manifests/init.go

@@ -60,7 +60,7 @@ type InitManifestsConfigMapReconciler struct {
 
 func (r *InitManifestsConfigMapReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
 	// TODO: implement better filtration through predicates
-	if req.Name != translate.Suffix+InitManifestSuffix {
+	if req.Name != translate.VClusterName+InitManifestSuffix {
 		return ctrl.Result{}, nil
 	}
 

pkg/controllers/register.go

@@ -280,7 +280,7 @@ func RegisterInitManifestsController(controllerCtx *options.ControllerContext) e
 				result, err := controller.Reconcile(ctx, ctrl.Request{
 					NamespacedName: types.NamespacedName{
 						Namespace: controllerCtx.CurrentNamespace,
-						Name:      translate.Suffix + manifests.InitManifestSuffix,
+						Name:      translate.VClusterName + manifests.InitManifestSuffix,
 					},
 				})
 				if err != nil {

pkg/controllers/resources/configmaps/syncer.go

@@ -40,7 +40,7 @@ type configMapSyncer struct {
 func ConfigMapNameTranslator(vNN types.NamespacedName, _ client.Object) string {
 	name := translate.Default.PhysicalName(vNN.Name, vNN.Namespace)
 	if name == "kube-root-ca.crt" {
-		name = translate.SafeConcatName("vcluster", "kube-root-ca.crt", "x", translate.Suffix)
+		name = translate.SafeConcatName("vcluster", "kube-root-ca.crt", "x", translate.VClusterName)
 	}
 	return name
 }

pkg/controllers/resources/ingressclasses/syncer_test.go

@@ -34,7 +34,7 @@ func TestSync(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{
 			Name: vObjectMeta.Name,
 			Labels: map[string]string{
-				translate.MarkerLabel: translate.Suffix,
+				translate.MarkerLabel: translate.VClusterName,
 			},
 			Annotations: map[string]string{
 				translate.NameAnnotation: "test-ingc",
@@ -62,7 +62,7 @@ func TestSync(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{
 			Name: translate.Default.PhysicalNameClusterScoped(vObjectMeta.Name),
 			Labels: map[string]string{
-				translate.MarkerLabel: translate.Suffix,
+				translate.MarkerLabel: translate.VClusterName,
 			},
 			Annotations: map[string]string{
 				translate.NameAnnotation: "test-ingc",

pkg/controllers/resources/ingresses/legacy/syncer_test.go

@@ -103,7 +103,7 @@ func TestSync(t *testing.T) {
 			translate.UIDAnnotation:       "",
 		},
 		Labels: map[string]string{
-			translate.MarkerLabel:    translate.Suffix,
+			translate.MarkerLabel:    translate.VClusterName,
 			translate.NamespaceLabel: vObjectMeta.Namespace,
 		},
 	}

pkg/controllers/resources/ingresses/syncer_test.go

@@ -111,7 +111,7 @@ func TestSync(t *testing.T) {
 			translate.UIDAnnotation:       "",
 		},
 		Labels: map[string]string{
-			translate.MarkerLabel:    translate.Suffix,
+			translate.MarkerLabel:    translate.VClusterName,
 			translate.NamespaceLabel: vObjectMeta.Namespace,
 		},
 	}

pkg/controllers/resources/networkpolicies/syncer_test.go

@@ -52,7 +52,7 @@ func TestSync(t *testing.T) {
 			MatchLabels: map[string]string{
 				translate.Default.ConvertLabelKey("mykey"): "mylabel",
 				translate.NamespaceLabel:                   vObjectMeta.Namespace,
-				translate.MarkerLabel:                      translate.Suffix,
+				translate.MarkerLabel:                      translate.VClusterName,
 			},
 			MatchExpressions: []metav1.LabelSelectorRequirement{
 				{
@@ -72,7 +72,7 @@ func TestSync(t *testing.T) {
 			translate.UIDAnnotation:       "",
 		},
 		Labels: map[string]string{
-			translate.MarkerLabel:    translate.Suffix,
+			translate.MarkerLabel:    translate.VClusterName,
 			translate.NamespaceLabel: vObjectMeta.Namespace,
 		},
 	}
@@ -92,7 +92,7 @@ func TestSync(t *testing.T) {
 	pnetworkPolicyNoPodSelector.Spec.PodSelector = metav1.LabelSelector{
 		MatchLabels: map[string]string{
 			translate.NamespaceLabel: vObjectMeta.Namespace,
-			translate.MarkerLabel:    translate.Suffix,
+			translate.MarkerLabel:    translate.VClusterName,
 		},
 	}
 
@@ -125,7 +125,7 @@ func TestSync(t *testing.T) {
 			From: []networkingv1.NetworkPolicyPeer{{PodSelector: &metav1.LabelSelector{
 				MatchLabels: map[string]string{
 					translate.Default.ConvertLabelKey("random-key"): "value",
-					translate.MarkerLabel:                           translate.Suffix,
+					translate.MarkerLabel:                           translate.VClusterName,
 					translate.NamespaceLabel:                        vnetworkPolicyWithPodSelectorNoNs.GetNamespace(),
 				},
 				MatchExpressions: []metav1.LabelSelectorRequirement{},
@@ -196,7 +196,7 @@ func TestSync(t *testing.T) {
 			From: []networkingv1.NetworkPolicyPeer{{
 				PodSelector: &metav1.LabelSelector{
 					MatchLabels: map[string]string{
-						translate.MarkerLabel: translate.Suffix,
+						translate.MarkerLabel: translate.VClusterName,
 					},
 					MatchExpressions: []metav1.LabelSelectorRequirement{
 						{

pkg/controllers/resources/networkpolicies/translate.go

@@ -72,7 +72,7 @@ func translateSpec(spec *networkingv1.NetworkPolicySpec, namespace string) *netw
 	// add selector for namespace as NetworkPolicy podSelector applies to pods within it's namespace
 	outSpec.PodSelector.MatchLabels[translate.NamespaceLabel] = namespace
 	// add selector for the marker label to select only from pods belonging this vcluster instance
-	outSpec.PodSelector.MatchLabels[translate.MarkerLabel] = translate.Suffix
+	outSpec.PodSelector.MatchLabels[translate.MarkerLabel] = translate.VClusterName
 
 	outSpec.PolicyTypes = spec.PolicyTypes
 	return outSpec
@@ -99,7 +99,7 @@ func translateNetworkPolicyPeers(peers []networkingv1.NetworkPolicyPeer, namespa
 				newPeer.PodSelector.MatchLabels[translate.NamespaceLabel] = namespace
 			}
 			// add selector for the marker label to select only from pods belonging this vcluster instance
-			newPeer.PodSelector.MatchLabels[translate.MarkerLabel] = translate.Suffix
+			newPeer.PodSelector.MatchLabels[translate.MarkerLabel] = translate.VClusterName
 		} else {
 			newPeer.IPBlock = peer.IPBlock.DeepCopy()
 		}

pkg/controllers/resources/nodes/fake_syncer.go

@@ -326,7 +326,7 @@ func GetNodeHost(nodeName string) string {
 // GetNodeHostLegacy returns Node hostname in a format used in 0.14.x release.
 // This function is added for backwards compatibility and may be removed in a future release.
 func GetNodeHostLegacy(nodeName, currentNamespace string) string {
-	hostname := strings.ReplaceAll(nodeName, ".", "-") + "." + translate.Suffix + "." + currentNamespace + "." + constants.NodeSuffix
+	hostname := strings.ReplaceAll(nodeName, ".", "-") + "." + translate.VClusterName + "." + currentNamespace + "." + constants.NodeSuffix
 	log := loghelper.New("GetNodeHostLegacy()")
 	log.Debugf("translating nodename %q into hostname: %q", nodeName, hostname)
 	return hostname

pkg/controllers/resources/nodes/nodeservice/node_service.go

@@ -75,7 +75,7 @@ func (n *nodeServiceProvider) cleanupNodeServices(ctx context.Context) error {
 
 	serviceList := &corev1.ServiceList{}
 	err := n.currentNamespaceClient.List(ctx, serviceList, client.InNamespace(n.currentNamespace), client.MatchingLabels{
-		ServiceClusterLabel: translate.Suffix,
+		ServiceClusterLabel: translate.VClusterName,
 	})
 	if err != nil {
 		return errors.Wrap(err, "list services")
@@ -124,7 +124,7 @@ func (n *nodeServiceProvider) Unlock() {
 }
 
 func (n *nodeServiceProvider) GetNodeIP(ctx context.Context, name string) (string, error) {
-	serviceName := translate.SafeConcatName(translate.Suffix, "node", strings.ReplaceAll(name, ".", "-"))
+	serviceName := translate.SafeConcatName(translate.VClusterName, "node", strings.ReplaceAll(name, ".", "-"))
 
 	service := &corev1.Service{}
 	err := n.currentNamespaceClient.Get(ctx, types.NamespacedName{Name: serviceName, Namespace: n.currentNamespace}, service)
@@ -158,7 +158,7 @@ func (n *nodeServiceProvider) GetNodeIP(ctx context.Context, name string) (strin
 			Namespace: n.currentNamespace,
 			Name:      serviceName,
 			Labels: map[string]string{
-				ServiceClusterLabel: translate.Suffix,
+				ServiceClusterLabel: translate.VClusterName,
 				ServiceNodeLabel:    name,
 			},
 		},

pkg/controllers/resources/nodes/syncer.go

@@ -99,7 +99,7 @@ var _ syncertypes.ControllerModifier = &nodeSyncer{}
 
 func (s *nodeSyncer) ModifyController(ctx *synccontext.RegisterContext, bld *builder.Builder) (*builder.Builder, error) {
 	if s.enableScheduler {
-		notManagedSelector, err := labels.NewRequirement(translate.MarkerLabel, selection.NotEquals, []string{translate.Suffix})
+		notManagedSelector, err := labels.NewRequirement(translate.MarkerLabel, selection.NotEquals, []string{translate.VClusterName})
 		if err != nil {
 			return bld, fmt.Errorf("constructing label selector for non-vcluster pods: %w", err)
 		}

pkg/controllers/resources/persistentvolumeclaims/syncer_test.go

@@ -33,7 +33,7 @@ func TestSync(t *testing.T) {
 			translate.UIDAnnotation:       "",
 		},
 		Labels: map[string]string{
-			translate.MarkerLabel:    translate.Suffix,
+			translate.MarkerLabel:    translate.VClusterName,
 			translate.NamespaceLabel: vObjectMeta.Namespace,
 		},
 	}

pkg/controllers/resources/poddisruptionbudgets/syncer_test.go

@@ -33,7 +33,7 @@ func TestSync(t *testing.T) {
 		},
 		Labels: map[string]string{
 			translate.NamespaceLabel: vObjectMeta.Namespace,
-			translate.MarkerLabel:    translate.Suffix,
+			translate.MarkerLabel:    translate.VClusterName,
 		},
 		ResourceVersion: generictesting.FakeClientResourceVersion,
 	}

pkg/controllers/resources/pods/syncer_test.go

@@ -69,7 +69,7 @@ func TestSync(t *testing.T) {
 			ClusterIP: "1.2.3.4",
 		},
 	}
-	translate.Suffix = generictesting.DefaultTestVclusterName
+	translate.VClusterName = generictesting.DefaultTestVclusterName
 	pDNSService := corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      translate.Default.PhysicalName("kube-dns", "kube-system"),
@@ -104,7 +104,7 @@ func TestSync(t *testing.T) {
 		},
 		Labels: map[string]string{
 			translate.NamespaceLabel: vObjectMeta.Namespace,
-			translate.MarkerLabel:    translate.Suffix,
+			translate.MarkerLabel:    translate.VClusterName,
 		},
 	}
 	pPodBase := &corev1.Pod{
@@ -248,7 +248,7 @@ func TestSync(t *testing.T) {
 			},
 			Labels: map[string]string{
 				translate.NamespaceLabel: vHostPathPod.Namespace,
-				translate.MarkerLabel:    translate.Suffix,
+				translate.MarkerLabel:    translate.VClusterName,
 			},
 			// CreationTimestamp: metav1.Time{},
 			// ResourceVersion:   "999",

pkg/controllers/resources/pods/translate/sa_token_secret.go

@@ -66,7 +66,7 @@ func SATokenSecret(ctx context.Context, pClient client.Client, vPod *corev1.Pod,
 				Namespace: translate.Default.PhysicalNamespace(vPod.Namespace),
 
 				Annotations: map[string]string{
-					translate.SkipBacksyncInMultiNamespaceMode: "true",
+					translate.SkipBackSyncInMultiNamespaceMode: "true",
 				},
 			},
 			Type:       corev1.SecretTypeOpaque,

pkg/controllers/resources/pods/translate/translator.go

@@ -450,7 +450,7 @@ func (t *translator) translateProjectedVolume(
 		if projectedVolume.Sources[i].ConfigMap != nil {
 			projectedVolume.Sources[i].ConfigMap.Name = translate.Default.PhysicalName(projectedVolume.Sources[i].ConfigMap.Name, vPod.Namespace)
 			if projectedVolume.Sources[i].ConfigMap.Name == "kube-root-ca.crt" {
-				projectedVolume.Sources[i].ConfigMap.Name = translate.SafeConcatName("vcluster", "kube-root-ca.crt", "x", translate.Suffix)
+				projectedVolume.Sources[i].ConfigMap.Name = translate.SafeConcatName("vcluster", "kube-root-ca.crt", "x", translate.VClusterName)
 			}
 		}
 		if projectedVolume.Sources[i].DownwardAPI != nil {
@@ -782,7 +782,7 @@ func (t *translator) translatePodAffinityTerm(vPod *corev1.Pod, term corev1.PodA
 		if newAffinityTerm.LabelSelector.MatchLabels == nil {
 			newAffinityTerm.LabelSelector.MatchLabels = map[string]string{}
 		}
-		newAffinityTerm.LabelSelector.MatchLabels[translate.MarkerLabel] = translate.Suffix
+		newAffinityTerm.LabelSelector.MatchLabels[translate.MarkerLabel] = translate.VClusterName
 	}
 	return newAffinityTerm
 }
@@ -797,7 +797,7 @@ func translateTopologySpreadConstraints(vPod *corev1.Pod, pPod *corev1.Pod) {
 				pPod.Spec.TopologySpreadConstraints[i].LabelSelector.MatchLabels = map[string]string{}
 			}
 			pPod.Spec.TopologySpreadConstraints[i].LabelSelector.MatchLabels[translate.NamespaceLabel] = vPod.Namespace
-			pPod.Spec.TopologySpreadConstraints[i].LabelSelector.MatchLabels[translate.MarkerLabel] = translate.Suffix
+			pPod.Spec.TopologySpreadConstraints[i].LabelSelector.MatchLabels[translate.MarkerLabel] = translate.VClusterName
 		}
 	}
 }