Skip to content

Commit

Permalink
Addressed review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
shahpratikr committed Jan 4, 2023
1 parent ba84a75 commit b123add
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 11 deletions.
5 changes: 0 additions & 5 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ dockers:
dockerfile: 'docker/kanister-kubectl/Dockerfile'
build_flag_templates:
- "--build-arg=TOOLS_IMAGE=ghcr.io/kanisterio/kanister-tools:{{ .Tag }}"
- ids:
- kando
image_templates:
- 'ghcr.io/kanisterio/redis-tools:{{ .Tag }}'
dockerfile: 'docker/redis-tools/Dockerfile'
- ids:
- kando
image_templates:
Expand Down
2 changes: 1 addition & 1 deletion build/push_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set -o errexit
set -o nounset

IMAGE_REGISTRY="ghcr.io/kanisterio"
IMAGES=("mysql-sidecar" "redis-tools" "kafka-adobe-s3-sink-connector" "postgres-kanister-tools" "postgresql" "cassandra" "kanister-kubectl-1.18" "mongo-sidecar" "mongodb" "es-sidecar" "controller" "kanister-tools" "couchbase-tools" "kafka-adobe-s3-source-connector" "foundationdb" "mssql-tools")
IMAGES=("mysql-sidecar" "kafka-adobe-s3-sink-connector" "postgres-kanister-tools" "postgresql" "cassandra" "kanister-kubectl-1.18" "mongo-sidecar" "mongodb" "es-sidecar" "controller" "kanister-tools" "couchbase-tools" "kafka-adobe-s3-source-connector" "foundationdb" "mssql-tools")

TAG=${1:-"v9.99.9-dev"}

Expand Down
3 changes: 1 addition & 2 deletions docker/redis-tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
FROM redis:7.0.7

ADD kando /usr/local/bin/

RUN apt update
RUN apt install -y npm bash curl redis-tools
RUN curl -fsSL https://deb.nodesource.com/setup_current.x | bash - && apt install -y nodejs
RUN npm install redis-dump -g

RUN curl https://raw.githubusercontent.com/kanisterio/kanister/master/scripts/get.sh | bash
CMD [ "/usr/bin/tail", "-f", "/dev/null" ]
13 changes: 13 additions & 0 deletions examples/redis/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ We will be using [Redis](https://github.com/bitnami/charts/tree/main/bitnami/red
- PV provisioner support in the underlying infrastructure
- Kanister controller version 0.85.0 installed in your cluster, let's assume in Namespace `kanister`
- Kanctl CLI installed (https://docs.kanister.io/tooling.html#install-the-tools)
- Redis docker image. To build and push the docker image to registry, please execute [these](#build-docker-image) steps.

### Build docker image
- Execute below commands to build and push `redis-tools` docker image to a registry.
```bash
$ cd ~/kanister/docker/redis-tools
$ docker build -t <registry>/<account_name>/redis-tools:<tag_name> .
$ docker push <registry>/<account_name>/redis-tools:<tag_name>
```

## Installing the Chart

Expand Down Expand Up @@ -68,6 +77,10 @@ can be shared between Kanister-enabled application instances.

Create Blueprint in the same namespace as the Kanister controller

**NOTE:**

Please replace `<registry>`, `<account_name>` and `<tag_name>` for the image value in `./redis-blueprint.yaml` before running following command.

```bash
$ kubectl create -f ./redis-blueprint.yaml -n kanister
```
Expand Down
6 changes: 3 additions & 3 deletions examples/redis/redis-blueprint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ actions:
name: '{{ index .Object.metadata.labels "app.kubernetes.io/instance" }}'
namespace: '{{ .StatefulSet.Namespace }}'
args:
image: ghcr.io/kanisterio/redis-tools:0.85.0
image: <registry>/<account_name>/redis-tools:<tag_name>
namespace: "{{ .StatefulSet.Namespace }}"
command:
- bash
Expand All @@ -43,7 +43,7 @@ actions:
name: '{{ index .Object.metadata.labels "app.kubernetes.io/instance" }}'
namespace: '{{ .StatefulSet.Namespace }}'
args:
image: ghcr.io/kanisterio/redis-tools:0.85.0
image: <registry>/<account_name>/redis-tools:<tag_name>
namespace: "{{ .StatefulSet.Namespace }}"
command:
- bash
Expand All @@ -63,7 +63,7 @@ actions:
- func: KubeTask
name: deleteFromBlobStore
args:
image: ghcr.io/kanisterio/redis-tools:0.85.0
image: <registry>/<account_name>/redis-tools:<tag_name>
namespace: "{{ .Namespace.Name }}"
command:
- bash
Expand Down

0 comments on commit b123add

Please sign in to comment.