Skip to content

Commit

Permalink
Deploy User defined addons before external CCM initialization (#3065)
Browse files Browse the repository at this point in the history
Signed-off-by: Artiom Diomin <artiom@kubermatic.com>
  • Loading branch information
kron4eg committed Mar 5, 2024
1 parent d03cc58 commit 6da8a17
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions pkg/tasks/tasks.go
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

0 comments on commit 6da8a17

Please sign in to comment.