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

Remove namespace from core Entity #458

Merged
merged 13 commits into from
Nov 29, 2019
Merged

Remove namespace from core Entity #458

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b7eb40d
chore(*) remove namespace from core entity
jakubdyszkiewicz Nov 20, 2019
d2f02b3
chore(*) fix namespace in many places
jakubdyszkiewicz Nov 20, 2019
84297a2
chore(*) change separator in node id
jakubdyszkiewicz Nov 21, 2019
f15ff2a
chore(*) changes to fix the setup on k8s
jakubdyszkiewicz Nov 21, 2019
5bdba4a
chore(*) add util to converting k8s namespaced name to core name
jakubdyszkiewicz Nov 21, 2019
5463fb5
feat(kuma-cp) mesh as cluster resource on k8s
jakubdyszkiewicz Nov 26, 2019
7f417f7
feat(kuma-cp) revert proxy id format
jakubdyszkiewicz Nov 26, 2019
118cceb
chore(kuma-cp) fix postgres list impl
jakubdyszkiewicz Nov 26, 2019
70753fd
Merge remote-tracking branch 'origin/master' into chore/remove-namespace
jakubdyszkiewicz Nov 26, 2019
e0d8f4a
chore(*) remove leftover mesh with namespace
jakubdyszkiewicz Nov 26, 2019
afc9cde
chore(*) cluster scope mesh in install, revert default mesh changes
jakubdyszkiewicz Nov 26, 2019
d3478da
postgres fixes, review
jakubdyszkiewicz Nov 28, 2019
f75d994
refactor CoreNameToK8sName func
jakubdyszkiewicz Nov 29, 2019
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 app/kumactl/cmd/apply/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ func upsert(rs store.ResourceStore, res model.Resource) error {
return err
}
meta := res.GetMeta()
if err := rs.Get(context.Background(), newRes, store.GetByKey(meta.GetNamespace(), meta.GetName(), meta.GetMesh())); err != nil {
if err := rs.Get(context.Background(), newRes, store.GetByKey(meta.GetName(), meta.GetMesh())); err != nil {
if store.IsResourceNotFound(err) {
return rs.Create(context.Background(), res, store.CreateByKey(meta.GetNamespace(), meta.GetName(), meta.GetMesh()))
return rs.Create(context.Background(), res, store.CreateByKey(meta.GetName(), meta.GetMesh()))
} else {
return err
}
Expand Down
11 changes: 4 additions & 7 deletions app/kumactl/cmd/apply/apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,12 @@ var _ = Describe("kumactl apply", func() {

ValidatePersistedResource := func() {
resource := mesh.DataplaneResource{}
err := store.Get(context.Background(), &resource, core_store.GetByKey("default", "sample", "default"))
err := store.Get(context.Background(), &resource, core_store.GetByKey("sample", "default"))
Expect(err).ToNot(HaveOccurred())

// then
Expect(resource.Meta.GetName()).To(Equal("sample"))
Expect(resource.Meta.GetMesh()).To(Equal("default"))
Expect(resource.Meta.GetNamespace()).To(Equal("default"))
// and
Expect(resource.Spec.Networking.Inbound).To(HaveLen(1))
Expect(resource.Spec.Networking.Inbound[0].Interface).To(Equal("1.1.1.1:80:8080"))
Expand Down Expand Up @@ -143,7 +142,7 @@ var _ = Describe("kumactl apply", func() {
},
},
}
err := store.Create(context.Background(), &newResource, core_store.CreateByKey("default", "sample", "default"))
err := store.Create(context.Background(), &newResource, core_store.CreateByKey("sample", "default"))
Expect(err).ToNot(HaveOccurred())

// given
Expand Down Expand Up @@ -176,13 +175,12 @@ var _ = Describe("kumactl apply", func() {
// when
resource := mesh.MeshResource{}
// with production code, the mesh is not required for remote store. API Server then infer mesh from the name
err = store.Get(context.Background(), &resource, core_store.GetByKey("default", "sample", ""))
err = store.Get(context.Background(), &resource, core_store.GetByKey("sample", ""))
Expect(err).ToNot(HaveOccurred())

// then
Expect(resource.Meta.GetName()).To(Equal("sample"))
Expect(resource.Meta.GetMesh()).To(Equal(""))
Expect(resource.Meta.GetNamespace()).To(Equal("default"))
})

It("should apply a new Dataplane resource from URL", func() {
Expand Down Expand Up @@ -242,13 +240,12 @@ var _ = Describe("kumactl apply", func() {
// when
resource := mesh.MeshResource{}
// with production code, the mesh is not required for remote store. API Server then infer mesh from the name
err = store.Get(context.Background(), &resource, core_store.GetByKey("default", "meshinit", ""))
err = store.Get(context.Background(), &resource, core_store.GetByKey("meshinit", ""))
Expect(err).ToNot(HaveOccurred())

// then
Expect(resource.Meta.GetName()).To(Equal("meshinit"))
Expect(resource.Meta.GetMesh()).To(Equal(""))
Expect(resource.Meta.GetNamespace()).To(Equal("default"))
})

It("should return kuma api server error", func() {
Expand Down
15 changes: 6 additions & 9 deletions app/kumactl/cmd/get/get_dataplanes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ var _ = Describe("kumactl get dataplanes", func() {
dataplanes = []*mesh_core.DataplaneResource{
{
Meta: &test_model.ResourceMeta{
Mesh: "default",
Namespace: "trial",
Name: "experiment",
Mesh: "default",
Name: "experiment",
},
Spec: mesh_proto.Dataplane{
Networking: &mesh_proto.Dataplane_Networking{
Expand All @@ -62,9 +61,8 @@ var _ = Describe("kumactl get dataplanes", func() {
},
{
Meta: &test_model.ResourceMeta{
Mesh: "default",
Namespace: "demo",
Name: "example",
Mesh: "default",
Name: "example",
},
Spec: mesh_proto.Dataplane{
Networking: &mesh_proto.Dataplane_Networking{
Expand Down Expand Up @@ -105,9 +103,8 @@ var _ = Describe("kumactl get dataplanes", func() {

for _, pt := range dataplanes {
key := core_model.ResourceKey{
Mesh: pt.Meta.GetMesh(),
Namespace: pt.Meta.GetNamespace(),
Name: pt.Meta.GetName(),
Mesh: pt.Meta.GetMesh(),
Name: pt.Meta.GetName(),
}
err := store.Create(context.Background(), pt, core_store.CreateBy(key))
Expect(err).ToNot(HaveOccurred())
Expand Down
15 changes: 6 additions & 9 deletions app/kumactl/cmd/get/get_meshes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ var _ = Describe("kumactl get meshes", func() {
},
},
Meta: &test_model.ResourceMeta{
Mesh: "mesh1",
Name: "mesh1",
Namespace: "",
Mesh: "mesh1",
Name: "mesh1",
},
},
{
Expand All @@ -57,9 +56,8 @@ var _ = Describe("kumactl get meshes", func() {
},
},
Meta: &test_model.ResourceMeta{
Mesh: "mesh2",
Name: "mesh2",
Namespace: "",
Mesh: "mesh2",
Name: "mesh2",
},
},
}
Expand All @@ -86,9 +84,8 @@ var _ = Describe("kumactl get meshes", func() {

for _, ds := range sampleMeshes {
key := core_model.ResourceKey{
Mesh: ds.Meta.GetMesh(),
Namespace: ds.Meta.GetNamespace(),
Name: ds.Meta.GetName(),
Mesh: ds.Meta.GetMesh(),
Name: ds.Meta.GetName(),
}
err := store.Create(context.Background(), ds, core_store.CreateBy(key))
Expect(err).ToNot(HaveOccurred())
Expand Down
20 changes: 8 additions & 12 deletions app/kumactl/cmd/get/get_proxytemplates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,22 @@ var _ = Describe("kumactl get proxytemplates", func() {
sampleProxyTemplates = []*mesh_core.ProxyTemplateResource{
{
Meta: &test_model.ResourceMeta{
Mesh: "default",
Namespace: "trial",
Name: "custom-template",
Mesh: "default",
Name: "custom-template",
},
Spec: mesh_proto.ProxyTemplate{},
},
{
Meta: &test_model.ResourceMeta{
Mesh: "default",
Namespace: "demo",
Name: "another-template",
Mesh: "default",
Name: "another-template",
},
Spec: mesh_proto.ProxyTemplate{},
},
{
Meta: &test_model.ResourceMeta{
Mesh: "pilot",
Namespace: "default",
Name: "simple-template",
Mesh: "pilot",
Name: "simple-template",
},
Spec: mesh_proto.ProxyTemplate{},
},
Expand Down Expand Up @@ -81,9 +78,8 @@ var _ = Describe("kumactl get proxytemplates", func() {

for _, pt := range sampleProxyTemplates {
key := core_model.ResourceKey{
Mesh: pt.Meta.GetMesh(),
Namespace: pt.Meta.GetNamespace(),
Name: pt.Meta.GetName(),
Mesh: pt.Meta.GetMesh(),
Name: pt.Meta.GetName(),
}
err := store.Create(context.Background(), pt, core_store.CreateBy(key))
Expect(err).ToNot(HaveOccurred())
Expand Down
10 changes: 4 additions & 6 deletions app/kumactl/cmd/get/get_traffic_logs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@ var _ = Describe("kumactl get traffic-logs", func() {
},
},
Meta: &test_model.ResourceMeta{
Mesh: "default",
Name: "web1-to-backend1",
Namespace: "",
Mesh: "default",
Name: "web1-to-backend1",
},
},
{
Expand All @@ -78,9 +77,8 @@ var _ = Describe("kumactl get traffic-logs", func() {
},
},
Meta: &test_model.ResourceMeta{
Mesh: "default",
Name: "web2-to-backend2",
Namespace: "",
Mesh: "default",
Name: "web2-to-backend2",
},
},
}
Expand Down
20 changes: 8 additions & 12 deletions app/kumactl/cmd/get/get_traffic_routes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,22 @@ var _ = Describe("kumactl get traffic-routes", func() {
sampleTrafficRoutes = []*mesh_core.TrafficRouteResource{
{
Meta: &test_model.ResourceMeta{
Mesh: "default",
Namespace: "trial",
Name: "web-to-backend",
Mesh: "default",
Name: "web-to-backend",
},
Spec: mesh_proto.TrafficRoute{},
},
{
Meta: &test_model.ResourceMeta{
Mesh: "default",
Namespace: "demo",
Name: "backend-to-db",
Mesh: "default",
Name: "backend-to-db",
},
Spec: mesh_proto.TrafficRoute{},
},
{
Meta: &test_model.ResourceMeta{
Mesh: "pilot",
Namespace: "default",
Name: "gateway-to-service",
Mesh: "pilot",
Name: "gateway-to-service",
},
Spec: mesh_proto.TrafficRoute{},
},
Expand Down Expand Up @@ -81,9 +78,8 @@ var _ = Describe("kumactl get traffic-routes", func() {

for _, pt := range sampleTrafficRoutes {
key := core_model.ResourceKey{
Mesh: pt.Meta.GetMesh(),
Namespace: pt.Meta.GetNamespace(),
Name: pt.Meta.GetName(),
Mesh: pt.Meta.GetMesh(),
Name: pt.Meta.GetName(),
}
err := store.Create(context.Background(), pt, core_store.CreateBy(key))
Expect(err).ToNot(HaveOccurred())
Expand Down
10 changes: 4 additions & 6 deletions app/kumactl/cmd/get/get_trafficpermissions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@ var _ = Describe("kumactl get traffic-permissions", func() {
},
},
Meta: &test_model.ResourceMeta{
Mesh: "default",
Name: "web1-to-backend1",
Namespace: "",
Mesh: "default",
Name: "web1-to-backend1",
},
},
{
Expand All @@ -72,9 +71,8 @@ var _ = Describe("kumactl get traffic-permissions", func() {
},
},
Meta: &test_model.ResourceMeta{
Mesh: "default",
Name: "web2-to-backend2",
Namespace: "",
Mesh: "default",
Name: "web2-to-backend2",
},
},
}
Expand Down
10 changes: 4 additions & 6 deletions app/kumactl/cmd/inspect/inspect_dataplanes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ var _ = Describe("kumactl inspect dataplanes", func() {
sampleDataplaneOverview = []*mesh_core.DataplaneOverviewResource{
{
Meta: &test_model.ResourceMeta{
Mesh: "default",
Namespace: "trial",
Name: "experiment",
Mesh: "default",
Name: "experiment",
},
Spec: mesh_proto.DataplaneOverview{
Dataplane: &mesh_proto.Dataplane{
Expand Down Expand Up @@ -108,9 +107,8 @@ var _ = Describe("kumactl inspect dataplanes", func() {
},
{
Meta: &test_model.ResourceMeta{
Mesh: "default",
Namespace: "demo",
Name: "example",
Mesh: "default",
Name: "example",
},
Spec: mesh_proto.DataplaneOverview{
Dataplane: &mesh_proto.Dataplane{
Expand Down
2 changes: 1 addition & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ spec:
names:
kind: Mesh
plural: meshes
scope: ""
scope: Cluster
validation:
openAPIV3Schema:
description: Mesh is the Schema for the meshes API
Expand Down
2 changes: 1 addition & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ spec:
names:
kind: Mesh
plural: meshes
scope: ""
scope: Cluster
validation:
openAPIV3Schema:
description: Mesh is the Schema for the meshes API
Expand Down
2 changes: 1 addition & 1 deletion app/kumactl/data/install/k8s/control-plane/crds/kuma.io_meshes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
names:
kind: Mesh
plural: meshes
scope: ""
scope: Cluster
validation:
openAPIV3Schema:
description: Mesh is the Schema for the meshes API
Expand Down
16 changes: 8 additions & 8 deletions app/kumactl/pkg/install/k8s/control-plane/templates_vfsdata.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pkg/api-server/dataplane_overview_ws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ func (r *overviewWs) inspectDataplane(request *restful.Request, response *restfu

func (r *overviewWs) fetchOverview(ctx context.Context, name string, meshName string) (*mesh.DataplaneOverviewResource, error) {
dataplane := mesh.DataplaneResource{}
if err := r.resManager.Get(ctx, &dataplane, store.GetByKey(namespace, name, meshName)); err != nil {
if err := r.resManager.Get(ctx, &dataplane, store.GetByKey(name, meshName)); err != nil {
return nil, err
}

insight := mesh.DataplaneInsightResource{}
err := r.resManager.Get(ctx, &insight, store.GetByKey(namespace, name, meshName))
err := r.resManager.Get(ctx, &insight, store.GetByKey(name, meshName))
if err != nil && !store.IsResourceNotFound(err) { // It's fine to have dataplane without insight
return nil, err
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/api-server/dataplane_overview_ws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ var _ = Describe("Dataplane Overview WS", func() {
})

BeforeEach(func() {
err := resourceStore.Create(context.Background(), &mesh_core.MeshResource{}, store.CreateByKey("default", "mesh1", "mesh1"))
err := resourceStore.Create(context.Background(), &mesh_core.MeshResource{}, store.CreateByKey("mesh1", "mesh1"))
Expect(err).ToNot(HaveOccurred())
})

Expand All @@ -66,7 +66,7 @@ var _ = Describe("Dataplane Overview WS", func() {
},
},
}
err := resourceStore.Create(context.Background(), &dpResource, store.CreateByKey("default", "dp1", "mesh1"))
err := resourceStore.Create(context.Background(), &dpResource, store.CreateByKey("dp1", "mesh1"))
Expect(err).ToNot(HaveOccurred())

sampleTime, _ := time.Parse(time.RFC3339, "2019-07-01T00:00:00+00:00")
Expand All @@ -82,7 +82,7 @@ var _ = Describe("Dataplane Overview WS", func() {
},
},
}
err = resourceStore.Create(context.Background(), &insightResource, store.CreateByKey("default", "dp1", "mesh1"))
err = resourceStore.Create(context.Background(), &insightResource, store.CreateByKey("dp1", "mesh1"))
Expect(err).ToNot(HaveOccurred())
})

Expand Down
Loading