Validate mgmt providers removal

* forbid Management .spec.providers items
  removal if a ManagedCluster utilizes one
  of the removed providers
* amends to CRDs descriptions

Closes #554

.golangci.yml

@@ -18,7 +18,7 @@ issues:
     - text: "Unhandled error in call to function fmt.Print*"
       linters:
         - revive
-    - path: cmd/main.go
+    - path: (cmd/main\.go)|(_test\.go)
       linters:
         - maintidx
     - path: test/

api/v1alpha1/clustertemplate_types.go

@@ -40,9 +40,8 @@ type ClusterTemplateSpec struct {
 	ProviderContracts CompatibilityContracts `json:"providerContracts,omitempty"`
 	// Kubernetes exact version in the SemVer format provided by this ClusterTemplate.
 	KubernetesVersion string `json:"k8sVersion,omitempty"`
-	// Providers represent required CAPI providers with supported contract versions.
+	// Providers represent required CAPI providers.
 	// Should be set if not present in the Helm chart metadata.
-	// Compatibility attributes are optional to be defined.
 	Providers Providers `json:"providers,omitempty"`
 }
 
@@ -57,8 +56,7 @@ type ClusterTemplateStatus struct {
 	ProviderContracts CompatibilityContracts `json:"providerContracts,omitempty"`
 	// Kubernetes exact version in the SemVer format provided by this ClusterTemplate.
 	KubernetesVersion string `json:"k8sVersion,omitempty"`
-	// Providers represent required CAPI providers with supported contract versions
-	// if the latter has been given.
+	// Providers represent required CAPI providers.
 	Providers Providers `json:"providers,omitempty"`
 
 	TemplateStatusCommon `json:",inline"`

api/v1alpha1/management_types.go

@@ -98,8 +98,7 @@ type ManagementStatus struct {
 	Components map[string]ComponentStatus `json:"components,omitempty"`
 	// Release indicates the current Release object.
 	Release string `json:"release,omitempty"`
-	// AvailableProviders holds all CAPI providers available along with
-	// their supported contract versions, if specified in ProviderTemplates, on the Management cluster.
+	// AvailableProviders holds all available CAPI providers.
 	AvailableProviders Providers `json:"availableProviders,omitempty"`
 	// ObservedGeneration is the last observed generation.
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`

api/v1alpha1/providertemplate_types.go

@@ -27,17 +27,15 @@ const ProviderTemplateKind = "ProviderTemplate"
 type ProviderTemplateSpec struct {
 	Helm          HelmSpec               `json:"helm,omitempty"`
 	CAPIContracts CompatibilityContracts `json:"capiContracts,omitempty"`
-	// Providers represent exposed CAPI providers with supported contract versions.
+	// Providers represent exposed CAPI providers.
 	// Should be set if not present in the Helm chart metadata.
-	// Supported contract versions are optional to be defined.
 	Providers Providers `json:"providers,omitempty"`
 }
 
 // ProviderTemplateStatus defines the observed state of ProviderTemplate
 type ProviderTemplateStatus struct {
 	CAPIContracts CompatibilityContracts `json:"capiContracts,omitempty"`
-	// Providers represent exposed CAPI providers with supported contract versions
-	// if the latter has been given.
+	// Providers represent exposed CAPI providers.
 	Providers Providers `json:"providers,omitempty"`
 
 	TemplateStatusCommon `json:",inline"`

internal/controller/managedcluster_controller.go

@@ -46,7 +46,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	hmc "github.com/Mirantis/hmc/api/v1alpha1"
 	"github.com/Mirantis/hmc/internal/credspropagation"
@@ -781,20 +780,12 @@ func (r *ManagedClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		For(&hmc.ManagedCluster{}).
 		Watches(&hcv2.HelmRelease{},
 			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, o client.Object) []ctrl.Request {
-				managedCluster := hmc.ManagedCluster{}
-				managedClusterRef := client.ObjectKey{
-					Namespace: o.GetNamespace(),
-					Name:      o.GetName(),
-				}
-				err := r.Client.Get(ctx, managedClusterRef, &managedCluster)
-				if err != nil {
+				managedClusterRef := client.ObjectKeyFromObject(o)
+				if err := r.Client.Get(ctx, managedClusterRef, &hmc.ManagedCluster{}); err != nil {
 					return []ctrl.Request{}
 				}
-				return []reconcile.Request{
-					{
-						NamespacedName: managedClusterRef,
-					},
-				}
+
+				return []ctrl.Request{{NamespacedName: managedClusterRef}}
 			}),
 		).
 		Watches(&hmc.ClusterTemplateChain{},

internal/controller/template_controller.go

@@ -342,8 +342,7 @@ func (r *ClusterTemplateReconciler) validateCompatibilityAttrs(ctx context.Conte
 	exposedProviders, requiredProviders := management.Status.AvailableProviders, template.Status.Providers
 
 	l := ctrl.LoggerFrom(ctx)
-	l.V(1).Info("providers to check", "exposed", exposedProviders, "required", requiredProviders,
-		"exposed_capi_contract_versions", management.Status.CAPIContracts, "required_provider_contract_versions", template.Status.ProviderContracts)
+	l.V(1).Info("providers to check", "exposed", exposedProviders, "required", requiredProviders)
 
 	var (
 		merr          error

internal/webhook/managedcluster_webhook_test.go

@@ -127,11 +127,11 @@ func TestManagedClusterValidateCreate(t *testing.T) {
 				cred,
 				template.NewClusterTemplate(
 					template.WithName(testTemplateName),
-					template.WithProvidersStatus(v1alpha1.Providers{
+					template.WithProvidersStatus(
 						"infrastructure-aws",
 						"control-plane-k0smotron",
 						"bootstrap-k0smotron",
-					}),
+					),
 					template.WithValidationStatus(v1alpha1.TemplateValidationStatus{Valid: true}),
 				),
 			},
@@ -170,11 +170,11 @@ func TestManagedClusterValidateCreate(t *testing.T) {
 				mgmt,
 				template.NewClusterTemplate(
 					template.WithName(testTemplateName),
-					template.WithProvidersStatus(v1alpha1.Providers{
+					template.WithProvidersStatus(
 						"infrastructure-aws",
 						"control-plane-k0smotron",
 						"bootstrap-k0smotron",
-					}),
+					),
 					template.WithValidationStatus(v1alpha1.TemplateValidationStatus{Valid: true}),
 				),
 			},
@@ -199,11 +199,11 @@ func TestManagedClusterValidateCreate(t *testing.T) {
 				),
 				template.NewClusterTemplate(
 					template.WithName(testTemplateName),
-					template.WithProvidersStatus(v1alpha1.Providers{
+					template.WithProvidersStatus(
 						"infrastructure-aws",
 						"control-plane-k0smotron",
 						"bootstrap-k0smotron",
-					}),
+					),
 					template.WithValidationStatus(v1alpha1.TemplateValidationStatus{Valid: true}),
 				),
 			},
@@ -226,11 +226,11 @@ func TestManagedClusterValidateCreate(t *testing.T) {
 				),
 				template.NewClusterTemplate(
 					template.WithName(testTemplateName),
-					template.WithProvidersStatus(v1alpha1.Providers{
+					template.WithProvidersStatus(
 						"infrastructure-azure",
 						"control-plane-k0smotron",
 						"bootstrap-k0smotron",
-					}),
+					),
 					template.WithValidationStatus(v1alpha1.TemplateValidationStatus{Valid: true}),
 				),
 			},
@@ -313,20 +313,20 @@ func TestManagedClusterValidateUpdate(t *testing.T) {
 				template.NewClusterTemplate(
 					template.WithName(testTemplateName),
 					template.WithValidationStatus(v1alpha1.TemplateValidationStatus{Valid: true}),
-					template.WithProvidersStatus(v1alpha1.Providers{
+					template.WithProvidersStatus(
 						"infrastructure-aws",
 						"control-plane-k0smotron",
 						"bootstrap-k0smotron",
-					}),
+					),
 				),
 				template.NewClusterTemplate(
 					template.WithName(upgradeTargetTemplateName),
 					template.WithValidationStatus(v1alpha1.TemplateValidationStatus{Valid: true}),
-					template.WithProvidersStatus(v1alpha1.Providers{
+					template.WithProvidersStatus(
 						"infrastructure-aws",
 						"control-plane-k0smotron",
 						"bootstrap-k0smotron",
-					}),
+					),
 				),
 			},
 			warnings: admission.Warnings{fmt.Sprintf("Cluster can't be upgraded from %s to %s. This upgrade sequence is not allowed", testTemplateName, upgradeTargetTemplateName)},
@@ -348,20 +348,20 @@ func TestManagedClusterValidateUpdate(t *testing.T) {
 				template.NewClusterTemplate(
 					template.WithName(testTemplateName),
 					template.WithValidationStatus(v1alpha1.TemplateValidationStatus{Valid: true}),
-					template.WithProvidersStatus(v1alpha1.Providers{
+					template.WithProvidersStatus(
 						"infrastructure-aws",
 						"control-plane-k0smotron",
 						"bootstrap-k0smotron",
-					}),
+					),
 				),
 				template.NewClusterTemplate(
 					template.WithName(newTemplateName),
 					template.WithValidationStatus(v1alpha1.TemplateValidationStatus{Valid: true}),
-					template.WithProvidersStatus(v1alpha1.Providers{
+					template.WithProvidersStatus(
 						"infrastructure-aws",
 						"control-plane-k0smotron",
 						"bootstrap-k0smotron",
-					}),
+					),
 				),
 			},
 		},
@@ -386,11 +386,11 @@ func TestManagedClusterValidateUpdate(t *testing.T) {
 						Valid:           false,
 						ValidationError: "validation error example",
 					}),
-					template.WithProvidersStatus(v1alpha1.Providers{
+					template.WithProvidersStatus(
 						"infrastructure-aws",
 						"control-plane-k0smotron",
 						"bootstrap-k0smotron",
-					}),
+					),
 				),
 			},
 		},