fix: syntax errors in kube-state-metrics.libsonnet #2454

jeffmccune · 2024-07-24T23:45:25Z

Previously customizing kube-prometheus 1 failed with the following
error.

❯ ./build.sh example.jsonnet
+ set -o pipefail
+ rm -rf manifests
+ mkdir -p manifests/setup
+ jsonnet -J vendor -m manifests example.jsonnet
+ xargs '-I{}' sh -c 'cat {} | gojsontoyaml > {}.yaml' -- '{}'
RUNTIME ERROR: vendor/github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet:392:21-22 Expected token OPERATOR but got "{"
        vendor/kube-prometheus/components/kube-state-metrics.libsonnet:51:19-124        function <anonymous>
        vendor/kube-prometheus/main.libsonnet:136:21-64 object <anonymous>
        vendor/kube-prometheus/platforms/platforms.libsonnet:37:22-40   +:
        example.jsonnet:33:90-109       thunk from <$>
        <std>:1539:24-25        thunk from <function <anonymous>>
        <std>:1539:5-33 function <anonymous>
        example.jsonnet:33:73-110       $
        example.jsonnet:33:1-112
        example.jsonnet:33:1-112
        During evaluation

With this patch, the build succeeds:

❯ bash build.sh example.jsonnet ; echo $?
+ set -o pipefail
+ rm -rf manifests
+ mkdir -p manifests/setup
+ jsonnet -J vendor -m manifests example.jsonnet
+ xargs '-I{}' sh -c 'cat {} | gojsontoyaml > {}.yaml' -- '{}'
+ find manifests -type f '!' -name '*.yaml' -delete
+ rm -f kustomization
0

What this PR does / why we need it:

Quick follow up fix to syntax errors introduced in #2388 affecting kube-prometheus customization.

How does this change affect the cardinality of KSM: (increases, decreases or does not change cardinality)

Does not change.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):

Unknown, see #2388

linux-foundation-easycla · 2024-07-24T23:45:32Z

The committers listed above are authorized under a signed CLA.

✅ login: jeffmccune / name: Jeff McCune (3aebcf7)

k8s-ci-robot · 2024-07-24T23:45:34Z

Welcome @jeffmccune!

It looks like this is your first PR to kubernetes/kube-state-metrics 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kube-state-metrics has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

CatherineF-dev · 2024-07-24T23:57:10Z

/lgtm Thanks!

mrueg · 2024-07-25T05:27:59Z

/lgtm

mrueg · 2024-07-25T05:30:48Z

Looks like there are further changes needed. Can you regenerate it running make generate?

dgrisonnet · 2024-07-25T16:47:23Z

/assign @mrueg
/triage accepted

CatherineF-dev · 2024-07-26T12:19:55Z

jsonnet/kube-state-metrics/kube-state-metrics.libsonnet

-            selector{
-              matchLabels: {app.kubernetes.io/name': shardksmname}
-            }
+            selector: {


Thx for the fix.

move local shardksmname = ksm.name + "-unscheduled-pods-fetching"; to

deploymentNoNodePods: # <--------here local c = ksm.deployment.spec.template.spec.containers[0] {

generate manifests make generate

@CatherineF-dev Thanks, I made this change in a860c17 and ran make generate, but the CI failure, make validate-manifests is still failing locally for me. Could you help me understand why and what needs to be done to fix the CI job?

make validate-manifests

diff --git a/examples/daemonsetsharding/deployment-no-node-pods-service.yaml b/examples/daemonsetsharding/deployment-no-node-pods-service.yaml index 5f287b7a..ddf08923 100644 --- a/examples/daemonsetsharding/deployment-no-node-pods-service.yaml +++ b/examples/daemonsetsharding/deployment-no-node-pods-service.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics-no-node-pods - app.kubernetes.io/version: 2.12.0 + app.kubernetes.io/version: 2.13.0 name: kube-state-metrics-no-node-pods namespace: kube-system spec: diff --git a/examples/daemonsetsharding/deployment-no-node-pods.yaml b/examples/daemonsetsharding/deployment-no-node-pods.yaml index eac87a53..c3b6c00b 100644 --- a/examples/daemonsetsharding/deployment-no-node-pods.yaml +++ b/examples/daemonsetsharding/deployment-no-node-pods.yaml @@ -3,20 +3,20 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: exporter - app.kubernetes.io/name: kube-state-metrics-no-node-pods + app.kubernetes.io/name: kube-state-metrics-unscheduled-pods-fetching app.kubernetes.io/version: 2.13.0 - name: kube-state-metrics-no-node-pods + name: kube-state-metrics-unscheduled-pods-fetching namespace: kube-system spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/name: kube-state-metrics-no-node-pods + app.kubernetes.io/name: kube-state-metrics-unscheduled-pods-fetching template: metadata: labels: app.kubernetes.io/component: exporter - app.kubernetes.io/name: kube-state-metrics-no-node-pods + app.kubernetes.io/name: kube-state-metrics-unscheduled-pods-fetching app.kubernetes.io/version: 2.13.0 spec: automountServiceAccountToken: true @@ -31,7 +31,7 @@ spec: port: http-metrics initialDelaySeconds: 5 timeoutSeconds: 5 - name: kube-state-metrics-no-node-pods + name: kube-state-metrics-unscheduled-pods-fetching ports: - containerPort: 8080 name: http-metrics make: *** [validate-manifests] Error 1

Can you run make generate -B ?

My mistake, I forgot to commit the generated examples. 3aebcf7 should be good, passes locally for me.

Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: examples/daemonsetsharding/deployment-no-node-pods-service.yaml modified: examples/daemonsetsharding/deployment-no-node-pods.yaml

mrueg · 2024-07-30T07:12:35Z

@jeffmccune friendly ping, do you have time to fix the CI and include @CatherineF-dev's comments?

rgarcia89 · 2024-08-05T09:29:34Z

Any update here? https://github.com/prometheus-operator/kube-prometheus is currently not updating anymore due to this issue

jeffmccune · 2024-08-05T15:13:09Z

Yes I'll take a look at this today.

Previously customizing kube-prometheus [1] failed with the following error. ❯ ./build.sh example.jsonnet + set -o pipefail + rm -rf manifests + mkdir -p manifests/setup + jsonnet -J vendor -m manifests example.jsonnet + xargs '-I{}' sh -c 'cat {} | gojsontoyaml > {}.yaml' -- '{}' RUNTIME ERROR: vendor/github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet:392:21-22 Expected token OPERATOR but got "{" vendor/kube-prometheus/components/kube-state-metrics.libsonnet:51:19-124 function <anonymous> vendor/kube-prometheus/main.libsonnet:136:21-64 object <anonymous> vendor/kube-prometheus/platforms/platforms.libsonnet:37:22-40 +: example.jsonnet:33:90-109 thunk from <$> <std>:1539:24-25 thunk from <function <anonymous>> <std>:1539:5-33 function <anonymous> example.jsonnet:33:73-110 $ example.jsonnet:33:1-112 example.jsonnet:33:1-112 During evaluation With this patch, the build succeeds: ❯ bash build.sh example.jsonnet ; echo $? + set -o pipefail + rm -rf manifests + mkdir -p manifests/setup + jsonnet -J vendor -m manifests example.jsonnet + xargs '-I{}' sh -c 'cat {} | gojsontoyaml > {}.yaml' -- '{}' + find manifests -type f '!' -name '*.yaml' -delete + rm -f kustomization 0 [1]: https://github.com/prometheus-operator/kube-prometheus/blob/main/docs/customizing.md

CatherineF-dev · 2024-08-05T15:44:19Z

/lgtm

k8s-ci-robot · 2024-08-05T15:44:34Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CatherineF-dev, jeffmccune, mrueg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [mrueg]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

CatherineF-dev · 2024-08-05T15:46:22Z

I didn't know /lgtm will merge this PR without waiting presubmits to finish.

jeffmccune · 2024-08-05T15:48:12Z

I didn't know /lgtm will merge this PR without waiting presubmits to finish.

Me either, but I think we're good, it pulled in 3aebcf7 which should pass anyway.

mrueg · 2024-08-05T16:10:46Z

This looks like a race condition happened. I'll follow up.

k8s-ci-robot requested a review from CatherineF-dev July 24, 2024 23:45

k8s-ci-robot requested a review from dgrisonnet July 24, 2024 23:45

k8s-ci-robot added the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Jul 24, 2024

k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 24, 2024

jeffmccune mentioned this pull request Jul 24, 2024

fix: use --track-unscheduled-pods to select unscheduled pods in Daemonset sharding #2388

Merged

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jul 24, 2024

k8s-ci-robot assigned mrueg Jul 25, 2024

k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 25, 2024

k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jul 25, 2024

CatherineF-dev reviewed Jul 26, 2024

View reviewed changes

jeffmccune force-pushed the jeff/kp branch from 0ebaeb8 to a860c17 Compare August 5, 2024 15:22

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 5, 2024

jeffmccune force-pushed the jeff/kp branch from a860c17 to 3aebcf7 Compare August 5, 2024 15:42

k8s-ci-robot assigned CatherineF-dev Aug 5, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 5, 2024

k8s-ci-robot merged commit 312b298 into kubernetes:main Aug 5, 2024
3 checks passed

jeffmccune deleted the jeff/kp branch August 5, 2024 15:50

CatherineF-dev mentioned this pull request Aug 5, 2024

fix: e2e test failure #2467

Merged

philipgough mentioned this pull request Aug 6, 2024

Version update prometheus-operator/kube-prometheus#2474

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: syntax errors in kube-state-metrics.libsonnet #2454

fix: syntax errors in kube-state-metrics.libsonnet #2454

jeffmccune commented Jul 24, 2024

linux-foundation-easycla bot commented Jul 24, 2024 •

edited

Loading

k8s-ci-robot commented Jul 24, 2024

CatherineF-dev commented Jul 24, 2024

mrueg commented Jul 25, 2024

mrueg commented Jul 25, 2024

dgrisonnet commented Jul 25, 2024

CatherineF-dev Jul 26, 2024 •

edited

Loading

jeffmccune Aug 5, 2024

mrueg Aug 5, 2024

jeffmccune Aug 5, 2024 •

edited

Loading

mrueg commented Jul 30, 2024

rgarcia89 commented Aug 5, 2024

jeffmccune commented Aug 5, 2024

CatherineF-dev commented Aug 5, 2024

k8s-ci-robot commented Aug 5, 2024

CatherineF-dev commented Aug 5, 2024

jeffmccune commented Aug 5, 2024

mrueg commented Aug 5, 2024

fix: syntax errors in kube-state-metrics.libsonnet #2454

fix: syntax errors in kube-state-metrics.libsonnet #2454

Conversation

jeffmccune commented Jul 24, 2024

linux-foundation-easycla bot commented Jul 24, 2024 • edited Loading

k8s-ci-robot commented Jul 24, 2024

CatherineF-dev commented Jul 24, 2024

mrueg commented Jul 25, 2024

mrueg commented Jul 25, 2024

dgrisonnet commented Jul 25, 2024

CatherineF-dev Jul 26, 2024 • edited Loading

Choose a reason for hiding this comment

jeffmccune Aug 5, 2024

Choose a reason for hiding this comment

mrueg Aug 5, 2024

Choose a reason for hiding this comment

jeffmccune Aug 5, 2024 • edited Loading

Choose a reason for hiding this comment

mrueg commented Jul 30, 2024

rgarcia89 commented Aug 5, 2024

jeffmccune commented Aug 5, 2024

CatherineF-dev commented Aug 5, 2024

k8s-ci-robot commented Aug 5, 2024

CatherineF-dev commented Aug 5, 2024

jeffmccune commented Aug 5, 2024

mrueg commented Aug 5, 2024

linux-foundation-easycla bot commented Jul 24, 2024 •

edited

Loading

CatherineF-dev Jul 26, 2024 •

edited

Loading

jeffmccune Aug 5, 2024 •

edited

Loading