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

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

Merged
merged 1,321 commits into from
Jun 1, 2023
Merged

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

merged 1,321 commits into from
Jun 1, 2023

Conversation

ngraham20
Copy link

No description provided.

k8s-ci-robot and others added 30 commits July 11, 2022 22:20
@k8s-ci-robot
Merge pull request kubernetes#1784 from ikarlashov/fix_customresource…
fad76e4 
…state_doc

Fix custom resource metrics documentation
@kaitoii11
add rolebinding metrics
51df8fe
@kaitoii11
fix typo
de8b1b4
@kaitoii11
fix filename and sort order
2cd6aaa
@k8s-ci-robot
Merge pull request kubernetes#1725 from tanguyfalconnet/feat/hpa/stat…
767af98 
…us_current_target

feat(hpa): status current metric
@kaitoii11 @mrueg
Apply suggestions from code review
df7dafe 
Co-authored-by: Manuel Rüger <[email protected]>
@kaitoii11
fix metrics name
aa01f53
@kaitoii11
fix typos
ba904d8
@dmpe
feat(logging): migrate to structured logging
f406c1a 
Signed-off-by: dmpe <John Malc> <[email protected]>
@dmpe @yangjunmyfm192085
Apply suggestions from code review
a2ccd75 
Co-authored-by: JUN YANG <[email protected]>
@dmpe @yangjunmyfm192085
Apply suggestions from code review
62beea0 
Co-authored-by: JUN YANG <[email protected]>
@dmpe @yangjunmyfm192085
Apply suggestions from code review
d5486a7 
Co-authored-by: JUN YANG <[email protected]>
@dmpe @yangjunmyfm192085
Apply suggestions from code review
ebb8b10 
Co-authored-by: JUN YANG <[email protected]>
@mrueg
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 <[email protected]>
@k8s-ci-robot
Merge pull request kubernetes#1808 from mrueg/drop-pkg-errors
9063fa6 
Replace pkg/errors with stdlib errors
@k8s-ci-robot
Merge pull request kubernetes#1807 from dmpe/strcuturedlogging_part1
4bb1b38 
feat(logging): migration to structure logging for main.go, pkg/ & internal/ folders
@chrischdi
pkg/customresourcestate implement info and stateSet metric type and r…
52d3ab6 
…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
@k8s-ci-robot
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
@k8s-ci-robot
Merge pull request kubernetes#1799 from kaitoii11/rolebinding
3532203 
Add support for rolebindings
@chrischdi
Do not expose info metric for nil objects
25f3b8f
@k8s-ci-robot
Merge pull request kubernetes#1809 from chrischdi/pr-info-nometric-nil
f1d5653 
Do not expose info metric for nil objects
@mrueg
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 <[email protected]>
@bavarianbidi
graduate new endpoint metrics to STABLE
9f7d1af 
* 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 <[email protected]>
@nabokihms
feat: Add local storage labels to kube_persistentvolume_info
a6984e0 
Signed-off-by: m.nabokikh <[email protected]>
@nabokihms
Make code inline with the other parts
9939059 
Signed-off-by: m.nabokikh <[email protected]>
@k8s-ci-robot
Merge pull request kubernetes#1812 from bavarianbidi/deprecate_precom…
69cc196 
…puted_endpoint_metrics

graduate new endpoint metrics to STABLE
@k8s-ci-robot
Merge pull request kubernetes#1789 from mrueg/update-go
5b017f7 
Update dependencies
@mrueg
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 <[email protected]>
@chrischdi
Prevent multiple custom resource configurations for the same resource
44831f7
@nabokihms
Add host path metrics, fix table formatting
9e639b2 
Signed-off-by: m.nabokikh <[email protected]>
arturhoo and others added 8 commits March 16, 2023 10:41
@ngraham20
Copy link
Author

/go/pkg/mod/k8s.io/[email protected]/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

@subbarao-meduri
Copy link

/retest-required

1 similar comment
@ngraham20
Copy link
Author

/retest-required

@ngraham20
Copy link
Author

/override sonar-pre-submit

@openshift-ci
Copy link

openshift-ci bot commented May 30, 2023

@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
Copy link
Author

/override ci/prow/sonar-pre-submit

@openshift-ci
Copy link

openshift-ci bot commented May 30, 2023

@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
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm label May 31, 2023
@subbarao-meduri subbarao-meduri changed the title Upgrade with resolved merge conflict [ACM-5438] Upgrade with resolved merge conflict May 31, 2023
subbarao-meduri
subbarao-meduri approved these changes Jun 1, 2023
View reviewed changes
Copy link

@subbarao-meduri subbarao-meduri left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Jun 1, 2023

[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

@subbarao-meduri subbarao-meduri merged commit 21c309e into stolostron:release-2.8 Jun 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@subbarao-meduri subbarao-meduri subbarao-meduri approved these changes

Assignees

@subbarao-meduri subbarao-meduri

@dislbenn dislbenn

Labels
approved lgtm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.