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

chore(kuma-cp) Introduce ZoneIngress #2147

Merged
merged 22 commits into from
Jun 14, 2021

Conversation

lobkovilya
Copy link
Contributor

Summary

Current PR aims to replace dataplane-based Ingress with a new type ZoneIngress.

TODO:

  • kumactl cli

Full changelog

  • [Implement ...]
  • [Fix ...]

Issues resolved

Fix #XXX

Documentation

Testing

  • Unit tests
  • E2E tests
  • Manual testing on Universal
  • Manual testing on Kubernetes

Nikolay Nikolaev and others added 8 commits May 25, 2021 16:08
Signed-off-by: Nikolay Nikolaev <nikolay.nikolaev@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>

# Conflicts:
#	pkg/sds/server/v2/reconciler.go
#	pkg/sds/server/v2/server.go
#	test/e2e/deploy/kuma_deploy_universal.go
#	test/e2e/healthcheck/hybrid/healthcheck_hybrid.go
#	test/e2e/hybrid/kuma_hybrid.go
#	test/e2e/hybrid/kuma_hybrid_kube_global.go
#	test/e2e/trafficpermission/hybrid/traffic_permission_hybrid.go
#	test/e2e/trafficroute/universal_multizone/traffic_route.go
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
pkg/config/app/kuma-dp/config.go Outdated Show resolved Hide resolved
pkg/core/resources/apis/mesh/zone_ingress_validator.go Outdated Show resolved Hide resolved
api/mesh/v1alpha1/zone_ingress.proto Outdated Show resolved Hide resolved
pkg/xds/server/callbacks/dataplane_lifecycle.go Outdated Show resolved Hide resolved
pkg/xds/server/callbacks/dataplane_status_tracker.go Outdated Show resolved Hide resolved
pkg/xds/server/components.go Show resolved Hide resolved
pkg/xds/sync/dataplane_watchdog.go Show resolved Hide resolved
test/framework/universal_clusters.go Show resolved Hide resolved
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>

# Conflicts:
#	pkg/kds/global/components.go
#	test/e2e/trafficroute/universal_multizone/traffic_route.go
@lobkovilya lobkovilya marked this pull request as ready for review June 14, 2021 03:35
@lobkovilya lobkovilya requested a review from a team as a code owner June 14, 2021 03:35
@@ -16,25 +16,25 @@ func validateZoneIngress(path validators.PathBuilder, ingress *mesh_proto.ZoneIn
return validators.ValidationError{}
}
var err validators.ValidationError
if ingress.GetAdvertisedAddress() == "" && ingress.GetAdvertisedPort() != 0 {
if ingress.GetNetworking().GetAdvertisedAddress() == "" && ingress.GetNetworking().GetAdvertisedPort() != 0 {
err.AddViolationAt(path.Field("advertisedAddress"), `has to be defined with advertisedPort`)
Copy link
Contributor

Choose a reason for hiding this comment

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

are validator paths correct now?

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@jakubdyszkiewicz jakubdyszkiewicz merged commit 5ad1e85 into master Jun 14, 2021
@jakubdyszkiewicz jakubdyszkiewicz deleted the chore/introduce_zone_ingress branch June 14, 2021 10:24
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.

None yet

2 participants