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

Sync with upstream #596

Merged
merged 12 commits into from
Aug 23, 2024
12 changes: 12 additions & 0 deletions docs/release_notes/0.189.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Release v0.189.0

## 🐛 Bug Fixes

- Skip creating OIDC manager for Outposts clusters (#7934)
- Fixes segfault when VPC CNI is disabled (#7927)
- Fix SSM unit tests (#7935)

## Acknowledgments

The eksctl maintainers would like to sincerely thank @EmmEff.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ require (
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/cli v25.0.1+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v26.1.4+incompatible // indirect
github.com/docker/docker v26.1.5+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.0 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -917,8 +917,8 @@ github.com/docker/cli v25.0.1+incompatible h1:mFpqnrS6Hsm3v1k7Wa/BO23oz0k121MTbT
github.com/docker/cli v25.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU=
github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g=
github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8=
github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40=
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
Expand Down
23 changes: 15 additions & 8 deletions pkg/actions/addon/tasks.go
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
4 changes: 3 additions & 1 deletion pkg/ami/ssm_resolver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,9 @@
It("should support SSM parameter generation for all AMI types but Windows", func() {
var eksAMIType ekstypes.AMITypes
for _, amiType := range eksAMIType.Values() {
if amiType == ekstypes.AMITypesCustom || strings.HasPrefix(string(amiType), "WINDOWS_") {
if amiType == ekstypes.AMITypesCustom || strings.HasPrefix(string(amiType), "WINDOWS_") ||
// TODO: remove this condition after adding support for AL2023 Nvidia and Neuron AMI types.
amiType == ekstypes.AMITypesAl2023X8664Nvidia || amiType == ekstypes.AMITypesAl2023X8664Neuron {

Check failure on line 606 in pkg/ami/ssm_resolver_test.go

View workflow job for this annotation

GitHub Actions / Lint

undefined: ekstypes.AMITypesAl2023X8664Nvidia

Check failure on line 606 in pkg/ami/ssm_resolver_test.go

View workflow job for this annotation

GitHub Actions / Lint

undefined: ekstypes.AMITypesAl2023X8664Neuron
continue
}
ssmParameterName := MakeManagedSSMParameterName(api.LatestVersion, amiType)
Expand Down
2 changes: 1 addition & 1 deletion pkg/ctl/cmdutils/configfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ func validateBareCluster(clusterConfig *api.ClusterConfig) error {
return nil
}
if clusterConfig.HasNodes() || clusterConfig.IsFargateEnabled() || clusterConfig.Karpenter != nil || clusterConfig.HasGitOpsFluxConfigured() ||
(clusterConfig.IAM != nil && (len(clusterConfig.IAM.ServiceAccounts) > 0) || len(clusterConfig.IAM.PodIdentityAssociations) > 0) {
(clusterConfig.IAM != nil && ((len(clusterConfig.IAM.ServiceAccounts) > 0) || len(clusterConfig.IAM.PodIdentityAssociations) > 0)) {
return errors.New("fields nodeGroups, managedNodeGroups, fargateProfiles, karpenter, gitops, iam.serviceAccounts, " +
"and iam.podIdentityAssociations are not supported during cluster creation in a cluster without VPC CNI; please remove these fields " +
"and add them back after cluster creation is successful")
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package version
// This file was generated by release_generate.go; DO NOT EDIT.

// Version is the version number in semver format X.Y.Z
var Version = "0.189.0"
var Version = "0.190.0"

// PreReleaseID can be empty for releases, "rc.X" for release candidates and "dev" for snapshots
var PreReleaseID = "dev"
Expand Down
Loading