-
Notifications
You must be signed in to change notification settings - Fork 996
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added version controller and other feedback
- Loading branch information
Showing
16 changed files
with
228 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package version | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/awslabs/operatorpkg/singleton" | ||
| lop "github.com/samber/lo/parallel" | ||
| "go.uber.org/multierr" | ||
| controllerruntime "sigs.k8s.io/controller-runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/manager" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
| "sigs.k8s.io/karpenter/pkg/operator/injection" | ||
|
|
||
| "github.com/aws/karpenter-provider-aws/pkg/providers/version" | ||
| ) | ||
|
|
||
| type Controller struct { | ||
| versionProvider *version.DefaultProvider | ||
| } | ||
|
|
||
| func NewController(versionProvider *version.DefaultProvider) *Controller { | ||
| return &Controller{ | ||
| versionProvider: versionProvider, | ||
| } | ||
| } | ||
|
|
||
| func (c *Controller) Reconcile(ctx context.Context) (reconcile.Result, error) { | ||
| ctx = injection.WithControllerName(ctx, "providers.version") | ||
|
|
||
| work := []func(ctx context.Context) error{ | ||
| c.versionProvider.UpdateVersion, | ||
| } | ||
| errs := make([]error, len(work)) | ||
| lop.ForEach(work, func(f func(ctx context.Context) error, i int) { | ||
| if err := f(ctx); err != nil { | ||
| errs[i] = err | ||
| } | ||
| }) | ||
| if err := multierr.Combine(errs...); err != nil { | ||
| return reconcile.Result{}, fmt.Errorf("updating version, %w", err) | ||
| } | ||
| return reconcile.Result{RequeueAfter: 5 * time.Minute}, nil | ||
| } | ||
|
|
||
| func (c *Controller) Register(_ context.Context, m manager.Manager) error { | ||
| // Includes a default exponential failure rate limiter of base: time.Millisecond, and max: 1000*time.Second | ||
| return controllerruntime.NewControllerManagedBy(m). | ||
| Named("providers.version"). | ||
| WatchesRawSource(singleton.Source()). | ||
| Complete(singleton.AsReconciler(c)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package version_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "sigs.k8s.io/karpenter/pkg/test/v1alpha1" | ||
|
|
||
| coreoptions "sigs.k8s.io/karpenter/pkg/operator/options" | ||
| coretest "sigs.k8s.io/karpenter/pkg/test" | ||
|
|
||
| "github.com/aws/aws-sdk-go-v2/service/eks" | ||
| ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" | ||
| "github.com/aws/karpenter-provider-aws/pkg/apis" | ||
| controllersversion "github.com/aws/karpenter-provider-aws/pkg/controllers/providers/version" | ||
| "github.com/aws/karpenter-provider-aws/pkg/operator/options" | ||
| "github.com/aws/karpenter-provider-aws/pkg/test" | ||
| "github.com/samber/lo" | ||
|
|
||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| . "sigs.k8s.io/karpenter/pkg/test/expectations" | ||
| . "sigs.k8s.io/karpenter/pkg/utils/testing" | ||
| ) | ||
|
|
||
| var ctx context.Context | ||
| var stop context.CancelFunc | ||
| var env *coretest.Environment | ||
| var awsEnv *test.Environment | ||
| var controller *controllersversion.Controller | ||
|
|
||
| func TestAWS(t *testing.T) { | ||
| ctx = TestContextWithLogger(t) | ||
| RegisterFailHandler(Fail) | ||
| RunSpecs(t, "InstanceType") | ||
| } | ||
|
|
||
| var _ = BeforeSuite(func() { | ||
| env = coretest.NewEnvironment(coretest.WithCRDs(apis.CRDs...), coretest.WithCRDs(v1alpha1.CRDs...)) | ||
| ctx = coreoptions.ToContext(ctx, coretest.Options()) | ||
| ctx = options.ToContext(ctx, test.Options()) | ||
| ctx, stop = context.WithCancel(ctx) | ||
| awsEnv = test.NewEnvironment(ctx, env) | ||
| controller = controllersversion.NewController(awsEnv.VersionProvider) | ||
| }) | ||
|
|
||
| var _ = AfterSuite(func() { | ||
| stop() | ||
| Expect(env.Stop()).To(Succeed(), "Failed to stop environment") | ||
| }) | ||
|
|
||
| var _ = BeforeEach(func() { | ||
| ctx = coreoptions.ToContext(ctx, coretest.Options()) | ||
| ctx = options.ToContext(ctx, test.Options()) | ||
|
|
||
| awsEnv.Reset() | ||
| }) | ||
|
|
||
| var _ = AfterEach(func() { | ||
| ExpectCleanedUp(ctx, env.Client) | ||
| }) | ||
|
|
||
| var _ = Describe("Version", func() { | ||
| It("should update Version with response from the DescribeCluster API", func() { | ||
| awsEnv.EKSAPI.DescribeClusterBehavior.Output.Set(&eks.DescribeClusterOutput{ | ||
| Cluster: &ekstypes.Cluster{ | ||
| Version: lo.ToPtr("1.29"), | ||
| }, | ||
| }) | ||
| ExpectSingletonReconciled(ctx, controller) | ||
| Expect(awsEnv.VersionProvider.Get(ctx)).To(Equal("1.29")) | ||
| }) | ||
| }) |
Oops, something went wrong.