Skip to content

🌱 Use condition to mark false clusteraddon.yaml #252

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
janiskemper merged 1 commit into from
Sep 4, 2024
Merged

🌱 Use condition to mark false clusteraddon.yaml #252

Show file tree
Hide file tree
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
14 changes: 11 additions & 3 deletions api/v1alpha1/conditions_const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const (

const (
// HelmChartFoundCondition reports when mentioned helm chart is present in the cluster addon tar archive.
HelmChartFoundCondition = "HelmChartFound"
HelmChartFoundCondition clusterv1.ConditionType = "HelmChartFound"

// HelmChartMissingReason is used when mentioned helm chart is missing in the cluster addon tar archive.
HelmChartMissingReason = "HelmChartMissing"
Expand All @@ -62,6 +62,14 @@ const (
TemplateNewClusterStackFailedReason = "TemplateNewClusterStackFailed"
)

const (
// ClusterAddonConfigValidatedCondition reports when there is a error parsing clusteraddon.yaml.
ClusterAddonConfigValidatedCondition clusterv1.ConditionType = "ClusterAddonConfigValidated"

// ParsingClusterAddonConfigFailedReason is used when there's some error happen while parsing clusteraddon.yaml.
ParsingClusterAddonConfigFailedReason = "ParsingClusterAddonConfigFailed"
)

const (
// HelmChartAppliedCondition reports on whether the relevant helm chart has been applied.
HelmChartAppliedCondition clusterv1.ConditionType = "HelmChartApplied"
Expand Down Expand Up @@ -91,7 +99,7 @@ const (

const (
// ProviderClusterStackReleasesSyncedCondition reports on whether the ProviderClusterStackReleases are ready.
ProviderClusterStackReleasesSyncedCondition = "ProviderClusterStackReleasesSynced"
ProviderClusterStackReleasesSyncedCondition clusterv1.ConditionType = "ProviderClusterStackReleasesSynced"

// ProviderTemplateNotFoundReason is used when providerTemplate is not found.
ProviderTemplateNotFoundReason = "ProviderTemplateNotFound"
Expand All @@ -102,7 +110,7 @@ const (

const (
// ClusterStackReleasesSyncedCondition reports on whether the ClusterStackReleases are ready.
ClusterStackReleasesSyncedCondition = "ClusterStackReleasesSynced" //#nosec
ClusterStackReleasesSyncedCondition clusterv1.ConditionType = "ClusterStackReleasesSynced" //#nosec
)

const (
Expand Down
17 changes: 16 additions & 1 deletion internal/controller/clusteraddon_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,23 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
// multi-stage cluster addon flow
in.addonStagesInput, err = r.getAddonStagesInput(in.restConfig, in.clusterAddonChartPath)
if err != nil {
return reconcile.Result{}, fmt.Errorf("failed to get addon stages input: %w", err)
conditions.MarkFalse(
clusterAddon,
csov1alpha1.ClusterAddonConfigValidatedCondition,
csov1alpha1.ParsingClusterAddonConfigFailedReason,
clusterv1.ConditionSeverityError,
"cluster addon config (clusteraddon.yaml) is wrong: %s", err.Error(),
)

record.Warnf(
clusterAddon,
csov1alpha1.ParsingClusterAddonConfigFailedReason,
"cluster addon config (clusteraddon.yaml) is wrong: %s", err.Error(),
)

return reconcile.Result{}, nil
}
conditions.MarkTrue(clusterAddon, csov1alpha1.ClusterAddonConfigValidatedCondition)

// clusteraddon.yaml in the release.
clusterAddonConfig, err := clusteraddon.ParseConfig(in.clusterAddonConfigPath)
Expand Down