Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

fix: patch backporting PR for meshconfig changes #3640

Merged
merged 1 commit into from
Jun 22, 2021

Conversation

jaellio
Copy link
Contributor

@jaellio jaellio commented Jun 22, 2021

Description:

Adds enablePrometheusScraping back to values.schema.json. Since
osm mesh upgrade reuses values from previous releases, the
enablePrometheusScraping flag must remain in the values schema to
avoid errors on upgrade even though it is no longer used in the
codebase.

Affected area:

Functional Area
New Functionality [ ]
Documentation [ ]
Install [ ]
CLI Tool [ ]
Certificate Management [ ]
Control Plane [ ]
Ingress [ ]
Egress [ ]
Networking [ ]
Observability [ ]
SMI Policy [ ]
Sidecar Injection [ ]
Security [ ]
Upgrade [ X ]
Tests [ ]
CI System [ ]
Demo [ ]
Performance [ ]
Other [ ]

Please answer the following questions with yes/no.

  1. Does this change contain code from or inspired by another project? No

    • Did you notify the maintainers and provide attribution?
  2. Is this a breaking change? No

@jaellio jaellio requested a review from a team as a code owner June 22, 2021 18:53
@codecov-commenter
Copy link

Codecov Report

Merging #3640 (735bd27) into release-v0.9 (d2fb07a) will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff                @@
##           release-v0.9    #3640      +/-   ##
================================================
- Coverage         66.44%   66.41%   -0.03%     
================================================
  Files               168      168              
  Lines              7912     7912              
================================================
- Hits               5257     5255       -2     
- Misses             2624     2626       +2     
  Partials             31       31              
Flag Coverage Δ
unittests 66.41% <ø> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/kubernetes/announcement_handlers.go 71.42% <0.00%> (-5.72%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d2fb07a...735bd27. Read the comment docs.

Adds enablePrometheusScraping back to values.schema.json. Since
osm mesh upgrade reuses values from previous releases, the
enablePrometheusScraping flag must remain in the values schema to
avoid errors on upgrade even though it is no longer used in the
codebase.

Signed-off-by: jaellio <[email protected]>
Copy link
Contributor

@nojnhuh nojnhuh left a comment

Choose a reason for hiding this comment

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

LGTM. I know the test will run after this is merged, but did you try it yourself to make sure this fixes it?

@jaellio jaellio merged commit 592240a into openservicemesh:release-v0.9 Jun 22, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants