diff --git a/docs/functions.rst b/docs/functions.rst index 969670b902..1c1dead21f 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.17.0 + image: kanisterio/kanister-tools:0.18.0 backupArtifactPrefix: s3-bucket/path/artifactPrefix backupIdentifier: "{{ .Time }}" diff --git a/docs/helm.rst b/docs/helm.rst index 2900c53b6c..a1cc506d92 100644 --- a/docs/helm.rst +++ b/docs/helm.rst @@ -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.17.0 + $ helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.18.0 Kanister-Enabled Applications ============================= diff --git a/docs/install.rst b/docs/install.rst index 3525af6aa1..8b65c745d4 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -35,7 +35,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.17.0 + $ helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.18.0 # Create an S3 Compliant Kanister profile using kanctl $ kanctl create profile s3compliant --bucket --access-key ${AWS_ACCESS_KEY_ID} \ @@ -73,5 +73,5 @@ namespace. .. code-block:: bash - # Deploy controller version 0.17.0 to Kubernetes - $ make deploy VERSION="0.17.0" + # Deploy controller version 0.18.0 to Kubernetes + $ make deploy VERSION="0.18.0" diff --git a/docs/overview.rst b/docs/overview.rst index 67dae20050..1ca9de1ca1 100644 --- a/docs/overview.rst +++ b/docs/overview.rst @@ -64,7 +64,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.17.0 + helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.18.0 # Install MySQL and configure its Kanister Blueprint. # Also create a Profile CR that can be used in ActionSets diff --git a/docs/tooling.rst b/docs/tooling.rst index 6ad371bfc6..24d6251e47 100644 --- a/docs/tooling.rst +++ b/docs/tooling.rst @@ -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.17.0 + kando output version 0.18.0 Install the tools ================= @@ -398,7 +398,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.17.0`, is hosted by +The released image, `kanisterio/kanister-tools:0.18.0`, is hosted by `dockerhub `_. The Dockerfile for this image is in the diff --git a/examples/helm/kanister/kanister-elasticsearch/Chart.yaml b/examples/helm/kanister/kanister-elasticsearch/Chart.yaml index 4523c7553d..ddca82011e 100755 --- a/examples/helm/kanister/kanister-elasticsearch/Chart.yaml +++ b/examples/helm/kanister/kanister-elasticsearch/Chart.yaml @@ -1,6 +1,6 @@ name: kanister-elasticsearch home: https://www.elastic.co/products/elasticsearch -version: 0.17.0 +version: 0.18.0 appVersion: 6.3.1 description: Elasticsearch w/ Kanister support based on incubator/elasticsearch icon: https://static-www.elastic.co/assets/blteb1c97719574938d/logo-elastic-elasticsearch-lt.svg diff --git a/examples/helm/kanister/kanister-elasticsearch/README.md b/examples/helm/kanister/kanister-elasticsearch/README.md index 78b0e246d8..60e53556bf 100755 --- a/examples/helm/kanister/kanister-elasticsearch/README.md +++ b/examples/helm/kanister/kanister-elasticsearch/README.md @@ -13,7 +13,7 @@ If you want to avoid doing that upgrade to Elasticsearch 5.6 first before moving * Kubernetes 1.9+ with Beta APIs enabled. * PV support on the underlying infrastructure. -* Kanister version 0.17.0 with `profiles.cr.kanister.io` CRD installed +* Kanister version 0.18.0 with `profiles.cr.kanister.io` CRD installed ## StatefulSets Details * https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/ diff --git a/examples/helm/kanister/kanister-elasticsearch/image/Dockerfile b/examples/helm/kanister/kanister-elasticsearch/image/Dockerfile index 587cb69dce..cff01c2bbd 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.17.0 +FROM kanisterio/kanister-tools:0.18.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 66a84ef791..641f2c7212 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.17.0" + image: "kanisterio/es-sidecar:0.18.0" command: - bash - -o @@ -37,7 +37,7 @@ actions: name: restoreSnapshots args: namespace: "{{ .StatefulSet.Namespace }}" - image: "kanisterio/es-sidecar:0.17.0" + image: "kanisterio/es-sidecar:0.18.0" command: - bash - -o @@ -63,7 +63,7 @@ actions: name: deleteSnapshots args: namespace: "{{ .StatefulSet.Namespace }}" - image: "kanisterio/es-sidecar:0.17.0" + image: "kanisterio/es-sidecar:0.18.0" command: - bash - -o diff --git a/examples/helm/kanister/kanister-elasticsearch/requirements.yaml b/examples/helm/kanister/kanister-elasticsearch/requirements.yaml index 9182d895bd..1ef36621e6 100644 --- a/examples/helm/kanister/kanister-elasticsearch/requirements.yaml +++ b/examples/helm/kanister/kanister-elasticsearch/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: profile - version: "0.17.0" + version: "0.18.0" condition: profile.create repository: "https://charts.kanister.io" diff --git a/examples/helm/kanister/kanister-mongodb-replicaset/Chart.yaml b/examples/helm/kanister/kanister-mongodb-replicaset/Chart.yaml index a3a66f113f..1925651e46 100644 --- a/examples/helm/kanister/kanister-mongodb-replicaset/Chart.yaml +++ b/examples/helm/kanister/kanister-mongodb-replicaset/Chart.yaml @@ -1,6 +1,6 @@ name: kanister-mongodb-replicaset home: https://github.com/mongodb/mongo -version: 0.17.0 +version: 0.18.0 appVersion: 3.6 description: Kanister-enabled NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. diff --git a/examples/helm/kanister/kanister-mongodb-replicaset/README.md b/examples/helm/kanister/kanister-mongodb-replicaset/README.md index 63c45ec7c9..e344f035da 100644 --- a/examples/helm/kanister/kanister-mongodb-replicaset/README.md +++ b/examples/helm/kanister/kanister-mongodb-replicaset/README.md @@ -3,7 +3,7 @@ ## Prerequisites Details * Kubernetes 1.8+ with Beta APIs enabled. * PV support on the underlying infrastructure. -* Kanister version 0.17.0 with `profiles.cr.kanister.io` CRD installed +* Kanister version 0.18.0 with `profiles.cr.kanister.io` CRD installed ## StatefulSet Details * https://kubernetes.io/docs/concepts/abstractions/controllers/statefulsets/ diff --git a/examples/helm/kanister/kanister-mongodb-replicaset/requirements.yaml b/examples/helm/kanister/kanister-mongodb-replicaset/requirements.yaml index 9182d895bd..1ef36621e6 100644 --- a/examples/helm/kanister/kanister-mongodb-replicaset/requirements.yaml +++ b/examples/helm/kanister/kanister-mongodb-replicaset/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: profile - version: "0.17.0" + version: "0.18.0" condition: profile.create repository: "https://charts.kanister.io" 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 6cb863c728..4d8d1d38f4 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.17.0 + image: kanisterio/mongo-sidecar:0.18.0 imagePullPolicy: Always env: {{- if .Values.auth.enabled }} diff --git a/examples/helm/kanister/kanister-mysql/Chart.yaml b/examples/helm/kanister/kanister-mysql/Chart.yaml index 320c928a9e..1de0fe239b 100755 --- a/examples/helm/kanister/kanister-mysql/Chart.yaml +++ b/examples/helm/kanister/kanister-mysql/Chart.yaml @@ -15,5 +15,5 @@ sources: - https://github.com/kubernetes/charts - https://github.com/docker-library/mysql - https://kanister.io/ -version: 0.17.0 +version: 0.18.0 appVersion: 5.7.14 diff --git a/examples/helm/kanister/kanister-mysql/requirements.yaml b/examples/helm/kanister/kanister-mysql/requirements.yaml index 9182d895bd..1ef36621e6 100644 --- a/examples/helm/kanister/kanister-mysql/requirements.yaml +++ b/examples/helm/kanister/kanister-mysql/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: profile - version: "0.17.0" + version: "0.18.0" condition: profile.create repository: "https://charts.kanister.io" diff --git a/examples/helm/kanister/kanister-mysql/templates/deployment.yaml b/examples/helm/kanister/kanister-mysql/templates/deployment.yaml index f0b1847c69..d6049eeb3b 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.17.0 + image: kanisterio/mysql-sidecar:0.18.0 imagePullPolicy: Always env: {{- if .Values.mysqlAllowEmptyPassword }} diff --git a/examples/helm/kanister/kanister-postgresql/Chart.yaml b/examples/helm/kanister/kanister-postgresql/Chart.yaml index 5b00397601..49b6dd4cb0 100755 --- a/examples/helm/kanister/kanister-postgresql/Chart.yaml +++ b/examples/helm/kanister/kanister-postgresql/Chart.yaml @@ -17,4 +17,4 @@ sources: - https://github.com/kansiterio/blueprint-helm-charts - https://github.com/kubernetes/charts - https://github.com/docker-library/postgres -version: 0.17.0 +version: 0.18.0 diff --git a/examples/helm/kanister/kanister-postgresql/requirements.yaml b/examples/helm/kanister/kanister-postgresql/requirements.yaml index 9182d895bd..1ef36621e6 100644 --- a/examples/helm/kanister/kanister-postgresql/requirements.yaml +++ b/examples/helm/kanister/kanister-postgresql/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: profile - version: "0.17.0" + version: "0.18.0" condition: profile.create repository: "https://charts.kanister.io" diff --git a/examples/time-log/blueprint.yaml b/examples/time-log/blueprint.yaml index b3e0e5fff3..867437b3ef 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.17.0 + image: kanisterio/kanister-tools:0.18.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 b78d41685d..a254c03a65 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.17.0 + image: kanisterio/kanister-tools:0.18.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/Chart.yaml b/helm/kanister-operator/Chart.yaml index 06a9b29e12..86da5cad3d 100644 --- a/helm/kanister-operator/Chart.yaml +++ b/helm/kanister-operator/Chart.yaml @@ -9,5 +9,5 @@ maintainers: - email: tom@kasten.io name: tdmanv icon: https://kasten.io/assets/img/kanister-logo.png -appVersion: 0.17.0 +appVersion: 0.18.0 source: https://github.com/kanisterio/kanister diff --git a/helm/kanister-operator/values.yaml b/helm/kanister-operator/values.yaml index ebcf355744..781c8908c1 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.17.0 + tag: 0.18.0 pullPolicy: IfNotPresent rbac: create: true diff --git a/helm/profile/Chart.yaml b/helm/profile/Chart.yaml index 4f3f853822..4c4bd15078 100644 --- a/helm/profile/Chart.yaml +++ b/helm/profile/Chart.yaml @@ -3,7 +3,7 @@ description: A helm chart to create profile custom resource for kanister engine: gotpl name: profile home: https://kanister.io/ -version: 0.17.0 +version: 0.18.0 maintainers: - email: tom@kasten.io name: tdmanv diff --git a/pkg/function/copy_volume_data.go b/pkg/function/copy_volume_data.go index 5d61a4e202..5a020c9089 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.17.0" + kanisterToolsImage = "kanisterio/kanister-tools:0.18.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 b53f4e1f8b..4a2a436521 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.17.0", + RestoreDataImageArg: "kanisterio/kanister-tools:0.18.0", RestoreDataBackupArtifactPrefixArg: "{{ .Profile.Location.Bucket }}/{{ .Profile.Location.Prefix }}", RestoreDataRestorePathArg: "/mnt/data", RestoreDataBackupIdentifierArg: "{{ .Time }}", @@ -229,7 +229,7 @@ func newCopyDataTestBlueprint() crv1alpha1.Blueprint { Func: "RestoreData", Args: map[string]interface{}{ RestoreDataNamespaceArg: "{{ .PVC.Namespace }}", - RestoreDataImageArg: "kanisterio/kanister-tools:0.17.0", + RestoreDataImageArg: "kanisterio/kanister-tools:0.18.0", RestoreDataBackupArtifactPrefixArg: fmt.Sprintf("{{ .Options.%s }}", CopyVolumeDataOutputBackupArtifactLocation), RestoreDataBackupIdentifierArg: fmt.Sprintf("{{ .Options.%s }}", CopyVolumeDataOutputBackupID), RestoreDataVolsArg: map[string]string{ diff --git a/pkg/function/kube_exec_test.go b/pkg/function/kube_exec_test.go index 985aada5ef..f60a3395a1 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.17.0\"}", map[string]interface{}{"version": "0.17.0"}, IsNil, NotNil}, - {"###Phase-output###: {\"key\":\"version\",\"value\":\"0.17.0\"}\n###Phase-output###: {\"key\":\"path\",\"value\":\"/backup/path\"}", - map[string]interface{}{"version": "0.17.0", "path": "/backup/path"}, IsNil, NotNil}, - {"Random message ###Phase-output###: {\"key\":\"version\",\"value\":\"0.17.0\"}", map[string]interface{}{"version": "0.17.0"}, IsNil, NotNil}, - {"Random message with newline \n###Phase-output###: {\"key\":\"version\",\"value\":\"0.17.0\"}", map[string]interface{}{"version": "0.17.0"}, IsNil, NotNil}, + {"###Phase-output###: {\"key\":\"version\",\"value\":\"0.18.0\"}", map[string]interface{}{"version": "0.18.0"}, IsNil, NotNil}, + {"###Phase-output###: {\"key\":\"version\",\"value\":\"0.18.0\"}\n###Phase-output###: {\"key\":\"path\",\"value\":\"/backup/path\"}", + map[string]interface{}{"version": "0.18.0", "path": "/backup/path"}, IsNil, NotNil}, + {"Random message ###Phase-output###: {\"key\":\"version\",\"value\":\"0.18.0\"}", map[string]interface{}{"version": "0.18.0"}, IsNil, NotNil}, + {"Random message with newline \n###Phase-output###: {\"key\":\"version\",\"value\":\"0.18.0\"}", map[string]interface{}{"version": "0.18.0"}, IsNil, NotNil}, {"###Phase-output###: Invalid message", nil, NotNil, IsNil}, {"Random message", nil, IsNil, IsNil}, } { diff --git a/pkg/function/kube_task_test.go b/pkg/function/kube_task_test.go index 73ae1bfdd8..0e3e1d5298 100644 --- a/pkg/function/kube_task_test.go +++ b/pkg/function/kube_task_test.go @@ -58,11 +58,11 @@ func newTaskBlueprint(namespace string) *crv1alpha1.Blueprint { Func: "KubeTask", Args: map[string]interface{}{ KubeTaskNamespaceArg: namespace, - KubeTaskImageArg: "kanisterio/kanister-tools:0.17.0", + KubeTaskImageArg: "kanisterio/kanister-tools:0.18.0", KubeTaskCommandArg: []string{ "sh", "-c", - "kando output version 0.17.0", + "kando output version 0.18.0", }, }, }, diff --git a/pkg/kube/pod_test.go b/pkg/kube/pod_test.go index 9a3ee4bdb1..909b504e3c 100644 --- a/pkg/kube/pod_test.go +++ b/pkg/kube/pod_test.go @@ -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.17.0", + Image: "kanisterio/kanister-tools:0.18.0", Command: []string{"sh", "-c", "tail -f /dev/null"}, }) c.Assert(err, IsNil) @@ -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.17.0", + Image: "kanisterio/kanister-tools:0.18.0", Command: []string{"sh", "-c", "tail -f /dev/null"}, Volumes: vols, }) @@ -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.17.0", + Image: "kanisterio/kanister-tools:0.18.0", Command: []string{"sh", "-c", "echo hello"}, }) c.Assert(err, IsNil) diff --git a/pkg/param/param_test.go b/pkg/param/param_test.go index 13fc21e01f..7f31ed9dc7 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.17.0"}) + UpdatePhaseParams(ctx, tp, "backup", map[string]interface{}{"version": "0.18.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 5459a9fcd7..56b19c9421 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.17.0", + Image: "kanisterio/kanister-tools:0.18.0", Command: []string{"tail"}, Args: []string{"-f", "/dev/null"}, }, diff --git a/scripts/get.sh b/scripts/get.sh index e78b859280..dc80e91020 100755 --- a/scripts/get.sh +++ b/scripts/get.sh @@ -137,7 +137,7 @@ cleanup() { } main() { - version="${1:-"0.17.0"}" + version="${1:-"0.18.0"}" initArch initOS verifySupported