Skip to content

Commit

Permalink
Skip certain tasks in shoot deletion flow if namespace is terminating
Browse files Browse the repository at this point in the history 
```improvement user
gardenlet no longer tries to deploy new resources in the Shoot namespace in the Seed when the corresponding namespace is marked for deletion (no new resources can be created in such namespace).
```
  • Loading branch information
@rfranzke @ialidzhikov
rfranzke authored and ialidzhikov committed Nov 2, 2020
1 parent ff528cb commit 5967c29
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 31 deletions.
29 changes: 12 additions & 17 deletions pkg/gardenlet/controller/shoot/shoot_control_delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ import (
func (c *Controller) runDeleteShootFlow(ctx context.Context, o *operation.Operation) *gardencorev1beta1helper.WrappedLastErrors {
var (
botanist *botanistpkg.Botanist
shootNamespaceInDeletion bool
kubeAPIServerDeploymentFound = true
kubeControllerManagerDeploymentFound = true
kubeAPIServerDeploymentReplicas int32
Expand Down Expand Up @@ -129,11 +128,6 @@ func (c *Controller) runDeleteShootFlow(ctx context.Context, o *operation.Operat
}
return nil
}),
errors.ToExecute("Check deletion timestamp for the Shoot namespace", func() error {
var deletionError error
shootNamespaceInDeletion, deletionError = kutil.HasDeletionTimestamp(botanist.SeedNamespaceObject)
return deletionError
}),
// We check whether the kube-apiserver deployment exists in the shoot namespace. If it does not, then we assume
// that it has never been deployed successfully, or that we have deleted it in a previous run because we already
// cleaned up. We follow that no (more) resources can have been deployed in the shoot cluster, thus there is nothing
Expand Down Expand Up @@ -223,7 +217,7 @@ func (c *Controller) runDeleteShootFlow(ctx context.Context, o *operation.Operat
// existing machine class secrets.
deployCloudProviderSecret = g.Add(flow.Task{
Name: "Deploying cloud provider account secret",
Fn: flow.TaskFn(botanist.DeployCloudProviderSecret).SkipIf(shootNamespaceInDeletion),
Fn: flow.TaskFn(botanist.DeployCloudProviderSecret).DoIf(nonTerminatingNamespace),
})
deployKubeAPIServerService = g.Add(flow.Task{
Name: "Deploying Kubernetes API server service in the Seed cluster",
Expand All @@ -244,17 +238,17 @@ func (c *Controller) runDeleteShootFlow(ctx context.Context, o *operation.Operat
})
generateSecrets = g.Add(flow.Task{
Name: "Generating secrets and saving them into ShootState",
Fn: flow.TaskFn(botanist.GenerateAndSaveSecrets).SkipIf(shootNamespaceInDeletion),
Fn: flow.TaskFn(botanist.GenerateAndSaveSecrets).DoIf(nonTerminatingNamespace),
Dependencies: flow.NewTaskIDs(ensureShootStateExists),
})
deploySecrets = g.Add(flow.Task{
Name: "Deploying Shoot certificates / keys",
Fn: flow.TaskFn(botanist.DeploySecrets).SkipIf(shootNamespaceInDeletion),
Fn: flow.TaskFn(botanist.DeploySecrets).DoIf(nonTerminatingNamespace),
Dependencies: flow.NewTaskIDs(ensureShootStateExists, generateSecrets),
})
deployReferencedResources = g.Add(flow.Task{
Name: "Deploying referenced resources",
Fn: flow.TaskFn(botanist.DeployReferencedResources).RetryUntilTimeout(defaultInterval, defaultTimeout),
Fn: flow.TaskFn(botanist.DeployReferencedResources).RetryUntilTimeout(defaultInterval, defaultTimeout).DoIf(nonTerminatingNamespace),
Dependencies: flow.NewTaskIDs(ensureShootStateExists),
})
deployInternalDomainDNSRecord = g.Add(flow.Task{
Expand All @@ -269,7 +263,7 @@ func (c *Controller) runDeleteShootFlow(ctx context.Context, o *operation.Operat
})
_ = g.Add(flow.Task{
Name: "Deploying network policies",
Fn: flow.TaskFn(botanist.DeployNetworkPolicies).RetryUntilTimeout(defaultInterval, defaultTimeout),
Fn: flow.TaskFn(botanist.DeployNetworkPolicies).RetryUntilTimeout(defaultInterval, defaultTimeout).DoIf(nonTerminatingNamespace),
Dependencies: flow.NewTaskIDs(ensureShootStateExists).InsertIf(!staticNodesCIDR),
})
deployETCD = g.Add(flow.Task{
Expand All @@ -292,12 +286,12 @@ func (c *Controller) runDeleteShootFlow(ctx context.Context, o *operation.Operat
// controller-manager to be updateable due to provider config injection.
deployControlPlane = g.Add(flow.Task{
Name: "Deploying Shoot control plane",
Fn: flow.TaskFn(botanist.DeployControlPlane).RetryUntilTimeout(defaultInterval, defaultTimeout).DoIf(cleanupShootResources && controlPlaneDeploymentNeeded && !shootNamespaceInDeletion),
Fn: flow.TaskFn(botanist.DeployControlPlane).RetryUntilTimeout(defaultInterval, defaultTimeout).DoIf(cleanupShootResources && controlPlaneDeploymentNeeded),
Dependencies: flow.NewTaskIDs(deploySecrets, deployCloudProviderSecret, ensureShootClusterIdentity),
})
waitUntilControlPlaneReady = g.Add(flow.Task{
Name: "Waiting until Shoot control plane has been reconciled",
Fn: flow.TaskFn(botanist.WaitUntilControlPlaneReady).DoIf(cleanupShootResources && controlPlaneDeploymentNeeded && !shootNamespaceInDeletion),
Fn: flow.TaskFn(botanist.WaitUntilControlPlaneReady).DoIf(cleanupShootResources && controlPlaneDeploymentNeeded),
Dependencies: flow.NewTaskIDs(deployControlPlane),
})
generateEncryptionConfigurationMetaData = g.Add(flow.Task{
Expand Down Expand Up @@ -354,7 +348,7 @@ func (c *Controller) runDeleteShootFlow(ctx context.Context, o *operation.Operat
// cloud provider secret are restarted in case it has changed.
deployKubeControllerManager = g.Add(flow.Task{
Name: "Deploying Kubernetes controller manager",
Fn: flow.TaskFn(botanist.DeployKubeControllerManager).DoIf(cleanupShootResources && kubeControllerManagerDeploymentFound && !shootNamespaceInDeletion).RetryUntilTimeout(defaultInterval, defaultTimeout),
Fn: flow.TaskFn(botanist.DeployKubeControllerManager).DoIf(cleanupShootResources && kubeControllerManagerDeploymentFound).RetryUntilTimeout(defaultInterval, defaultTimeout),
Dependencies: flow.NewTaskIDs(deploySecrets, deployCloudProviderSecret, waitUntilControlPlaneReady, initializeShootClients),
})
_ = g.Add(flow.Task{
Expand Down Expand Up @@ -432,7 +426,7 @@ func (c *Controller) runDeleteShootFlow(ctx context.Context, o *operation.Operat
Fn: botanist.WaitUntilWorkerDeleted,
Dependencies: flow.NewTaskIDs(destroyWorker),
})
_ = g.Add(flow.Task{
deleteAllOperatingSystemConfigs = g.Add(flow.Task{
Name: "Deleting operating system config resources",
Fn: flow.TaskFn(botanist.DeleteAllOperatingSystemConfigs).RetryUntilTimeout(defaultInterval, defaultTimeout),
Dependencies: flow.NewTaskIDs(waitUntilWorkerDeleted),
Expand Down Expand Up @@ -491,6 +485,7 @@ func (c *Controller) runDeleteShootFlow(ctx context.Context, o *operation.Operat
cleanExtendedAPIs,
cleanKubernetesResources,
cleanShootNamespaces,
deleteAllOperatingSystemConfigs,
waitUntilWorkerDeleted,
waitUntilManagedResourcesDeleted,
timeForInfrastructureResourceCleanup,
Expand All @@ -512,7 +507,7 @@ func (c *Controller) runDeleteShootFlow(ctx context.Context, o *operation.Operat

deleteKubeAPIServer = g.Add(flow.Task{
Name: "Deleting Kubernetes API server",
Fn: flow.TaskFn(botanist.DeleteKubeAPIServer).Retry(defaultInterval),
Fn: flow.TaskFn(botanist.DeleteKubeAPIServer).RetryUntilTimeout(defaultInterval, defaultTimeout),
Dependencies: flow.NewTaskIDs(syncPointCleaned, waitUntilControlPlaneDeleted),
})

Expand Down Expand Up @@ -579,7 +574,7 @@ func (c *Controller) runDeleteShootFlow(ctx context.Context, o *operation.Operat
})
deleteNamespace = g.Add(flow.Task{
Name: "Deleting shoot namespace in Seed",
Fn: flow.TaskFn(botanist.DeleteNamespace).Retry(defaultInterval),
Fn: flow.TaskFn(botanist.DeleteNamespace).RetryUntilTimeout(defaultInterval, defaultTimeout),
Dependencies: flow.NewTaskIDs(syncPoint, deleteDNSProviders, destroyReferencedResources),
})
_ = g.Add(flow.Task{
Expand Down
2 changes: 1 addition & 1 deletion pkg/gardenlet/controller/shoot/shoot_control_migrate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ func (c *Controller) runPrepareShootControlPlaneMigration(o *operation.Operation
})
deleteNamespace = g.Add(flow.Task{
Name: "Deleting shoot namespace in Seed",
Fn: flow.TaskFn(botanist.DeleteNamespace).Retry(defaultInterval),
Fn: flow.TaskFn(botanist.DeleteNamespace).RetryUntilTimeout(defaultInterval, defaultTimeout),
Dependencies: flow.NewTaskIDs(deleteAllExtensionCRs, destroyDNSProviders, deleteBackupEntryFromSeed, waitForManagedResourcesDeletion, scaleETCDToZero),
})
_ = g.Add(flow.Task{
Expand Down
13 changes: 0 additions & 13 deletions pkg/utils/flow/taskfn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,6 @@ func (t TaskFn) DoIf(condition bool) TaskFn {
return t.SkipIf(!condition)
}

// Retry returns a TaskFn that is retried until the timeout is reached.
// Deprecated: Retry handling should be done in the function itself, if necessary.
func (t TaskFn) Retry(interval time.Duration) TaskFn {
return func(ctx context.Context) error {
return retry.Until(ctx, interval, func(ctx context.Context) (done bool, err error) {
if err := t(ctx); err != nil {
return retry.MinorError(err)
}
return retry.Ok()
})
}
}

// Timeout returns a TaskFn that is bound to a context which times out.
func (t TaskFn) Timeout(timeout time.Duration) TaskFn {
return func(ctx context.Context) error {
Expand Down

0 comments on commit 5967c29

Please sign in to comment.