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

Migrate logger from knative to controller-runtime #6150

Merged
merged 1 commit into from
May 21, 2024

Conversation

jonathan-innis
Copy link
Contributor

@jonathan-innis jonathan-innis commented May 5, 2024

Fixes #N/A

Description

This updates from using the knative.dev/pkg logger to the controller-runtime-provided logger.

This is a buddy change to the upstream update of the logger: kubernetes-sigs/karpenter#1050

How was this change tested?

make presubmit
/karpenter snapshot

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.

Copy link

netlify bot commented May 5, 2024

Deploy Preview for karpenter-docs-prod canceled.

Name Link
🔨 Latest commit 2d7acba
🔍 Latest deploy log https://app.netlify.com/sites/karpenter-docs-prod/deploys/664bebb51adc340008df0f9a

@coveralls
Copy link

coveralls commented May 5, 2024

Pull Request Test Coverage Report for Build 9166879052

Details

  • 45 of 68 (66.18%) changed or added relevant lines in 20 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.03%) to 82.425%

Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/batcher/createfleet.go 0 1 0.0%
pkg/batcher/describeinstances.go 0 1 0.0%
pkg/controllers/interruption/controller.go 6 7 85.71%
pkg/providers/instancetype/instancetype.go 4 5 80.0%
pkg/providers/version/version.go 1 2 50.0%
pkg/providers/pricing/pricing.go 4 7 57.14%
pkg/providers/launchtemplate/launchtemplate.go 8 14 57.14%
pkg/operator/operator.go 0 9 0.0%
Totals Coverage Status
Change from base Build 9165375744: -0.03%
Covered Lines: 5492
Relevant Lines: 6663

💛 - Coveralls

Copy link
Contributor Author

@jonathan-innis jonathan-innis 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

Copy link
Contributor

github-actions bot commented May 7, 2024

Snapshot successfully published to oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter:0-3dd531858b3c8a6a72c66899161184ed409e74ce.
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-3dd531858b3c8a6a72c66899161184ed409e74ce" --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

@jonathan-innis jonathan-innis force-pushed the logging-migration branch 2 times, most recently from c277e12 to 547f1af Compare May 18, 2024 15:39
Copy link
Contributor Author

@jonathan-innis jonathan-innis 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

Copy link
Contributor

Snapshot successfully published to oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter:0-547f1af091bd42dadb9abe81be73c7bc0b0a113e.
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-547f1af091bd42dadb9abe81be73c7bc0b0a113e" --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

Copy link
Contributor

@njtran njtran left a comment

Choose a reason for hiding this comment

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

Looks like you missed some

./pkg/controllers/nodeclass/termination/controller.go:	ctx = logging.WithLogger(ctx, logging.FromContext(ctx).Named("nodeclass.termination").With("ec2nodeclass", nodeClass.Name))
./pkg/controllers/nodeclass/hash/controller.go:	ctx = logging.WithLogger(ctx, logging.FromContext(ctx).Named("nodeclass.hash").With("ec2nodeclass", nodeClass.Name))
./pkg/controllers/nodeclass/status/controller.go:	ctx = logging.WithLogger(ctx, logging.FromContext(ctx).Named("nodeclass.status").With("ec2nodeclass", nodeClass.Name))

out.log Outdated Show resolved Hide resolved
@jonathan-innis jonathan-innis force-pushed the logging-migration branch 6 times, most recently from b1ebcd9 to 4506599 Compare May 20, 2024 22:35
Copy link
Contributor Author

@jonathan-innis jonathan-innis 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

Copy link
Contributor

Snapshot successfully published to oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter:0-4506599b41ffc7beafd1ae3ce78a47f0475e2f87.
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-4506599b41ffc7beafd1ae3ce78a47f0475e2f87" --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

@jonathan-innis jonathan-innis marked this pull request as ready for review May 21, 2024 00:32
@jonathan-innis jonathan-innis requested a review from a team as a code owner May 21, 2024 00:32
Copy link
Contributor Author

@jonathan-innis jonathan-innis 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

Copy link
Contributor

Snapshot successfully published to oci://021119463062.dkr.ecr.us-east-1.amazonaws.com/karpenter/snapshot/karpenter:0-2d7acbabc82a4d6be86b93ad5f60df6424cbf216.
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-2d7acbabc82a4d6be86b93ad5f60df6424cbf216" --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

@jonathan-innis jonathan-innis enabled auto-merge (squash) May 21, 2024 18:21
Copy link
Contributor

@njtran njtran left a comment

Choose a reason for hiding this comment

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

LGTM 🚢

@jonathan-innis jonathan-innis merged commit d39fdb5 into aws:main May 21, 2024
27 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants