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

Sync with Openshift master #2

Merged
merged 95 commits into from
Aug 16, 2023
Merged

Sync with Openshift master #2

merged 95 commits into from
Aug 16, 2023

Conversation

slashpai
Copy link
Member

Since we reset the Openshift master branch last week it looks like we need to do this manually here as well for once

yangjunmyfm192085 and others added 30 commits January 28, 2022 23:58
Restore support for log specific flags in release-0.6 branch
Signed-off-by: Steve Hipwell <[email protected]>
(cherry picked from commit 5dece1a)
…-6-0

feat(chart): Update chart for v0.6.0
Signed-off-by: Steve Hipwell <[email protected]>
(cherry picked from commit 4dd4ea1)
Signed-off-by: Steve Hipwell <[email protected]>
(cherry picked from commit 0793bfa)
…sigs#960)

* chart - making liveness and readiness probe configurable

* changing chart condition from if to with

* chore[chart]: Update release CI

Signed-off-by: Steve Hipwell <[email protected]>

* chart - making liveness and readiness probe configurable

* Remove asterisk from v0.6.0 version required

* Fix charts and helm e2e test

Signed-off-by: JunYang <[email protected]>

Co-authored-by: Steve Hipwell <[email protected]>
Co-authored-by: Marek Siarkowicz <[email protected]>
Co-authored-by: JunYang <[email protected]>
(cherry picked from commit bdcadeb)
Signed-off-by: Steve Hipwell <[email protected]>
(cherry picked from commit d5fbc0d)
…odebatch

Handle error while parsing metrics(cherrypick: kubernetes-sigs#1009)
…langci-lint

update kind and golangci-lint version
…readme

Fix document: replace a broken link on README.md(cherrypick:https:kubernetes-sigs#1041)
…logcheck0.6

update logcheck for release0.6
…langci-lint-0.6

try to fix golangci-lint error
This change bumps the following libraries:
- client_golang => 1.11.1
- golang/x/crypto => v0.0.0-20220314234659-1baeb1ce4c0b
- golang/x/net => v0.0.0-20220906165146-f3363e06e74c
- golang/x/text => v0.3.8
- golang/x/sys => v0.0.0-20220728004956-3c1f35247d10

Signed-off-by: Damien Grisonnet <[email protected]>
…ase-0.6

Fix CVEs impacting release-0.6 branch
Signed-off-by: Damien Grisonnet <[email protected]>
dgrisonnet and others added 27 commits March 17, 2023 16:54
Kubernetes 1.23.17 updated their go version to the latest 1.19.x minor
version

Signed-off-by: JoaoBraveCoding <[email protected]>
[release-0.6] *: update registry location to registry.k8s.io
Signed-off-by: JoaoBraveCoding <[email protected]>
Issue: kubernetes-sigs#1219

Problem: when labels for the service are defined they will also show in
the annotations

Signed-off-by: JoaoBraveCoding <[email protected]>
…release-v3.9.0

Helm chart release v3.9.0
Signed-off-by: Calvin Bui <[email protected]>
Signed-off-by: Calvin Bui <[email protected]>
Signed-off-by: Steve Hipwell <[email protected]>
[release-0.6] Build image with go 1.19.11
Signed-off-by: Damien Grisonnet <[email protected]>
Signed-off-by: Jayapriya Pai <[email protected]>
Signed-off-by: Jayapriya Pai <[email protected]>
MON-3301: Sync metrics-server with upstream v0.6.4
@slashpai slashpai merged commit 45efd33 into rhobs:master Aug 16, 2023
monitoring-commit-bot bot pushed a commit that referenced this pull request Apr 4, 2024
Vulnerability #1: GO-2024-2611
    Infinite loop in JSON unmarshaling in google.golang.org/protobuf
  More info: https://pkg.go.dev/vuln/GO-2024-2611
  Module: google.golang.org/protobuf
    Found in: google.golang.org/[email protected]
    Fixed in: google.golang.org/[email protected]
    Example traces found:
      #1: json.Decoder.Peek
      #2: json.Decoder.Read
      openshift#3: protojson.Unmarshal
      openshift#4: protojson.UnmarshalOptions.Unmarshal

Signed-off-by: Damien Grisonnet <[email protected]>
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.