Skip to content
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

Jump to bottom

fix: Deploy User defined addons before external CCM initialization #3065

Merged
merged 1 commit into from
Mar 5, 2024
Merged

fix: Deploy User defined addons before external CCM initialization #3065

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
12 changes: 6 additions & 6 deletions pkg/tasks/tasks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,12 @@ func WithResources(t Tasks) Tasks {
Operation: "applying addons",
Description: "ensure embedded addons",
},
{
Fn: addons.EnsureUserAddons,
Operation: "applying addons",
Description: "ensure custom addons",
Predicate: func(s *state.State) bool { return s.Cluster.Addons != nil && s.Cluster.Addons.Enable },
},
{
Fn: localhelm.Deploy,
Operation: "releasing core helm charts",
Expand All @@ -280,12 +286,6 @@ func WithResources(t Tasks) Tasks {
Description: "ensure external CCM",
Predicate: func(s *state.State) bool { return s.Cluster.CloudProvider.External },
},
{
Fn: addons.EnsureUserAddons,
Operation: "applying addons",
Description: "ensure custom addons",
Predicate: func(s *state.State) bool { return s.Cluster.Addons != nil && s.Cluster.Addons.Enable },
},
{
Fn: ensureVsphereCSICABundleConfigMap,
Operation: "ensure vSphere CSI caBundle configMap",
Expand Down