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

fix(chart): Correct fix for ServiceMonitor indentation #6029

Merged
merged 1 commit into from
Apr 16, 2024

Conversation

stevehipwell
Copy link
Contributor

Fixes #N/A

Description
This fixes the pattern in the Helm ServiceMonitor template where the code was broken by #5571 (I have no idea why it was merged, but I suspect it was a fix for the pre-refactored chart version) and incorrectly fixed by #5624; the nindent value should match the indentation of the {{}} block.

How was this change tested?
I've tested this locally.

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.

@stevehipwell stevehipwell requested a review from a team as a code owner April 12, 2024 13:09
@stevehipwell stevehipwell requested a review from ljosyula April 12, 2024 13:09
Copy link

netlify bot commented Apr 12, 2024

Deploy Preview for karpenter-docs-prod ready!

Name Link
🔨 Latest commit 68e4b2d
🔍 Latest deploy log https://app.netlify.com/sites/karpenter-docs-prod/deploys/661d272970ef8e0009ff7fc5
😎 Deploy Preview https://deploy-preview-6029--karpenter-docs-prod.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@engedaam
Copy link
Contributor

@stevehipwell Can you post an example ServiceMonitor that you are expecting to be produced?

@stevehipwell
Copy link
Contributor Author

@engedaam I expect the ServiceMonitor to render correctly as it did when I refactored the Helm chart (before the two PRs mentioned in the description).

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

@coveralls
Copy link

Pull Request Test Coverage Report for Build 8689730314

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

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.02%) to 82.191%

Totals Coverage Status
Change from base Build 8671344908: 0.02%
Covered Lines: 5372
Relevant Lines: 6536

💛 - Coveralls

Copy link
Contributor

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

@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 🚀

@stevehipwell
Copy link
Contributor Author

@engedaam I don't think the failing E2E test is related to the changes.

@engedaam
Copy link
Contributor

Yeah, I agree the failing test is not related to the changes.

@engedaam engedaam merged commit 8e494f3 into aws:main Apr 16, 2024
28 of 29 checks passed
@stevehipwell stevehipwell deleted the fix-sm-indentation branch April 17, 2024 08:11
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.

3 participants