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.

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

Jump to bottom

chore: Instance Profile V2 migration #7097

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

chore: Instance Profile V2 migration #7097

wants to merge 12 commits into from
+257 −98

Conversation

edibble21
Copy link

Fixes #N/A

Description
Migrated Instance Profile Provider V2 Migration and updated tests.

How was this change tested?
make presubmit
make test
make ci-test

Does this change impact docs?

Does this change impact docs?

  • Yes, PR includes docs updates
  • Yes, issue opened: #
  • No

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@edibble21 edibble21 requested a review from a team as a code owner September 27, 2024 21:12
@netlify Netlify
Copy link

netlify bot commented Sep 27, 2024 •
edited
Loading

✅ Deploy Preview for karpenter-docs-prod canceled.

Name Link
🔨 Latest commit f3a9486
🔍 Latest deploy log https://app.netlify.com/sites/karpenter-docs-prod/deploys/66ff22facd5fe80008dffd18

@coveralls
Copy link

coveralls commented Sep 27, 2024 •
edited
Loading

Pull Request Test Coverage Report for Build 11171039211

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 53 of 108 (49.07%) changed or added relevant lines in 4 files are covered.
  • 8 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.5%) to 82.76%
Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/providers/instanceprofile/instanceprofile.go 17 20 85.0%
pkg/errors/errors.go 10 14 71.43%
pkg/operator/operator.go 0 8 0.0%
pkg/fake/iamapi.go 26 66 39.39%
Files with Coverage Reduction New Missed Lines %
pkg/errors/errors.go 4 55.56%
pkg/fake/iamapi.go 4 64.23%
Totals Coverage Status
Change from base Build 11146769679: -0.5%
Covered Lines: 5583
Relevant Lines: 6746
💛 - Coveralls

engedaam
engedaam reviewed Sep 27, 2024
View reviewed changes
Copy link
Contributor

@engedaam engedaam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work 🚀

pkg/aws/sdk/sdk.go Outdated Show resolved Hide resolved
pkg/operator/operator.go Outdated Show resolved Hide resolved
pkg/operator/operator.go Outdated Show resolved Hide resolved
pkg/operator/operator.go Outdated Show resolved Hide resolved
pkg/operator/operator.go Outdated Show resolved Hide resolved
@edibble21 edibble21 force-pushed the V2Migration branch 2 times, most recently from 9e0aee3 to 6b069c1 Compare September 27, 2024 22:44
engedaam
engedaam reviewed Sep 27, 2024
View reviewed changes
pkg/operator/operator.go Outdated Show resolved Hide resolved
pkg/operator/operator.go Outdated Show resolved Hide resolved
pkg/operator/operator.go Outdated Show resolved Hide resolved
engedaam
engedaam reviewed Oct 1, 2024
View reviewed changes
Copy link
Contributor

@engedaam engedaam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

few nits

pkg/operator/operator.go Outdated
region, err := metaDataClient.GetRegion(ctx, nil)
if err != nil {
log.FromContext(ctx).Error(err, "failed to get region from metadata server")
os.Exit(1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should do a lo.Must instead of an os.Exit(1)

pkg/operator/operator.go Outdated
@@ -130,10 +136,24 @@ func NewOperator(ctx context.Context, operator *operator.Operator) (context.Cont
log.FromContext(ctx).WithValues("kube-dns-ip", kubeDNSIP).V(1).Info("discovered kube dns")
}

//v2
cfg := lo.Must(configV2.LoadDefaultConfig(ctx))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should define and use the default retry logic https://aws.github.io/aws-sdk-go-v2/docs/configuring-sdk/retries-timeouts/#standard-retryer

pkg/fake/iamapi.go Outdated Show resolved Hide resolved
pkg/fake/iamapi.go Outdated Show resolved Hide resolved
@engedaam engedaam self-assigned this Oct 1, 2024
@edibble21 edibble21 force-pushed the V2Migration branch 3 times, most recently from a4c75e0 to 32f468e Compare October 1, 2024 21:07
engedaam
engedaam reviewed Oct 1, 2024
View reviewed changes
pkg/fake/iamapi.go Outdated Show resolved Hide resolved
engedaam
engedaam reviewed Oct 1, 2024
View reviewed changes
pkg/fake/iamapi.go Outdated Show resolved Hide resolved
engedaam
engedaam reviewed Oct 1, 2024
View reviewed changes
pkg/fake/iamapi.go Outdated Show resolved Hide resolved
engedaam
engedaam reviewed Oct 1, 2024
View reviewed changes
Copy link
Contributor

@engedaam engedaam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few nits

engedaam
engedaam reviewed Oct 1, 2024
View reviewed changes
Copy link
Contributor

@engedaam engedaam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/karpenter snapshot

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 1, 2024

Snapshot successfully published to oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter:0-32f468e16bead00ae4cb2ad91d95c0e1fbc5c39d.
To install you must login to the ECR repo with an AWS account:

aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 021119463062.dkr.ecr.us-east-1.amazonaws.com

helm upgrade --install karpenter oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter --version "0-32f468e16bead00ae4cb2ad91d95c0e1fbc5c39d" --namespace "kube-system" --create-namespace \
  --set "settings.clusterName=${CLUSTER_NAME}" \
  --set "settings.interruptionQueue=${CLUSTER_NAME}" \
  --set controller.resources.requests.cpu=1 \
  --set controller.resources.requests.memory=1Gi \
  --set controller.resources.limits.cpu=1 \
  --set controller.resources.limits.memory=1Gi \
  --wait

engedaam
engedaam reviewed Oct 2, 2024
View reviewed changes
Copy link
Contributor

@engedaam engedaam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/karpenter snapshot

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 2, 2024

Snapshot successfully published to oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter:0-224bb0bb8fac94e6720f6860485483d160c56b56.
To install you must login to the ECR repo with an AWS account:

aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 021119463062.dkr.ecr.us-east-1.amazonaws.com

helm upgrade --install karpenter oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter --version "0-224bb0bb8fac94e6720f6860485483d160c56b56" --namespace "kube-system" --create-namespace \
  --set "settings.clusterName=${CLUSTER_NAME}" \
  --set "settings.interruptionQueue=${CLUSTER_NAME}" \
  --set controller.resources.requests.cpu=1 \
  --set controller.resources.requests.memory=1Gi \
  --set controller.resources.limits.cpu=1 \
  --set controller.resources.limits.memory=1Gi \
  --wait

@edibble21 edibble21 changed the title Instance Profile V2 migration chore: Instance Profile V2 migration Oct 2, 2024
engedaam
engedaam reviewed Oct 2, 2024
View reviewed changes
Copy link
Contributor

@engedaam engedaam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/karpenter snapshot

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 2, 2024

Snapshot successfully published to oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter:0-9239910c97b551935a519d263c84008eee703f17.
To install you must login to the ECR repo with an AWS account:

aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 021119463062.dkr.ecr.us-east-1.amazonaws.com

helm upgrade --install karpenter oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter --version "0-9239910c97b551935a519d263c84008eee703f17" --namespace "kube-system" --create-namespace \
  --set "settings.clusterName=${CLUSTER_NAME}" \
  --set "settings.interruptionQueue=${CLUSTER_NAME}" \
  --set controller.resources.requests.cpu=1 \
  --set controller.resources.requests.memory=1Gi \
  --set controller.resources.limits.cpu=1 \
  --set controller.resources.limits.memory=1Gi \
  --wait

rschalo
rschalo reviewed Oct 2, 2024
View reviewed changes
pkg/aws/sdk/sdk.go Outdated Show resolved Hide resolved
engedaam
engedaam reviewed Oct 3, 2024
View reviewed changes
Copy link
Contributor

@engedaam engedaam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/karpenter snapshot

pkg/operator/operator.go Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 3, 2024

Snapshot successfully published to oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter:0-2413324714a6b3b2664512fafeb765dd7e2acd3a.
To install you must login to the ECR repo with an AWS account:

aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 021119463062.dkr.ecr.us-east-1.amazonaws.com

helm upgrade --install karpenter oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter --version "0-2413324714a6b3b2664512fafeb765dd7e2acd3a" --namespace "kube-system" --create-namespace \
  --set "settings.clusterName=${CLUSTER_NAME}" \
  --set "settings.interruptionQueue=${CLUSTER_NAME}" \
  --set controller.resources.requests.cpu=1 \
  --set controller.resources.requests.memory=1Gi \
  --set controller.resources.limits.cpu=1 \
  --set controller.resources.limits.memory=1Gi \
  --wait

engedaam
engedaam reviewed Oct 4, 2024
View reviewed changes
pkg/operator/operator.go
if cfg.Region == "" {
log.FromContext(ctx).V(1).Info("retrieving region from IMDS")
metaDataClient := imds.NewFromConfig(cfg)
cfg.Region = lo.Must(metaDataClient.GetRegion(ctx, nil)).Region
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a follow-up, we should add in an error message here https://github.com/aws/karpenter-provider-aws/pull/7097/files#diff-99c0290799daf9abc6240df64063e20bfaf67b371577b67ac7eec6f4725622ffR111

engedaam
engedaam approved these changes Oct 4, 2024
View reviewed changes
Copy link
Contributor

@engedaam engedaam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rschalo rschalo rschalo left review comments

@engedaam engedaam engedaam approved these changes

@jigisha620 jigisha620 Awaiting requested review from jigisha620 jigisha620 is a code owner automatically assigned from aws/karpenter

Assignees

@engedaam engedaam

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@edibble21 @coveralls @rschalo @engedaam