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.

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

[release/v1.7] Change order of ensureCABundleConfigMap task #3246

Merged
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
12 changes: 6 additions & 6 deletions pkg/tasks/tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,12 @@ func WithResources(t Tasks) Tasks {
Description: "ensure credential",
Predicate: func(s *state.State) bool { return s.Cluster.CloudProvider.SecretProviderClassName == "" },
},
{
Fn: ensureCABundleConfigMap,
Operation: "ensuring caBundle configMap",
Description: "ensure caBundle configMap",
Predicate: func(s *state.State) bool { return s.Cluster.CABundle != "" },
},
{
Fn: addons.Ensure,
Operation: "applying addons",
Expand All @@ -274,12 +280,6 @@ func WithResources(t Tasks) Tasks {
Fn: localhelm.Deploy,
Operation: "releasing core helm charts",
},
{
Fn: ensureCABundleConfigMap,
Operation: "ensuring caBundle configMap",
Description: "ensure caBundle configMap",
Predicate: func(s *state.State) bool { return s.Cluster.CABundle != "" },
},
{
Fn: externalccm.Ensure,
Operation: "ensuring external CCM",
Expand Down