From a4b3eb049666ac4090e3338c2a9974b3e079cdad Mon Sep 17 00:00:00 2001 From: Supriya Kharade Date: Tue, 23 Oct 2018 14:43:27 -0700 Subject: [PATCH] Bump kanister version to 0.13.0 (#4233) --- docker/postgres-kanister-tools/Dockerfile | 2 +- docs/functions.rst | 2 +- docs/tooling.rst | 2 +- .../kanister/kanister-elasticsearch/image/Dockerfile | 2 +- .../kanister/elasticsearch-blueprint.yaml | 6 +++--- .../kanister-mongodb-replicaset/image/Dockerfile | 2 +- .../templates/mongodb-statefulset.yaml | 2 +- examples/helm/kanister/kanister-mysql/image/Dockerfile | 2 +- .../kanister/kanister-mysql/templates/deployment.yaml | 2 +- examples/time-log/blueprint.yaml | 2 +- examples/time-log/time-logger-deployment.yaml | 2 +- helm/kanister-operator/values.yaml | 2 +- pkg/function/copy_volume_data.go | 2 +- pkg/function/data_test.go | 4 ++-- pkg/function/delete_data.go | 2 +- pkg/function/kube_exec_test.go | 10 +++++----- pkg/kube/pod_test.go | 4 ++-- pkg/param/param_test.go | 2 +- pkg/testutil/testutil.go | 2 +- scripts/get.sh | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docker/postgres-kanister-tools/Dockerfile b/docker/postgres-kanister-tools/Dockerfile index e8e0720a11..f43df6029f 100644 --- a/docker/postgres-kanister-tools/Dockerfile +++ b/docker/postgres-kanister-tools/Dockerfile @@ -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.12.0 /usr/local/bin/kando /usr/local/bin/kando +COPY --from=kanisterio/kanister-tools:0.13.0 /usr/local/bin/kando /usr/local/bin/kando CMD ["tail", "-f", "/dev/null"] diff --git a/docs/functions.rst b/docs/functions.rst index 5958ff5ad1..3bb7b29dd2 100644 --- a/docs/functions.rst +++ b/docs/functions.rst @@ -351,7 +351,7 @@ Example: args: namespace: "{{ .Deployment.Namespace }}" pod: "{{ index .Deployment.Pods 0 }}" - image: kanisterio/kanister-tools:0.12.0 + image: kanisterio/kanister-tools:0.13.0 backupArtifactPrefix: s3-bucket/path/artifactPrefix backupIdentifier: "{{ .Time }}" diff --git a/docs/tooling.rst b/docs/tooling.rst index eed13be104..64b9e951fa 100644 --- a/docs/tooling.rst +++ b/docs/tooling.rst @@ -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.12.0`, is hosted by +The released image, `kanisterio/kanister-tools:0.13.0`, is hosted by `dockerhub `_. The Dockerfile for this image is in the diff --git a/examples/helm/kanister/kanister-elasticsearch/image/Dockerfile b/examples/helm/kanister/kanister-elasticsearch/image/Dockerfile index eb7e44e835..6055dcc7dd 100644 --- a/examples/helm/kanister/kanister-elasticsearch/image/Dockerfile +++ b/examples/helm/kanister/kanister-elasticsearch/image/Dockerfile @@ -1,5 +1,5 @@ -FROM kanisterio/kanister-tools:0.12.0 +FROM kanisterio/kanister-tools:0.13.0 MAINTAINER Supriya Kharade COPY esdump-setup.sh /esdump-setup.sh diff --git a/examples/helm/kanister/kanister-elasticsearch/kanister/elasticsearch-blueprint.yaml b/examples/helm/kanister/kanister-elasticsearch/kanister/elasticsearch-blueprint.yaml index b408df2e8b..30a5bff5f5 100644 --- a/examples/helm/kanister/kanister-elasticsearch/kanister/elasticsearch-blueprint.yaml +++ b/examples/helm/kanister/kanister-elasticsearch/kanister/elasticsearch-blueprint.yaml @@ -10,7 +10,7 @@ actions: name: takeDataSnapshot args: namespace: "{{ .StatefulSet.Namespace }}" - image: "kanisterio/es-sidecar:0.12.0" + image: "kanisterio/es-sidecar:0.13.0" command: - bash - -o @@ -37,7 +37,7 @@ actions: name: restoreSnapshots args: namespace: "{{ .StatefulSet.Namespace }}" - image: "kanisterio/es-sidecar:0.12.0" + image: "kanisterio/es-sidecar:0.13.0" command: - bash - -o @@ -63,7 +63,7 @@ actions: name: deleteSnapshots args: namespace: "{{ .StatefulSet.Namespace }}" - image: "kanisterio/es-sidecar:0.12.0" + image: "kanisterio/es-sidecar:0.13.0" command: - bash - -o diff --git a/examples/helm/kanister/kanister-mongodb-replicaset/image/Dockerfile b/examples/helm/kanister/kanister-mongodb-replicaset/image/Dockerfile index aee66a9351..db60ca7e1b 100755 --- a/examples/helm/kanister/kanister-mongodb-replicaset/image/Dockerfile +++ b/examples/helm/kanister/kanister-mongodb-replicaset/image/Dockerfile @@ -7,6 +7,6 @@ ADD . /kanister RUN /kanister/install.sh && rm -rf /kanister && rm -rf /tmp && mkdir /tmp -COPY --from=kanisterio/kanister-tools:0.12.0 /usr/local/bin/kando /usr/local/bin/kando +COPY --from=kanisterio/kanister-tools:0.13.0 /usr/local/bin/kando /usr/local/bin/kando CMD ["tail", "-f", "/dev/null"] diff --git a/examples/helm/kanister/kanister-mongodb-replicaset/templates/mongodb-statefulset.yaml b/examples/helm/kanister/kanister-mongodb-replicaset/templates/mongodb-statefulset.yaml index 98173926da..9a47a40f56 100644 --- a/examples/helm/kanister/kanister-mongodb-replicaset/templates/mongodb-statefulset.yaml +++ b/examples/helm/kanister/kanister-mongodb-replicaset/templates/mongodb-statefulset.yaml @@ -139,7 +139,7 @@ spec: mountPath: /data/db containers: - name: kanister-sidecar - image: kanisterio/mongo-sidecar:0.12.0 + image: kanisterio/mongo-sidecar:0.13.0 imagePullPolicy: Always env: {{- if .Values.auth.enabled }} diff --git a/examples/helm/kanister/kanister-mysql/image/Dockerfile b/examples/helm/kanister/kanister-mysql/image/Dockerfile index 2aa990ef64..03a3c6c7be 100755 --- a/examples/helm/kanister/kanister-mysql/image/Dockerfile +++ b/examples/helm/kanister/kanister-mysql/image/Dockerfile @@ -7,6 +7,6 @@ ADD . /kanister RUN /kanister/install.sh && rm -rf /kanister && rm -rf /tmp && mkdir /tmp -COPY --from=kanisterio/kanister-tools:0.12.0 /usr/local/bin/kando /usr/local/bin/kando +COPY --from=kanisterio/kanister-tools:0.13.0 /usr/local/bin/kando /usr/local/bin/kando CMD ["tail", "-f", "/dev/null"] diff --git a/examples/helm/kanister/kanister-mysql/templates/deployment.yaml b/examples/helm/kanister/kanister-mysql/templates/deployment.yaml index 9e54c939aa..de83eb1d7d 100755 --- a/examples/helm/kanister/kanister-mysql/templates/deployment.yaml +++ b/examples/helm/kanister/kanister-mysql/templates/deployment.yaml @@ -100,7 +100,7 @@ spec: mountPath: /etc/mysql/conf.d {{- end }} - name: kanister-sidecar - image: kanisterio/mysql-sidecar:0.12.0 + image: kanisterio/mysql-sidecar:0.13.0 imagePullPolicy: Always env: {{- if .Values.mysqlAllowEmptyPassword }} diff --git a/examples/time-log/blueprint.yaml b/examples/time-log/blueprint.yaml index 863e3aa2bd..25731c897f 100644 --- a/examples/time-log/blueprint.yaml +++ b/examples/time-log/blueprint.yaml @@ -41,7 +41,7 @@ actions: args: namespace: "{{ .Deployment.Namespace }}" pod: "{{ index .Deployment.Pods 0 }}" - image: kanisterio/kanister-tools:0.12.0 + image: kanisterio/kanister-tools:0.13.0 backupArtifactPrefix: "{{ .ArtifactsIn.timeLog.KeyValue.path }}" backupIdentifier: "{{ .ArtifactsIn.backupIdentifier.KeyValue.id }}" - func: ScaleWorkload diff --git a/examples/time-log/time-logger-deployment.yaml b/examples/time-log/time-logger-deployment.yaml index da8f40fea3..469fb21824 100644 --- a/examples/time-log/time-logger-deployment.yaml +++ b/examples/time-log/time-logger-deployment.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: test-container - image: kanisterio/kanister-tools:0.12.0 + image: kanisterio/kanister-tools:0.13.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: diff --git a/helm/kanister-operator/values.yaml b/helm/kanister-operator/values.yaml index aee22814ef..902c87c8f4 100644 --- a/helm/kanister-operator/values.yaml +++ b/helm/kanister-operator/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: kanisterio/controller - tag: 0.12.0 + tag: 0.13.0 pullPolicy: IfNotPresent rbac: create: true diff --git a/pkg/function/copy_volume_data.go b/pkg/function/copy_volume_data.go index 6c53c7f66e..4c8ebb89b5 100644 --- a/pkg/function/copy_volume_data.go +++ b/pkg/function/copy_volume_data.go @@ -17,7 +17,7 @@ import ( ) const ( - kanisterToolsImage = "kanisterio/kanister-tools:0.12.0" + kanisterToolsImage = "kanisterio/kanister-tools:0.13.0" copyVolumeDataMountPoint = "/mnt/vol_data/%s" copyVolumeDataJobPrefix = "copy-vol-data-" CopyVolumeDataNamespaceArg = "namespace" diff --git a/pkg/function/data_test.go b/pkg/function/data_test.go index 62b06b6909..6a582e6467 100644 --- a/pkg/function/data_test.go +++ b/pkg/function/data_test.go @@ -80,7 +80,7 @@ func newRestoreDataBlueprint(pvc string) *crv1alpha1.Blueprint { Func: "RestoreData", Args: map[string]interface{}{ RestoreDataNamespaceArg: "{{ .StatefulSet.Namespace }}", - RestoreDataImageArg: "kanisterio/kanister-tools:0.12.0", + RestoreDataImageArg: "kanisterio/kanister-tools:0.13.0", RestoreDataBackupArtifactPrefixArg: "{{ .Profile.Location.S3Compliant.Bucket }}/{{ .Profile.Location.S3Compliant.Prefix }}", RestoreDataRestorePathArg: "/", RestoreDataBackupIdentifierArg: "{{ .Time }}", @@ -222,7 +222,7 @@ func newCopyDataTestBlueprint() crv1alpha1.Blueprint { Func: "RestoreData", Args: map[string]interface{}{ RestoreDataNamespaceArg: "{{ .PVC.Namespace }}", - RestoreDataImageArg: "kanisterio/kanister-tools:0.12.0", + RestoreDataImageArg: "kanisterio/kanister-tools:0.13.0", RestoreDataBackupArtifactPrefixArg: fmt.Sprintf("{{ .Options.%s }}", CopyVolumeDataOutputBackupArtifactLocation), RestoreDataBackupIdentifierArg: fmt.Sprintf("{{ .Options.%s }}", CopyVolumeDataOutputBackupID), RestoreDataVolsArg: map[string]string{ diff --git a/pkg/function/delete_data.go b/pkg/function/delete_data.go index ce9d90b52a..1f48a75705 100644 --- a/pkg/function/delete_data.go +++ b/pkg/function/delete_data.go @@ -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 nil, kubeTask(ctx, namespace, "kanisterio/kanister-tools:0.12.0", cmd) + return nil, kubeTask(ctx, namespace, "kanisterio/kanister-tools:0.13.0", cmd) } func (*deleteDataFunc) RequiredArgs() []string { diff --git a/pkg/function/kube_exec_test.go b/pkg/function/kube_exec_test.go index 4ec9f0f3fa..24c1606733 100644 --- a/pkg/function/kube_exec_test.go +++ b/pkg/function/kube_exec_test.go @@ -157,11 +157,11 @@ func (s *KubeExecTest) TestParseLogAndCreateOutput(c *C) { errChecker Checker outChecker Checker }{ - {"###Phase-output###: {\"key\":\"version\",\"value\":\"0.12.0\"}", map[string]interface{}{"version": "0.12.0"}, IsNil, NotNil}, - {"###Phase-output###: {\"key\":\"version\",\"value\":\"0.12.0\"}\n###Phase-output###: {\"key\":\"path\",\"value\":\"/backup/path\"}", - map[string]interface{}{"version": "0.12.0", "path": "/backup/path"}, IsNil, NotNil}, - {"Random message ###Phase-output###: {\"key\":\"version\",\"value\":\"0.12.0\"}", map[string]interface{}{"version": "0.12.0"}, IsNil, NotNil}, - {"Random message with newline \n###Phase-output###: {\"key\":\"version\",\"value\":\"0.12.0\"}", map[string]interface{}{"version": "0.12.0"}, IsNil, NotNil}, + {"###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###: Invalid message", nil, NotNil, IsNil}, {"Random message", nil, IsNil, IsNil}, } { diff --git a/pkg/kube/pod_test.go b/pkg/kube/pod_test.go index ed068f3f77..ec5a905db2 100644 --- a/pkg/kube/pod_test.go +++ b/pkg/kube/pod_test.go @@ -50,7 +50,7 @@ func (s *PodSuite) TestPod(c *C) { pod, err := CreatePod(ctx, s.cli, &PodOptions{ Namespace: s.namespace, GenerateName: "test-", - Image: "kanisterio/kanister-tools:0.12.0", + Image: "kanisterio/kanister-tools:0.13.0", Command: []string{"sh", "-c", "tail -f /dev/null"}, }) c.Assert(err, IsNil) @@ -76,7 +76,7 @@ func (s *PodSuite) TestPodWithVolumes(c *C) { pod, err := CreatePod(ctx, cli, &PodOptions{ Namespace: s.namespace, GenerateName: "test-", - Image: "kanisterio/kanister-tools:0.12.0", + Image: "kanisterio/kanister-tools:0.13.0", Command: []string{"sh", "-c", "tail -f /dev/null"}, Volumes: vols, }) diff --git a/pkg/param/param_test.go b/pkg/param/param_test.go index 9fe747df63..6ad3771817 100644 --- a/pkg/param/param_test.go +++ b/pkg/param/param_test.go @@ -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.12.0"}) + UpdatePhaseParams(ctx, tp, "backup", map[string]interface{}{"version": "0.13.0"}) c.Assert(tp.Phases, HasLen, 1) c.Assert(tp.Phases["backup"], NotNil) } diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go index 58cc42482c..2f11087fcd 100644 --- a/pkg/testutil/testutil.go +++ b/pkg/testutil/testutil.go @@ -79,7 +79,7 @@ func newTestPodTemplateSpec() v1.PodTemplateSpec { Containers: []v1.Container{ v1.Container{ Name: "test-container", - Image: "kanisterio/kanister-tools:0.12.0", + Image: "kanisterio/kanister-tools:0.13.0", Command: []string{"tail"}, Args: []string{"-f", "/dev/null"}, }, diff --git a/scripts/get.sh b/scripts/get.sh index 1dee85a692..d6df817db6 100755 --- a/scripts/get.sh +++ b/scripts/get.sh @@ -137,7 +137,7 @@ cleanup() { } main() { - version="${1:-"0.12.0"}" + version="${1:-"0.13.0"}" initArch initOS verifySupported