Skip to content

Commit 8a3fa31

Browse files
committed
feat: rename binary to pgedge-control-plane
Renames the binary and archives from `control-plane` to `pgedge-control-plane` to reduce the chance of conflicts with other packages. PLAT-417
1 parent 2058c1f commit 8a3fa31

10 files changed

Lines changed: 30 additions & 25 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ docs/plans
2121
*-results.xml
2222
dist
2323
control-plane
24+
pgedge-control-plane
2425
!docker/control-plane
2526
e2e/debug

.goreleaser.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: 2
2-
project_name: control-plane
2+
project_name: pgedge-control-plane
33
builds:
44
- main: ./server
5-
binary: control-plane
5+
binary: pgedge-control-plane
66
env:
77
- CGO_ENABLED=0
88
goos:

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -258,12 +258,12 @@ control-plane-images:
258258
goreleaser-build:
259259
GORELEASER_CURRENT_TAG=$(CONTROL_PLANE_VERSION) \
260260
$(goreleaser) build --snapshot --clean
261-
tar -C dist/control-plane_linux_amd64_v1 -c -z \
262-
-f dist/control-plane_$(CONTROL_PLANE_VERSION:v%=%)_linux_amd64.tar.gz \
263-
control-plane
264-
tar -C dist/control-plane_linux_arm64_v8.0 -c -z \
265-
-f dist/control-plane_$(CONTROL_PLANE_VERSION:v%=%)_linux_arm64.tar.gz \
266-
control-plane
261+
tar -C dist/pgedge-control-plane_linux_amd64_v1 -c -z \
262+
-f dist/pgedge-control-plane_$(CONTROL_PLANE_VERSION:v%=%)_linux_amd64.tar.gz \
263+
pgedge-control-plane
264+
tar -C dist/pgedge-control-plane_linux_arm64_v8.0 -c -z \
265+
-f dist/pgedge-control-plane_$(CONTROL_PLANE_VERSION:v%=%)_linux_arm64.tar.gz \
266+
pgedge-control-plane
267267

268268
goreleaser-test-release:
269269
GORELEASER_CURRENT_TAG=$(CONTROL_PLANE_VERSION) \
@@ -332,7 +332,7 @@ build: dev-build
332332
dev-build:
333333
GOOS=linux go build \
334334
-gcflags "all=-N -l" \
335-
-o docker/control-plane-dev/control-plane \
335+
-o docker/control-plane-dev/pgedge-control-plane \
336336
$(shell pwd)/server
337337

338338
.PHONY: docker-swarm-init
@@ -397,7 +397,7 @@ api-docs:
397397
ci-compose-build:
398398
GOOS=linux go build \
399399
-gcflags "all=-N -l" \
400-
-o docker/control-plane-ci/control-plane \
400+
-o docker/control-plane-ci/pgedge-control-plane \
401401
$(shell pwd)/server
402402

403403
.PHONY: ci-compose-detached

docker/control-plane-ci/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ RUN apt-get update && \
44
apt-get install -y curl && \
55
rm -rf /var/lib/apt/lists/*
66

7-
COPY ./control-plane /control-plane
7+
COPY ./pgedge-control-plane /pgedge-control-plane
88

9-
ENTRYPOINT ["/control-plane"]
9+
ENTRYPOINT ["/pgedge-control-plane"]

docker/control-plane-dev/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ ENV CGO_ENABLED=0
55
RUN go install github.com/go-delve/delve/cmd/dlv@latest
66

77
COPY ./entrypoint.sh /entrypoint.sh
8-
COPY ./control-plane /control-plane
8+
COPY ./pgedge-control-plane /pgedge-control-plane
99

1010
ENTRYPOINT [ "/entrypoint.sh" ]

docker/control-plane-dev/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ services:
66
watch:
77
- path: ./Dockerfile
88
action: rebuild
9-
- path: ./control-plane
9+
- path: ./pgedge-control-plane
1010
action: sync+restart
11-
target: /control-plane
11+
target: /pgedge-control-plane
1212
working_dir: ${WORKSPACE_DIR}
1313
environment:
1414
- DEBUG=${DEBUG:-0}

docker/control-plane-dev/entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ if [[ "${DEBUG}" == 1 ]]; then
1313
--log-output=debugger,debuglineerr,gdbwire,lldbout,rpc \
1414
--accept-multiclient \
1515
--api-version=2 \
16-
exec /control-plane \
16+
exec /pgedge-control-plane \
1717
-- \
1818
run \
1919
--config-path /config.json \
2020
--logging.pretty
2121
else
22-
exec /control-plane run \
22+
exec /pgedge-control-plane run \
2323
--config-path /config.json \
2424
--logging.pretty
2525
fi

docker/control-plane/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ ARG TARGETOS
44
ARG TARGETARCH
55
ARG ARCHIVE_VERSION
66

7-
ENTRYPOINT ["/control-plane"]
7+
ENTRYPOINT ["/pgedge-control-plane"]
88

9-
ADD control-plane_${ARCHIVE_VERSION}_${TARGETOS}_${TARGETARCH}.tar.gz /
9+
ADD pgedge-control-plane_${ARCHIVE_VERSION}_${TARGETOS}_${TARGETARCH}.tar.gz /

docs/development/running-locally.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,17 @@ On MacOS, the full path to the Restish configuration file is `~/Library/Applicat
120120

121121
## Running the Control Plane
122122

123-
To start the Control Plane instances, navigate into the `control-plane` repository root and run:
123+
To start the Control Plane instances, navigate into the `control-plane`
124+
repository root and run:
124125

125126
```sh
126127
make dev-watch
127128
```
128129

129-
This will build a `control-plane` binary, build the Docker image in `docker/control-plane-dev`, and run the Docker Compose configuration in `watch` mode. See the [Development workflow](#development-workflow) section to learn how to use this setup for development.
130+
This will build a `pgedge-control-plane` binary, build the Docker image in
131+
`docker/control-plane-dev`, and run the Docker Compose configuration in `watch`
132+
mode. See the [Development workflow](#development-workflow) section to learn how
133+
to use this setup for development.
130134

131135
## Interact with the Control Plane API
132136

@@ -199,11 +203,11 @@ section to reinitialize your cluster.
199203

200204
The following sections detail the steps in the development process.
201205

202-
### Rebuilding the `control-plane` binary
206+
### Rebuilding the `pgedge-control-plane` binary
203207

204208
The Docker Compose file is configured to watch for changes to the
205-
`control-plane` binary. You can update the binary in the running containers by
206-
running:
209+
`pgedge-control-plane` binary. You can update the binary in the running
210+
containers by running:
207211

208212
```sh
209213
make dev-build

e2e/fixtures/roles/build_image/vars/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ _arch_transform:
44
x86_64: amd64
55
aarch64: arm64
66
arm64: arm64
7-
_archive_name: control-plane_{{ version }}_linux_{{ _arch_transform[architecture] }}.tar.gz
7+
_archive_name: pgedge-control-plane_{{ version }}_linux_{{ _arch_transform[architecture] }}.tar.gz

0 commit comments

Comments
 (0)