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

kuma-dp: rename #164

Merged
merged 4 commits into from
Sep 7, 2019
Merged

kuma-dp: rename #164

merged 4 commits into from
Sep 7, 2019

Conversation

jakubdyszkiewicz
Copy link
Contributor

No description provided.

yskopets
yskopets reviewed Sep 6, 2019
View reviewed changes
components/konvoy-control-plane/Makefile Outdated
@@ -68,7 +68,7 @@ BINTRAY_USERNAME ?=
BINTRAY_API_KEY ?=

KONVOY_CP_DOCKER_IMAGE ?= konvoy/konvoy-control-plane:latest
KONVOY_DP_DOCKER_IMAGE ?= konvoy/konvoy-dataplane:latest
KUMA_DP_DOCKER_IMAGE ?= konvoy/kuma-dataplane:latest
Copy link
Contributor

Choose a reason for hiding this comment

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

I think, it should be kuma/kuma-dataplane:latest

components/konvoy-control-plane/app/kumactl/cmd/install/install_control_plane.go Outdated
@@ -50,7 +50,7 @@ func newInstallControlPlaneCmd(pctx *kumactl_cmd.RootContext) *cobra.Command {
InjectorServiceName: "konvoy-injector",
InjectorTlsCert: "",
InjectorTlsKey: "",
DataplaneImage: "konvoy/konvoy-dataplane",
DataplaneImage: "konvoy/kuma-dataplane",
Copy link
Contributor

Choose a reason for hiding this comment

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

I think, it should be kuma/kuma-dataplane

components/konvoy-control-plane/app/kumactl/cmd/install/install_control_plane_test.go Outdated
@@ -101,7 +101,7 @@ var _ = Describe("kumactl install control-plane", func() {
"--injector-service-name", "injector",
"--injector-tls-cert", "InjectorCert",
"--injector-tls-key", "InjectorKey",
"--dataplane-image", "konvoy-ci/konvoy-dataplane",
"--dataplane-image", "konvoy-ci/kuma-dataplane",
Copy link
Contributor

Choose a reason for hiding this comment

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

I think, it should be kuma-ci/kuma-dataplane

...oy-control-plane/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml Outdated
@@ -2150,7 +2150,7 @@ spec:
- name: KONVOY_INJECTOR_CONTROL_PLANE_API_SERVER_URL
value: http://konvoy-control-plane.konvoy-system:5681
- name: KONVOY_INJECTOR_SIDECAR_CONTAINER_IMAGE
value: konvoy/konvoy-dataplane:latest
value: konvoy/kuma-dataplane:latest
Copy link
Contributor

Choose a reason for hiding this comment

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

I think, it should be kuma/kuma-dataplane:latest

...y-control-plane/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml Outdated
@@ -2150,7 +2150,7 @@ spec:
- name: KONVOY_INJECTOR_CONTROL_PLANE_API_SERVER_URL
value: http://konvoy-control-plane.konvoy:5681
- name: KONVOY_INJECTOR_SIDECAR_CONTAINER_IMAGE
value: konvoy-ci/konvoy-dataplane:greatest
value: konvoy-ci/kuma-dataplane:greatest
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma-ci/kuma-dataplane:greatest

components/konvoy-control-plane/pkg/config/app/konvoy-injector/config.go Outdated
@@ -30,7 +30,7 @@ func DefaultConfig() Config {
},
},
SidecarContainer: SidecarContainer{
Image: "konvoy/konvoy-dataplane:latest",
Image: "konvoy/kuma-dataplane:latest",
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma/kuma-dataplane:latest

...ents/konvoy-control-plane/pkg/config/app/konvoy-injector/testdata/default-config.golden.yaml Outdated
@@ -7,7 +7,7 @@ injector:
bootstrapServer:
url: http://konvoy-control-plane.konvoy-system:5682
sidecarContainer:
image: konvoy/konvoy-dataplane:latest
image: konvoy/kuma-dataplane:latest
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma/kuma-dataplane:latest

yskopets
yskopets reviewed Sep 6, 2019
View reviewed changes
components/konvoy-control-plane/Makefile Outdated
@@ -68,8 +68,8 @@ BINTRAY_USERNAME ?=
BINTRAY_API_KEY ?=

KONVOY_CP_DOCKER_IMAGE ?= konvoy/konvoy-control-plane:latest
KUMA_DP_DOCKER_IMAGE ?= konvoy/kuma-dataplane:latest
KUMACTL_DOCKER_IMAGE ?= konvoy/kumactl:latest
KUMA_DP_DOCKER_IMAGE ?= kuma/kuma-dataplane:latest
Copy link
Contributor

Choose a reason for hiding this comment

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

should be kuma/kuma-dp:latest per @subnetmarco

components/konvoy-control-plane/app/kumactl/cmd/install/install_control_plane.go Outdated
@@ -50,7 +50,7 @@ func newInstallControlPlaneCmd(pctx *kumactl_cmd.RootContext) *cobra.Command {
InjectorServiceName: "konvoy-injector",
InjectorTlsCert: "",
InjectorTlsKey: "",
DataplaneImage: "konvoy/kuma-dataplane",
DataplaneImage: "kuma/kuma-dataplane",
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma/kuma-dp:latest

...oy-control-plane/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml Outdated
@@ -2150,7 +2150,7 @@ spec:
- name: KONVOY_INJECTOR_CONTROL_PLANE_API_SERVER_URL
value: http://konvoy-control-plane.konvoy-system:5681
- name: KONVOY_INJECTOR_SIDECAR_CONTAINER_IMAGE
value: konvoy/kuma-dataplane:latest
value: kuma/kuma-dataplane:latest
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma/kuma-dp:latest

components/konvoy-control-plane/pkg/config/app/konvoy-injector/config.go Outdated
@@ -30,7 +30,7 @@ func DefaultConfig() Config {
},
},
SidecarContainer: SidecarContainer{
Image: "konvoy/kuma-dataplane:latest",
Image: "kuma/kuma-dataplane:latest",
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma/kuma-dp:latest

...ents/konvoy-control-plane/pkg/config/app/konvoy-injector/testdata/default-config.golden.yaml Outdated
@@ -7,7 +7,7 @@ injector:
bootstrapServer:
url: http://konvoy-control-plane.konvoy-system:5682
sidecarContainer:
image: konvoy/kuma-dataplane:latest
image: kuma/kuma-dataplane:latest
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma/kuma-dp:latest

components/konvoy-control-plane/Makefile Outdated
KUMA_CONTROL_PLANE_BOOTSTRAP_SERVER_URL=http://localhost:5682 \
KUMA_DATAPLANE_ID=$(EXAMPLE_ENVOY_ID) \
KUMA_DATAPLANE_ADMIN_PORT=$(ENVOY_ADMIN_PORT) \
${BUILD_ARTIFACTS_DIR}/kuma-dataplane/kuma-dataplane run
Copy link
Contributor

Choose a reason for hiding this comment

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

rename to ${BUILD_ARTIFACTS_DIR}/kuma-dp/kuma-dp

components/konvoy-control-plane/app/kuma-dp/cmd/root.go Outdated
@@ -10,7 +10,7 @@ import (
)

var (
dataplaneLog = core.Log.WithName("konvoy-dataplane")
dataplaneLog = core.Log.WithName("kuma-dataplane")
Copy link
Contributor

Choose a reason for hiding this comment

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

core.Log.WithName("kuma-dp")

components/konvoy-control-plane/app/kuma-dp/cmd/root.go Outdated
@@ -19,7 +19,7 @@ func newRootCmd() *cobra.Command {
debug bool
}{}
cmd := &cobra.Command{
Use: "konvoy-dataplane",
Use: "kuma-dataplane",
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma-dp

components/konvoy-control-plane/app/kuma-dp/cmd/root_test.go Outdated
@@ -6,7 +6,7 @@ import (
)

var _ = Describe("root", func() {
It("should be possible to run `konvoy-dataplane` without a sub-command", func() {
It("should be possible to run `kuma-dataplane` without a sub-command", func() {
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma-dp

components/konvoy-control-plane/app/kuma-dp/cmd/run_test.go Outdated
@@ -83,18 +83,18 @@ var _ = Describe("run", func() {
}
})

It("should be possible to start dataplane (Envoy) using `konvoy-dataplane run`", func(done Done) {
It("should be possible to start dataplane (Envoy) using `kuma-dataplane run`", func(done Done) {
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma-dp run

yskopets
yskopets reviewed Sep 7, 2019
View reviewed changes
components/konvoy-control-plane/app/kumactl/cmd/install/install_control_plane_test.go Outdated
@@ -101,7 +101,7 @@ var _ = Describe("kumactl install control-plane", func() {
"--injector-service-name", "injector",
"--injector-tls-cert", "InjectorCert",
"--injector-tls-key", "InjectorKey",
"--dataplane-image", "konvoy-ci/konvoy-dataplane",
"--dataplane-image", "konvoy-ci/kuma-dp",
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma-ci/kuma-dp

components/konvoy-control-plane/app/kumactl/cmd/install/install_control_plane_test.go Outdated
@@ -101,7 +101,7 @@ var _ = Describe("kumactl install control-plane", func() {
"--injector-service-name", "injector",
"--injector-tls-cert", "InjectorCert",
"--injector-tls-key", "InjectorKey",
"--dataplane-image", "konvoy-ci/konvoy-dataplane",
"--dataplane-image", "konvoy-ci/kuma-dp",
"--dataplane-init-image", "konvoy-ci/konvoy-init",
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma-ci/kuma-init

...y-control-plane/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml Outdated
@@ -2150,7 +2150,7 @@ spec:
- name: KONVOY_INJECTOR_CONTROL_PLANE_API_SERVER_URL
value: http://konvoy-control-plane.konvoy:5681
- name: KONVOY_INJECTOR_SIDECAR_CONTAINER_IMAGE
value: konvoy-ci/konvoy-dataplane:greatest
value: konvoy-ci/kuma-dp:greatest
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma-ci/kuma-dp:greatest

...y-control-plane/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml Outdated
@@ -2150,7 +2150,7 @@ spec:
- name: KONVOY_INJECTOR_CONTROL_PLANE_API_SERVER_URL
value: http://konvoy-control-plane.konvoy:5681
- name: KONVOY_INJECTOR_SIDECAR_CONTAINER_IMAGE
value: konvoy-ci/konvoy-dataplane:greatest
value: konvoy-ci/kuma-dp:greatest
- name: KONVOY_INJECTOR_INIT_CONTAINER_IMAGE
value: konvoy-ci/konvoy-init:dev
Copy link
Contributor

Choose a reason for hiding this comment

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

kuma-ci/kuma-init:dev

yskopets
yskopets reviewed Sep 7, 2019
View reviewed changes
Copy link
Contributor

@yskopets yskopets left a comment

Choose a reason for hiding this comment

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

Let's revert the last commit and move it into a separate PR for renaming konvoy-injector

@jakubdyszkiewicz jakubdyszkiewicz merged commit f25ccb9 into master Sep 7, 2019
@jakubdyszkiewicz jakubdyszkiewicz deleted the chore/kumadp-rename branch September 7, 2019 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yskopets yskopets yskopets approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jakubdyszkiewicz @yskopets