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

Backport meshconfig changes #3631

Merged
merged 2 commits into from
Jun 22, 2021
Merged

Conversation

jaellio
Copy link
Contributor

@jaellio jaellio commented Jun 21, 2021

Description:

Cherry-picks 55e3b3b and 3f8d154 for v0.9.
Signed-off-by: Jackie Elliott [email protected]

  • ref(*): move feature flags to meshconfig
    Signed-off-by: Jackie Elliott [email protected]

  • prometheusScraping: Remove prometheus scraping flag
    Signed-off-by: Sneha Chhabria [email protected]

Affected area:

Functional Area
New Functionality [ ]
Documentation [ ]
Install [ ]
CLI Tool [ ]
Certificate Management [ ]
Control Plane [ ]
Ingress [ ]
Egress [ ]
Networking [ ]
Observability [ ]
SMI Policy [ ]
Sidecar Injection [ ]
Security [ ]
Upgrade [ ]
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?

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

@codecov-commenter
Copy link

Codecov Report

Merging #3631 (097b498) into release-v0.9 (09cdbc2) will decrease coverage by 0.13%.
The diff coverage is 43.18%.

Impacted file tree graph

@@               Coverage Diff                @@
##           release-v0.9    #3631      +/-   ##
================================================
- Coverage         66.57%   66.44%   -0.14%     
================================================
  Files               169      168       -1     
  Lines              7904     7912       +8     
================================================
- Hits               5262     5257       -5     
- Misses             2611     2624      +13     
  Partials             31       31              
Flag Coverage Δ
unittests 66.44% <43.18%> (-0.14%) ⬇️

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

Impacted Files Coverage Δ
cmd/cli/install.go 70.79% <ø> (-0.76%) ⬇️
cmd/osm-controller/osm-controller.go 15.87% <ø> (-1.30%) ⬇️
pkg/catalog/catalog.go 92.85% <0.00%> (-7.15%) ⬇️
pkg/catalog/fake.go 37.39% <0.00%> (-0.33%) ⬇️
pkg/catalog/mock_catalog_generated.go 0.00% <0.00%> (ø)
pkg/configurator/mock_client_generated.go 0.00% <0.00%> (ø)
pkg/debugger/feature_flags.go 16.66% <0.00%> (-3.34%) ⬇️
pkg/envoy/xdsutil.go 89.24% <ø> (ø)
pkg/kubernetes/mock_controller_generated.go 0.00% <0.00%> (ø)
pkg/kubernetes/types.go 100.00% <ø> (ø)
... and 11 more

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 09cdbc2...097b498. Read the comment docs.

@shashankram
Copy link
Member

@jaellio The backport should preserve the commit history if multiple commits are involved, as in this case. Do not squash these.

@jaellio jaellio marked this pull request as ready for review June 21, 2021 22:58
@jaellio jaellio requested a review from a team as a code owner June 21, 2021 22:58
@jaellio jaellio merged commit 1faf00b 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.

4 participants