Skip to content

Skip creating OIDC manager for Outposts clusters #7934

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
cPu1 merged 1 commit into from
Aug 16, 2024
Merged

Skip creating OIDC manager for Outposts clusters #7934

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
23 changes: 15 additions & 8 deletions pkg/actions/addon/tasks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (

api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
"github.com/weaveworks/eksctl/pkg/eks"
iamoidc "github.com/weaveworks/eksctl/pkg/iam/oidc"
"github.com/weaveworks/eksctl/pkg/utils/tasks"
)

Expand Down Expand Up @@ -183,14 +184,20 @@ func (t *createAddonTask) Do(errorCh chan error) error {
}

func createAddonManager(ctx context.Context, clusterProvider *eks.ClusterProvider, cfg *api.ClusterConfig) (*Manager, error) {
oidc, err := clusterProvider.NewOpenIDConnectManager(ctx, cfg)
if err != nil {
return nil, err
}

oidcProviderExists, err := oidc.CheckProviderExists(ctx)
if err != nil {
return nil, err
var (
oidc *iamoidc.OpenIDConnectManager
oidcProviderExists bool
)
if api.IsEnabled(cfg.IAM.WithOIDC) {
var err error
oidc, err = clusterProvider.NewOpenIDConnectManager(ctx, cfg)
if err != nil {
return nil, err
}
oidcProviderExists, err = oidc.CheckProviderExists(ctx)
if err != nil {
return nil, err
}
}

stackManager := clusterProvider.NewStackManager(cfg)
Expand Down