Skip to content

Commit

Permalink
Bump kanister version to 0.14.0 (#4475)
Browse files Browse the repository at this point in the history
  • Loading branch information
SupriyaKasten authored and Ilya Kislenko committed Nov 29, 2018
1 parent a5defcf commit 8dfbf58
Show file tree
Hide file tree
Showing 21 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion docker/postgres-kanister-tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ RUN apk -v --update add --no-cache python py-pip groff less && \
apk -v --purge del py-pip && \
rm -f /var/cache/apk/*

COPY --from=kanisterio/kanister-tools:0.13.0 /usr/local/bin/kando /usr/local/bin/kando
COPY --from=kanisterio/kanister-tools:0.14.0 /usr/local/bin/kando /usr/local/bin/kando

CMD ["tail", "-f", "/dev/null"]
2 changes: 1 addition & 1 deletion docs/functions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ Example:
args:
namespace: "{{ .Deployment.Namespace }}"
pod: "{{ index .Deployment.Pods 0 }}"
image: kanisterio/kanister-tools:0.13.0
image: kanisterio/kanister-tools:0.14.0
backupArtifactPrefix: s3-bucket/path/artifactPrefix
backupIdentifier: "{{ .Time }}"
Expand Down
4 changes: 2 additions & 2 deletions docs/tooling.rst
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ The following snippet is an example of using kando from inside a Blueprint.
kando location delete --profile '{{ .Profile }}' --path '/backup/path'
kando output version 0.13.0
kando output version 0.14.0
Docker Image
============
Expand All @@ -384,7 +384,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.13.0`, is hosted by
The released image, `kanisterio/kanister-tools:0.14.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.13.0
FROM kanisterio/kanister-tools:0.14.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.13.0"
image: "kanisterio/es-sidecar:0.14.0"
command:
- bash
- -o
Expand All @@ -37,7 +37,7 @@ actions:
name: restoreSnapshots
args:
namespace: "{{ .StatefulSet.Namespace }}"
image: "kanisterio/es-sidecar:0.13.0"
image: "kanisterio/es-sidecar:0.14.0"
command:
- bash
- -o
Expand All @@ -63,7 +63,7 @@ actions:
name: deleteSnapshots
args:
namespace: "{{ .StatefulSet.Namespace }}"
image: "kanisterio/es-sidecar:0.13.0"
image: "kanisterio/es-sidecar:0.14.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.13.0 /usr/local/bin/kando /usr/local/bin/kando
COPY --from=kanisterio/kanister-tools:0.14.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.13.0
image: kanisterio/mongo-sidecar:0.14.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.13.0 /usr/local/bin/kando /usr/local/bin/kando
COPY --from=kanisterio/kanister-tools:0.14.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.13.0
image: kanisterio/mysql-sidecar:0.14.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.13.0
image: kanisterio/kanister-tools:0.14.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.13.0
image: kanisterio/kanister-tools:0.14.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.13.0
tag: 0.14.0
pullPolicy: IfNotPresent
rbac:
create: true
Expand Down
2 changes: 1 addition & 1 deletion pkg/function/copy_volume_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
)

const (
kanisterToolsImage = "kanisterio/kanister-tools:0.13.0"
kanisterToolsImage = "kanisterio/kanister-tools:0.14.0"
copyVolumeDataMountPoint = "/mnt/vol_data/%s"
copyVolumeDataJobPrefix = "copy-vol-data-"
CopyVolumeDataNamespaceArg = "namespace"
Expand Down
4 changes: 2 additions & 2 deletions pkg/function/data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func newRestoreDataBlueprint(pvc string) *crv1alpha1.Blueprint {
Func: "RestoreData",
Args: map[string]interface{}{
RestoreDataNamespaceArg: "{{ .StatefulSet.Namespace }}",
RestoreDataImageArg: "kanisterio/kanister-tools:0.13.0",
RestoreDataImageArg: "kanisterio/kanister-tools:0.14.0",
RestoreDataBackupArtifactPrefixArg: "{{ .Profile.Location.S3Compliant.Bucket }}/{{ .Profile.Location.S3Compliant.Prefix }}",
RestoreDataRestorePathArg: "/mnt/data",
RestoreDataBackupIdentifierArg: "{{ .Time }}",
Expand Down Expand Up @@ -225,7 +225,7 @@ func newCopyDataTestBlueprint() crv1alpha1.Blueprint {
Func: "RestoreData",
Args: map[string]interface{}{
RestoreDataNamespaceArg: "{{ .PVC.Namespace }}",
RestoreDataImageArg: "kanisterio/kanister-tools:0.13.0",
RestoreDataImageArg: "kanisterio/kanister-tools:0.14.0",
RestoreDataBackupArtifactPrefixArg: fmt.Sprintf("{{ .Options.%s }}", CopyVolumeDataOutputBackupArtifactLocation),
RestoreDataBackupIdentifierArg: fmt.Sprintf("{{ .Options.%s }}", CopyVolumeDataOutputBackupID),
RestoreDataVolsArg: map[string]string{
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.13.0", cmd)
return kubeTask(ctx, namespace, "kanisterio/kanister-tools:0.14.0", cmd)
}

func (*deleteDataFunc) RequiredArgs() []string {
Expand Down
10 changes: 5 additions & 5 deletions pkg/function/kube_exec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ func (s *KubeExecTest) TestParseLogAndCreateOutput(c *C) {
errChecker Checker
outChecker Checker
}{
{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.13.0\"}", map[string]interface{}{"version": "0.13.0"}, IsNil, NotNil},
{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.13.0\"}\n###Phase-output###: {\"key\":\"path\",\"value\":\"/backup/path\"}",
map[string]interface{}{"version": "0.13.0", "path": "/backup/path"}, IsNil, NotNil},
{"Random message ###Phase-output###: {\"key\":\"version\",\"value\":\"0.13.0\"}", map[string]interface{}{"version": "0.13.0"}, IsNil, NotNil},
{"Random message with newline \n###Phase-output###: {\"key\":\"version\",\"value\":\"0.13.0\"}", map[string]interface{}{"version": "0.13.0"}, IsNil, NotNil},
{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.14.0\"}", map[string]interface{}{"version": "0.14.0"}, IsNil, NotNil},
{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.14.0\"}\n###Phase-output###: {\"key\":\"path\",\"value\":\"/backup/path\"}",
map[string]interface{}{"version": "0.14.0", "path": "/backup/path"}, IsNil, NotNil},
{"Random message ###Phase-output###: {\"key\":\"version\",\"value\":\"0.14.0\"}", map[string]interface{}{"version": "0.14.0"}, IsNil, NotNil},
{"Random message with newline \n###Phase-output###: {\"key\":\"version\",\"value\":\"0.14.0\"}", map[string]interface{}{"version": "0.14.0"}, IsNil, NotNil},
{"###Phase-output###: Invalid message", nil, NotNil, IsNil},
{"Random message", nil, IsNil, IsNil},
} {
Expand Down
4 changes: 2 additions & 2 deletions pkg/function/kube_task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ func newTaskBlueprint(namespace string) *crv1alpha1.Blueprint {
Func: "KubeTask",
Args: map[string]interface{}{
KubeTaskNamespaceArg: namespace,
KubeTaskImageArg: "kanisterio/kanister-tools:0.13.0",
KubeTaskImageArg: "kanisterio/kanister-tools:0.14.0",
KubeTaskCommandArg: []string{
"sh",
"-c",
"kando output version 0.13.0",
"kando output version 0.14.0",
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions pkg/kube/pod_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (s *PodSuite) TestPod(c *C) {
pod, err := CreatePod(context.Background(), s.cli, &PodOptions{
Namespace: s.namespace,
GenerateName: "test-",
Image: "kanisterio/kanister-tools:0.13.0",
Image: "kanisterio/kanister-tools:0.14.0",
Command: []string{"sh", "-c", "tail -f /dev/null"},
})
c.Assert(err, IsNil)
Expand All @@ -78,7 +78,7 @@ func (s *PodSuite) TestPodWithVolumes(c *C) {
pod, err := CreatePod(ctx, cli, &PodOptions{
Namespace: s.namespace,
GenerateName: "test-",
Image: "kanisterio/kanister-tools:0.13.0",
Image: "kanisterio/kanister-tools:0.14.0",
Command: []string{"sh", "-c", "tail -f /dev/null"},
Volumes: vols,
})
Expand All @@ -94,7 +94,7 @@ func (s *PodSuite) TestGetPodLogs(c *C) {
pod, err := CreatePod(context.Background(), s.cli, &PodOptions{
Namespace: s.namespace,
GenerateName: "test-",
Image: "kanisterio/kanister-tools:0.13.0",
Image: "kanisterio/kanister-tools:0.14.0",
Command: []string{"sh", "-c", "echo hello"},
})
c.Assert(err, IsNil)
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.13.0"})
UpdatePhaseParams(ctx, tp, "backup", map[string]interface{}{"version": "0.14.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.13.0",
Image: "kanisterio/kanister-tools:0.14.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.13.0"}"
version="${1:-"0.14.0"}"
initArch
initOS
verifySupported
Expand Down

0 comments on commit 8dfbf58

Please sign in to comment.