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

feat(docker/kumactl): make entrypoint consistent #6596

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,23 @@ does not have any particular instructions.

* Changed path match `type` from `Prefix` to `PathPrefix`

#### `kumactl` container image

* Changed image's entrypoint to `/usr/bin/kumactl`

This change was introduced to be consistent with `kuma-cp` and `kuma-dp` images,
where names of images refer to binaries set in entrypoint.

Example valid before:
```sh
docker run kumahq/kumactl:2.2.1 kumactl install transparent-proxy --help
```

Equivalent example valid now:
```sh
docker run kumahq/kumactl:2.3.0 install transparent-proxy --help
```

## Upgrade to `2.2.x`

### Universal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ data:
fi
save_crds.sh: |
set -e

crds="$(kumactl install crds --no-config {{ if .Values.experimental.gatewayAPI }}--experimental-gatewayapi{{end}})"

if [ -n "${crds}" ]; then
Expand Down Expand Up @@ -133,8 +133,7 @@ spec:
limits:
cpu: "100m"
memory: "256Mi"
command:
- '/kuma/scripts/install_crds.sh'
command: ["/kuma/scripts/install_crds.sh"]
volumeMounts:
- mountPath: /kuma/crds
name: crds
Expand All @@ -160,8 +159,8 @@ spec:
- mountPath: /kuma/scripts
name: scripts
readOnly: true
args:
- '/kuma/scripts/save_crds.sh'
command: ["sh", "-c"]
michaelbeaumont marked this conversation as resolved.
Show resolved Hide resolved
args: ["/kuma/scripts/save_crds.sh"]
volumes:
- name: scripts
configMap:
Expand Down
2 changes: 1 addition & 1 deletion tools/releases/dockerfiles/kumactl.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ ARG ARCH
COPY /tools/releases/templates/NOTICE-kumactl /kuma/NOTICE
COPY /build/artifacts-linux-$ARCH/kumactl/kumactl /usr/bin/

ENTRYPOINT ["/busybox/busybox", "sh", "-c"]
ENTRYPOINT ["/usr/bin/kumactl"]