Skip to content

Commit

Permalink
Merge pull request #130 from kanisterio/sync
Browse files Browse the repository at this point in the history
 Bump kanister version to 0.12.0
  • Loading branch information
tdmanv committed Oct 2, 2018
2 parents 2585b97 + c251e5f commit 3d73fd9
Show file tree
Hide file tree
Showing 22 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ found [here](https://hub.kubeapps.com/charts/stable/kanister-operator) and can
be installed by specifying the `stable` chart prefix.

```bash
helm install --name myrelease --namespace kanister stable/kanister-operator --set image.tag=0.11.0
helm install --name myrelease --namespace kanister stable/kanister-operator --set image.tag=0.12.0
```

> **Warning**: The Kanister chart found in `stable` may be behind the one in
Expand Down
4 changes: 2 additions & 2 deletions docker/postgres-kanister-tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ RUN apk -v --update add --no-cache python py-pip groff less && \
pip install --upgrade pip && \
pip install --upgrade awscli && \
apk -v --purge del py-pip && \
rm /var/cache/apk/*
rm -f /var/cache/apk/*

COPY --from=kanisterio/kanister-tools:0.11.0 /usr/local/bin/kando /usr/local/bin/kando
COPY --from=kanisterio/kanister-tools:0.12.0 /usr/local/bin/kando /usr/local/bin/kando

CMD ["tail", "-f", "/dev/null"]
2 changes: 1 addition & 1 deletion docker/tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN apk -v --update add --no-cache bash curl python py-pip groff less mailcap ca
pip install --upgrade pip && \
pip install --upgrade awscli && \
apk -v --purge del py-pip && \
rm /var/cache/apk/*
rm -f /var/cache/apk/*

RUN curl https://raw.githubusercontent.com/kanisterio/kanister/master/scripts/get.sh | bash

Expand Down
2 changes: 1 addition & 1 deletion docs/functions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ Example:
args:
namespace: "{{ .Deployment.Namespace }}"
pod: "{{ index .Deployment.Pods 0 }}"
image: kanisterio/kanister-tools:0.11.0
image: kanisterio/kanister-tools:0.12.0
backupArtifactPrefix: s3-bucket/path/artifactPrefix
backupIdentifier: "{{ .Time }}"
Expand Down
2 changes: 1 addition & 1 deletion docs/helm.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ You also need to install the Kanister controller

.. code-block:: console
$ helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.11.0
$ helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.12.0
Kanister-Enabled Applications
=============================
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ and backup to an AWS S3 bucket.
helm repo add kanister http://charts.kanister.io
# Install the Kanister Controller
helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.11.0
helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.12.0
# Install MySQL and configure its Kanister Blueprint.
# Also create a Profile CR that can be used in ActionSets
Expand Down
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ This will install the Kanister controller in the `kanister` namespace
$ helm repo add kanister https://charts.kanister.io/
# Install the Kanister operator controller using helm
$ helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.11.0
$ helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.12.0
Building and Deploying from Source
Expand Down
2 changes: 1 addition & 1 deletion docs/tooling.rst
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ These tools, especially `kando` are meant to be invoked inside containers via
Blueprints. Although suggest using the released image when possible, we've also
made it simple to add these tools to your container.
The released image, `kanisterio/kanister-tools:0.11.0`, is hosted by
The released image, `kanisterio/kanister-tools:0.12.0`, is hosted by
`dockerhub <https://cloud.docker.com/swarm/kanisterio/repository/docker/kanisterio/kanister-tools/general>`_.
The Dockerfile for this image is in the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM kanisterio/kanister-tools:0.11.0
FROM kanisterio/kanister-tools:0.12.0
MAINTAINER Supriya Kharade <supriya@kasten.io>

COPY esdump-setup.sh /esdump-setup.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ actions:
name: takeDataSnapshot
args:
namespace: "{{ .StatefulSet.Namespace }}"
image: "kanisterio/es-sidecar:0.11.0"
image: "kanisterio/es-sidecar:0.12.0"
command:
- bash
- -o
Expand All @@ -37,7 +37,7 @@ actions:
name: restoreSnapshots
args:
namespace: "{{ .StatefulSet.Namespace }}"
image: "kanisterio/es-sidecar:0.11.0"
image: "kanisterio/es-sidecar:0.12.0"
command:
- bash
- -o
Expand All @@ -63,7 +63,7 @@ actions:
name: deleteSnapshots
args:
namespace: "{{ .StatefulSet.Namespace }}"
image: "kanisterio/es-sidecar:0.11.0"
image: "kanisterio/es-sidecar:0.12.0"
command:
- bash
- -o
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ ADD . /kanister

RUN /kanister/install.sh && rm -rf /kanister && rm -rf /tmp && mkdir /tmp

COPY --from=kanisterio/kanister-tools:0.11.0 /usr/local/bin/kando /usr/local/bin/kando
COPY --from=kanisterio/kanister-tools:0.12.0 /usr/local/bin/kando /usr/local/bin/kando

CMD ["tail", "-f", "/dev/null"]
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ spec:
mountPath: /data/db
containers:
- name: kanister-sidecar
image: kanisterio/mongo-sidecar:0.11.0
image: kanisterio/mongo-sidecar:0.12.0
imagePullPolicy: Always
env:
{{- if .Values.auth.enabled }}
Expand Down
2 changes: 1 addition & 1 deletion examples/helm/kanister/kanister-mysql/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ ADD . /kanister

RUN /kanister/install.sh && rm -rf /kanister && rm -rf /tmp && mkdir /tmp

COPY --from=kanisterio/kanister-tools:0.11.0 /usr/local/bin/kando /usr/local/bin/kando
COPY --from=kanisterio/kanister-tools:0.12.0 /usr/local/bin/kando /usr/local/bin/kando

CMD ["tail", "-f", "/dev/null"]
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ spec:
mountPath: /etc/mysql/conf.d
{{- end }}
- name: kanister-sidecar
image: kanisterio/mysql-sidecar:0.11.0
image: kanisterio/mysql-sidecar:0.12.0
imagePullPolicy: Always
env:
{{- if .Values.mysqlAllowEmptyPassword }}
Expand Down
2 changes: 1 addition & 1 deletion examples/time-log/blueprint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ actions:
args:
namespace: "{{ .Deployment.Namespace }}"
pod: "{{ index .Deployment.Pods 0 }}"
image: kanisterio/kanister-tools:0.11.0
image: kanisterio/kanister-tools:0.12.0
backupArtifactPrefix: "{{ .ArtifactsIn.timeLog.KeyValue.path }}"
backupIdentifier: "{{ .ArtifactsIn.backupIdentifier.KeyValue.id }}"
- func: ScaleWorkload
Expand Down
2 changes: 1 addition & 1 deletion examples/time-log/time-logger-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: test-container
image: kanisterio/kanister-tools:0.11.0
image: kanisterio/kanister-tools:0.12.0
command: ["sh", "-c"]
args: ["while true; do for x in $(seq 1200); do date >> /var/log/time.log; sleep 1; done; truncate /var/log/time.log --size 0; done"]
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion helm/kanister-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Declare variables to be passed into your templates.
image:
repository: kanisterio/controller
tag: 0.11.0
tag: 0.12.0
pullPolicy: IfNotPresent
rbac:
create: true
Expand Down
2 changes: 1 addition & 1 deletion pkg/function/data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func newRestoreDataBlueprint(pvc string) *crv1alpha1.Blueprint {
Func: "RestoreData",
Args: map[string]interface{}{
RestoreDataNamespaceArg: "{{ .StatefulSet.Namespace }}",
RestoreDataImageArg: "kanisterio/kanister-tools:0.11.0",
RestoreDataImageArg: "kanisterio/kanister-tools:0.12.0",
RestoreDataBackupArtifactPrefixArg: "{{ .Profile.Location.S3Compliant.Bucket }}/{{ .Profile.Location.S3Compliant.Prefix }}",
RestoreDataRestorePathArg: "/",
RestoreDataBackupIdentifierArg: "{{ .Time }}",
Expand Down
2 changes: 1 addition & 1 deletion pkg/function/delete_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (*deleteDataFunc) Exec(ctx context.Context, tp param.TemplateParams, args m
// Generate delete command
cmd := generateDeleteCommand(artifact, tp.Profile)
// Use KubeTask to delete the artifact
return kubeTask(ctx, namespace, "kanisterio/kanister-tools:0.11.0", cmd)
return kubeTask(ctx, namespace, "kanisterio/kanister-tools:0.12.0", cmd)
}

func (*deleteDataFunc) RequiredArgs() []string {
Expand Down
2 changes: 1 addition & 1 deletion pkg/param/param_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ func (s *ParamsSuite) TestPhaseParams(c *C) {
c.Assert(tp.Phases, IsNil)
err = InitPhaseParams(ctx, s.cli, tp, "backup", nil)
c.Assert(err, IsNil)
UpdatePhaseParams(ctx, tp, "backup", map[string]interface{}{"version": "0.11.0"})
UpdatePhaseParams(ctx, tp, "backup", map[string]interface{}{"version": "0.12.0"})
c.Assert(tp.Phases, HasLen, 1)
c.Assert(tp.Phases["backup"], NotNil)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/testutil/testutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func newTestPodTemplateSpec() v1.PodTemplateSpec {
Containers: []v1.Container{
v1.Container{
Name: "test-container",
Image: "kanisterio/kanister-tools:0.11.0",
Image: "kanisterio/kanister-tools:0.12.0",
Command: []string{"tail"},
Args: []string{"-f", "/dev/null"},
},
Expand Down
2 changes: 1 addition & 1 deletion scripts/get.sh
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ cleanup() {
}

main() {
version="${1:-"0.11.0"}"
version="${1:-"0.12.0"}"
initArch
initOS
verifySupported
Expand Down

0 comments on commit 3d73fd9

Please sign in to comment.