From 13a65196919704f68f9e66007a08df1b08edc24c Mon Sep 17 00:00:00 2001 From: killianmuldoon Date: Tue, 26 Sep 2023 11:07:46 +0100 Subject: [PATCH] Fix deprecated markers across codebase Signed-off-by: killianmuldoon --- controllers/vspherecluster_reconciler.go | 2 ++ pkg/services/network/constants.go | 4 ++-- pkg/services/vmoperator/control_plane_endpoint.go | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/controllers/vspherecluster_reconciler.go b/controllers/vspherecluster_reconciler.go index 9c57531bdc..51a73cfc0d 100644 --- a/controllers/vspherecluster_reconciler.go +++ b/controllers/vspherecluster_reconciler.go @@ -55,6 +55,8 @@ import ( // legacyIdentityFinalizer is deprecated and should be used only while upgrading the cluster // from v1alpha3(v.0.7). +// +// Deprecated: legacyIdentityFinalizer will be removed in a future release. const legacyIdentityFinalizer string = "identity/infrastructure.cluster.x-k8s.io" type clusterReconciler struct { diff --git a/pkg/services/network/constants.go b/pkg/services/network/constants.go index 1a754c464c..94c981cd63 100644 --- a/pkg/services/network/constants.go +++ b/pkg/services/network/constants.go @@ -32,7 +32,7 @@ const ( SystemNamespace = "kube-system" // legacyDefaultNetworkLabel was the label used for default networks. - // This is deprecated and is introduced only for smoother transitions. - // This will be released in a future release. + // + // Deprecated: legacyDefaultNetworkLabel will be removed in a future release. legacyDefaultNetworkLabel = "capw.vmware.com/is-default-network" ) diff --git a/pkg/services/vmoperator/control_plane_endpoint.go b/pkg/services/vmoperator/control_plane_endpoint.go index 5aa5527f88..7ad550f0a7 100644 --- a/pkg/services/vmoperator/control_plane_endpoint.go +++ b/pkg/services/vmoperator/control_plane_endpoint.go @@ -50,8 +50,14 @@ const ( // legacyClusterSelectorKey and legacyNodeSelectorKey are added for backward compatibility. // These will be removed in the future release. // Please refer to the issue above for deprecation process. + // + // Deprecated: legacyClusterSelectorKey will be removed in a future release. legacyClusterSelectorKey = "capw.vmware.com/cluster.name" - legacyNodeSelectorKey = "capw.vmware.com/cluster.role" + + // Please refer to the issue above for deprecation process. + // + // Deprecated: legacyClusterSelectorKey will be removed in a future release. + legacyNodeSelectorKey = "capw.vmware.com/cluster.role" ) // CPService represents the ability to reconcile a ControlPlaneEndpoint.