Skip to content

fix: remove unused validations from validating webhook #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 21, 2025
Merged

fix: remove unused validations from validating webhook #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 2 additions & 46 deletions api/core/v1alpha1/managedcontrolplane_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package v1alpha1
import (
"context"
"fmt"
"reflect"

"k8s.io/apimachinery/pkg/runtime"
apierrors "k8s.io/apimachinery/pkg/util/errors"
Expand Down Expand Up @@ -49,10 +48,8 @@ func (r *ManagedControlPlane) ValidateUpdate(_ context.Context, old runtime.Obje
}
var errorList []error

updateValidators := []func(*ManagedControlPlane, *ManagedControlPlane) error{
validateUpdateDesiredRegion,
validateUpdateAPIServerUpdate,
}
// Add update validators here when needed
var updateValidators []func(*ManagedControlPlane, *ManagedControlPlane) error

for _, validator := range updateValidators {
if err := validator(newMcp, oldMcp); err != nil {
Expand All @@ -78,44 +75,3 @@ func (r *ManagedControlPlane) ValidateDelete(_ context.Context, obj runtime.Obje
}
return nil, fmt.Errorf("ManagedControlPlane %q requires annotation %q to be set to true, before it can be deleted", r.Name, ManagedControlPlaneDeletionConfirmationAnnotation)
}

// validateUpdateDesiredRegion ensures that DesiredRegion is immutable
func validateUpdateDesiredRegion(newMCP, oldMcp *ManagedControlPlane) error {
if oldMcp.Spec.CommonConfig == nil || oldMcp.Spec.CommonConfig.DesiredRegion == nil {
return nil
}
if !reflect.DeepEqual(newMCP.Spec.DesiredRegion, oldMcp.Spec.DesiredRegion) {
return fmt.Errorf("spec.desiredRegion is immutable")
}
return nil
}

// validateUpdateAPIServerUpdate ensure that APIServer is immutable while allowing delete
func validateUpdateAPIServerUpdate(newMCP, oldMcp *ManagedControlPlane) error {
if oldMcp.Spec.Components.APIServer == nil { // APIServer is already unset, nothing to do here
return nil
}

if newMCP.Spec.Components.APIServer == nil { // APIServer is being deleted.
return newMCP.validateUpdateAPIServerRemove(oldMcp)
}
if !reflect.DeepEqual(newMCP.Spec.Components.APIServer, oldMcp.Spec.Components.APIServer) {
return fmt.Errorf("spec.components.apiServer is immutable")
}
return nil
}

// validateUpdateAPIServerRemove ensures that APIserver is not removed before all other components are removed
func (r *ManagedControlPlane) validateUpdateAPIServerRemove(oldMcp *ManagedControlPlane) error {
if oldMcp.Spec.Components.APIServer != nil && r.Spec.Components.APIServer == nil {
if r.Spec.Components.Landscaper != nil ||
r.Spec.Components.CloudOrchestratorConfiguration.Flux != nil ||
r.Spec.Components.CloudOrchestratorConfiguration.Kyverno != nil ||
r.Spec.Components.CloudOrchestratorConfiguration.Crossplane != nil ||
r.Spec.Components.CloudOrchestratorConfiguration.BTPServiceOperator != nil ||
r.Spec.Components.CloudOrchestratorConfiguration.ExternalSecretsOperator != nil {
return fmt.Errorf("spec.components.apiServer can't be removed while other components are configured")
}
}
return nil
}
Loading