[ACM-5438] Upgrade with resolved merge conflict #39

ngraham20 · 2023-05-24T21:07:45Z

No description provided.

…state_doc Fix custom resource metrics documentation

…us_current_target feat(hpa): status current metric

Co-authored-by: Manuel Rüger <manuel@rueg.eu>

Signed-off-by: dmpe <John Malc> <cincenko@outlook.com>

Co-authored-by: JUN YANG <yang.jun22@zte.com.cn>

github.com/pkg/errors is archived and not maintained anymore. Replace it with stdlib functions. Signed-off-by: Manuel Rüger <manuel@rueg.eu>

Replace pkg/errors with stdlib errors

feat(logging): migration to structure logging for main.go, pkg/ & internal/ folders

…efactor configuration file * Adds detection of booleans in string format to getNum. * Refactors configuration file to allow definition of different metric types having different configuration variables. * Refactor order of types and funcs in pkg/customersourcestate. * Allows info and stateSet metrics to iterate over arrays. * Adds `nilIsZero` config variable to gauge to indicate non-existing values to tread as 0 value instead of returning an error. * Skip adding a label instead of setting value to `<nil>`. * Replace namespace and subsystem by metricsNamePrefix * Adjust docs for customresourcestate metrics to align with new configuration file

…ic-types-2 pkg/customresourcestate implement info and stateSet metric type and refactor configuration file

Add support for rolebindings

Do not expose info metric for nil objects

go v1.18.3 -> v1.18.5 prometheus v2.35.0 -> v2.37.0 golangci-lint v1.46.2 -> v1.48.0 Several go dependencies, among them: k8s v1.24.2 -> v1.24.4 cloudbuild image v20211118-2f2d816b90 -> v20220609-2e4c91eb7e Signed-off-by: Manuel Rüger <manuel@rueg.eu>

* graduate kube_endpoint_ports and kube_endpoint_address to STABLE * graduate kube_endpoint_address_not_ready and kube_endpoint_address_available to DEPRECATED as the information is precomputed during metrics-scraping Signed-off-by: Mario Constanti <mario@constanti.de>

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

…puted_endpoint_metrics graduate new endpoint metrics to STABLE

Update dependencies

These resources might create a lot of metrics, so we won't enable them by default for now. Signed-off-by: Manuel Rüger <manuel@rueg.eu>

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

Signed-off-by: Manuel Rüger <manuel@rueg.eu>

Release v2.8.2

Signed-off-by: Nathaniel Graham <[nathaniel.graham@protonmail.com, ngraham@redhat.com]>

…ics into release-2.8

ngraham20 · 2023-05-25T19:39:57Z

/go/pkg/mod/k8s.io/component-base@v0.26.1/metrics/registry.go:35:29: undefined: atomic.Bool
note: module requires Go 1.19

it looks like prow needs to run this with Go 1.19

Signed-off-by: Nathaniel Graham <[nathaniel.graham@protonmail.com, ngraham@redhat.com]>

subbarao-meduri · 2023-05-30T17:23:18Z

/retest-required

ngraham20 · 2023-05-30T22:13:04Z

/retest-required

ngraham20 · 2023-05-30T22:38:46Z

/override sonar-pre-submit

openshift-ci · 2023-05-30T22:38:52Z

@ngraham20: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

sonar-pre-submit

Only the following failed contexts/checkruns were expected:

ci/prow/images
ci/prow/ocm-ci-rbac
ci/prow/pr-image-mirror
ci/prow/sonar-pre-submit
ci/prow/test
pull-ci-stolostron-kube-state-metrics-release-2.4-images
pull-ci-stolostron-kube-state-metrics-release-2.4-ocm-ci-rbac
pull-ci-stolostron-kube-state-metrics-release-2.4-pr-image-mirror
pull-ci-stolostron-kube-state-metrics-release-2.4-sonar-pre-submit
pull-ci-stolostron-kube-state-metrics-release-2.4-test
tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

In response to this:

/override sonar-pre-submit

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

ngraham20 · 2023-05-30T22:40:48Z

/override ci/prow/sonar-pre-submit

openshift-ci · 2023-05-30T22:40:55Z

@ngraham20: Overrode contexts on behalf of ngraham20: ci/prow/sonar-pre-submit

In response to this:

/override ci/prow/sonar-pre-submit

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

dislbenn · 2023-05-31T16:59:44Z

/lgtm

subbarao-meduri

/lgtm

openshift-ci · 2023-06-01T01:13:26Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dislbenn, ngraham20, subbarao-meduri

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~~ [dislbenn,ngraham20,subbarao-meduri]

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

k8s-ci-robot and others added 30 commits July 11, 2022 22:20

Merge pull request kubernetes#1784 from ikarlashov/fix_customresource…

fad76e4

…state_doc Fix custom resource metrics documentation

add rolebinding metrics

51df8fe

fix typo

de8b1b4

fix filename and sort order

2cd6aaa

Merge pull request kubernetes#1725 from tanguyfalconnet/feat/hpa/stat…

767af98

…us_current_target feat(hpa): status current metric

Apply suggestions from code review

df7dafe

Co-authored-by: Manuel Rüger <manuel@rueg.eu>

fix metrics name

aa01f53

fix typos

ba904d8

feat(logging): migrate to structured logging

f406c1a

Signed-off-by: dmpe <John Malc> <cincenko@outlook.com>

Apply suggestions from code review

a2ccd75

Co-authored-by: JUN YANG <yang.jun22@zte.com.cn>

Apply suggestions from code review

62beea0

Co-authored-by: JUN YANG <yang.jun22@zte.com.cn>

Apply suggestions from code review

d5486a7

Co-authored-by: JUN YANG <yang.jun22@zte.com.cn>

Apply suggestions from code review

ebb8b10

Co-authored-by: JUN YANG <yang.jun22@zte.com.cn>

Replace pkg/errors with stdlib errors

2f20203

github.com/pkg/errors is archived and not maintained anymore. Replace it with stdlib functions. Signed-off-by: Manuel Rüger <manuel@rueg.eu>

Merge pull request kubernetes#1808 from mrueg/drop-pkg-errors

9063fa6

Replace pkg/errors with stdlib errors

Merge pull request kubernetes#1807 from dmpe/strcuturedlogging_part1

4bb1b38

feat(logging): migration to structure logging for main.go, pkg/ & internal/ folders

Merge pull request kubernetes#1777 from chrischdi/poc-additional-metr…

b314ccb

…ic-types-2 pkg/customresourcestate implement info and stateSet metric type and refactor configuration file

Merge pull request kubernetes#1799 from kaitoii11/rolebinding

3532203

Add support for rolebindings

Do not expose info metric for nil objects

25f3b8f

Merge pull request kubernetes#1809 from chrischdi/pr-info-nometric-nil

f1d5653

Do not expose info metric for nil objects

Update dependencies

03906e6

go v1.18.3 -> v1.18.5 prometheus v2.35.0 -> v2.37.0 golangci-lint v1.46.2 -> v1.48.0 Several go dependencies, among them: k8s v1.24.2 -> v1.24.4 cloudbuild image v20211118-2f2d816b90 -> v20220609-2e4c91eb7e Signed-off-by: Manuel Rüger <manuel@rueg.eu>

feat: Add local storage labels to kube_persistentvolume_info

a6984e0

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

Make code inline with the other parts

9939059

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

Merge pull request kubernetes#1812 from bavarianbidi/deprecate_precom…

69cc196

…puted_endpoint_metrics graduate new endpoint metrics to STABLE

Merge pull request kubernetes#1789 from mrueg/update-go

5b017f7

Update dependencies

Remove RBAC resources from default exposed metric set

93e79fc

These resources might create a lot of metrics, so we won't enable them by default for now. Signed-off-by: Manuel Rüger <manuel@rueg.eu>

Prevent multiple custom resource configurations for the same resource

44831f7

Add host path metrics, fix table formatting

9e639b2

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

arturhoo and others added 8 commits March 16, 2023 10:41

Update golangci-lint version

5a8d9b7

Update golang and go deps

2f5775f

Signed-off-by: Manuel Rüger <manuel@rueg.eu>

*: Cut v2.8.2

2812b27

Merge pull request kubernetes#2029 from mrueg/prep-v2.8.2

3ed7a6c

Release v2.8.2

checked out upstream upgrade tag and replayed custom changes on top

4c47d9a

Signed-off-by: Nathaniel Graham <[nathaniel.graham@protonmail.com, ngraham@redhat.com]>

removed travis CI yaml file

9fcce5f

Signed-off-by: Nathaniel Graham <[nathaniel.graham@protonmail.com, ngraham@redhat.com]>

updated Dockerfile.prow to try go1.19

6267578

Signed-off-by: Nathaniel Graham <[nathaniel.graham@protonmail.com, ngraham@redhat.com]>

Merge branch 'upgrade-v2.8.2' of github.com:ngraham20/kube-state-metr…

ff25838

…ics into release-2.8

ngraham20 added the do-not-merge/hold label May 24, 2023

ngraham20 requested a review from subbarao-meduri May 24, 2023 21:07

openshift-ci bot added the approved label May 24, 2023

updated go.mod to specify go1.20

53b1f8f

Signed-off-by: Nathaniel Graham <[nathaniel.graham@protonmail.com, ngraham@redhat.com]>

openshift-ci bot assigned dislbenn May 31, 2023

openshift-ci bot added the lgtm label May 31, 2023

ngraham20 removed the do-not-merge/hold label May 31, 2023

subbarao-meduri changed the title ~~Upgrade with resolved merge conflict~~ [ACM-5438] Upgrade with resolved merge conflict May 31, 2023

ngraham20 added the do-not-merge/hold label May 31, 2023

subbarao-meduri approved these changes Jun 1, 2023

View reviewed changes

openshift-ci bot assigned subbarao-meduri Jun 1, 2023

subbarao-meduri removed the do-not-merge/hold label Jun 1, 2023

subbarao-meduri merged commit 21c309e into stolostron:release-2.8 Jun 1, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ACM-5438] Upgrade with resolved merge conflict #39

[ACM-5438] Upgrade with resolved merge conflict #39

ngraham20 commented May 24, 2023

ngraham20 commented May 25, 2023

subbarao-meduri commented May 30, 2023

ngraham20 commented May 30, 2023

ngraham20 commented May 30, 2023

openshift-ci bot commented May 30, 2023

ngraham20 commented May 30, 2023

openshift-ci bot commented May 30, 2023

dislbenn commented May 31, 2023

subbarao-meduri left a comment

openshift-ci bot commented Jun 1, 2023

[ACM-5438] Upgrade with resolved merge conflict #39

[ACM-5438] Upgrade with resolved merge conflict #39

Conversation

ngraham20 commented May 24, 2023

ngraham20 commented May 25, 2023

subbarao-meduri commented May 30, 2023

ngraham20 commented May 30, 2023

ngraham20 commented May 30, 2023

openshift-ci bot commented May 30, 2023

ngraham20 commented May 30, 2023

openshift-ci bot commented May 30, 2023

dislbenn commented May 31, 2023

subbarao-meduri left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Jun 1, 2023