Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions api/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions controllers/handlers_helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ func undeployHelmChartsInPullMode(ctx context.Context, c client.Client, clusterS
}
} else {
// if the status is deployed it means pre/post delete hooks have been deployed. So proceed undeploying
if status != nil && *status.DeploymentStatus == libsveltosv1beta1.FeatureStatusProvisioned {
if status != nil && status.DeploymentStatus != nil && *status.DeploymentStatus == libsveltosv1beta1.FeatureStatusProvisioned {
if isLeavePolicies(clusterSummary, logger) {
logger.V(logs.LogInfo).Info("ClusterProfile StopMatchingBehavior set to LeavePolicies")
}
Expand All @@ -385,10 +385,10 @@ func undeployHelmChartsInPullMode(ctx context.Context, c client.Client, clusterS
return pullmode.RemoveDeployedResources(ctx, getManagementClusterClient(), clusterSummary.Spec.ClusterNamespace,
clusterSummary.Spec.ClusterName, configv1beta1.ClusterSummaryKind, clusterSummary.Name,
string(libsveltosv1beta1.FeatureHelm), logger, setters...)
} else if status != nil && *status.DeploymentStatus == libsveltosv1beta1.FeatureStatusProvisioning {
} else if status != nil && status.DeploymentStatus != nil && *status.DeploymentStatus == libsveltosv1beta1.FeatureStatusProvisioning {
logger.V(logs.LogInfo).Info("Applier is handling delete hooks")
return nil
} else if status != nil && *status.DeploymentStatus == libsveltosv1beta1.FeatureStatusFailed {
} else if status != nil && status.DeploymentStatus != nil && *status.DeploymentStatus == libsveltosv1beta1.FeatureStatusFailed {
msg := "Applier failed."
if status.FailureMessage != nil {
msg += fmt.Sprintf("Failure message: %s", *status.FailureMessage)
Expand Down
2 changes: 2 additions & 0 deletions controllers/resourcesummary_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ func prepareCluster() *clusterv1.Cluster {
Expect(testEnv.Create(context.TODO(), cluster)).To(Succeed())
Expect(testEnv.Create(context.TODO(), machine)).To(Succeed())
Expect(waitForObject(context.TODO(), testEnv.Client, ns)).To(Succeed())
Expect(waitForObject(context.TODO(), testEnv.Client, cluster)).To(Succeed())
Expect(waitForObject(context.TODO(), testEnv.Client, machine)).To(Succeed())

initialized := true
cluster.Status.Initialization.ControlPlaneInitialized = &initialized
Expand Down