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

chore(meshhealthcheck): prevent targeting meshexternalservice by validation #11477

Merged
merged 1 commit into from
Sep 20, 2024
Merged

chore(meshhealthcheck): prevent targeting meshexternalservice by validation #11477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/plugins/policies/core/matchers/egress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ var _ = Describe("EgressMatchedPolicies", func() {
Expect(err).ToNot(HaveOccurred())
Expect(bytes).To(test_matchers.MatchGoldenYAML(strings.Replace(inputFile, ".input.", ".golden.", 1)))
},
Entry("should generate to resource rules for egress and mesh externalservice"),
XEntry("should generate to resource rules for egress and mesh externalservice"),
)
},
test.EntriesForFolder(filepath.Join("egressmatchedpolicies", "meshexternalservice", "torules")),
Expand All @@ -151,7 +151,7 @@ var _ = Describe("EgressMatchedPolicies", func() {
Expect(err).ToNot(HaveOccurred())
Expect(bytes).To(test_matchers.MatchGoldenYAML(strings.Replace(inputFile, ".input.", ".golden.", 1)))
},
Entry("should generate to resource rules for egress and mesh externalservice"),
XEntry("should generate to resource rules for egress and mesh externalservice"),
)
},
test.EntriesForFolder(filepath.Join("egressmatchedpolicies", "meshexternalservice", "fromtorules")),
Expand Down
1 change: 0 additions & 1 deletion pkg/plugins/policies/meshhealthcheck/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ func validateTo(topTargetRef common_api.TargetRef, to []To) validators.Validatio
SupportedKinds: []common_api.TargetRefKind{
common_api.Mesh,
common_api.MeshService,
common_api.MeshExternalService,
common_api.MeshMultiZoneService,
},
}))
Expand Down
4 changes: 2 additions & 2 deletions pkg/plugins/policies/meshhealthcheck/api/v1alpha1/validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ to:
tcp: # it will pick the protocol as described in 'protocol selection' section
disabled: true # new, default false, can be disabled for override
`),
Entry("to level MeshExternalService", `
XEntry("to level MeshExternalService", `
targetRef:
kind: Mesh
to:
Expand Down Expand Up @@ -295,7 +295,7 @@ violations:
- field: spec.to[0].default.http.expectedStatuses[1]
message: must be in inclusive range [100, 599]`,
}),
Entry("cannot use MeshExternalService with other type than Mesh", testCase{
XEntry("cannot use MeshExternalService with other type than Mesh", testCase{
inputYaml: `
targetRef:
kind: MeshSubset
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugins/policies/meshhealthcheck/plugin/v1alpha1/plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ var _ = Describe("MeshHealthCheck", func() {
}),
)

It("should generate correct configuration for MeshExternalService with ZoneEgress", func() {
XIt("should generate correct configuration for MeshExternalService with ZoneEgress", func() {
// given
rs := core_xds.NewResourceSet()
rs.Add(&core_xds.Resource{
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_env/universal/meshexternalservice/meshexternalservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ spec:
})
})

Context("MeshExternalService with MeshHealthCheck", func() {
XContext("MeshExternalService with MeshHealthCheck", func() {
E2EAfterEach(func() {
Expect(DeleteMeshResources(universal.Cluster, meshNameNoDefaults,
meshhealthcheck_api.MeshHealthCheckResourceTypeDescriptor,
Expand Down
Loading