Rebase with master (#777)

Co-authored-by: Vivek Singh <[email protected]>

examples/stable/cassandra/README.md

@@ -7,7 +7,7 @@ As the official documentation of [Cassandra](http://cassandra.apache.org/) says,
 * Kubernetes 1.9+
 * Kubernetes beta APIs enabled only if `podDisruptionBudget` is enabled
 * PV support on the underlying infrastructure
-* Kanister controller version 0.36.0 installed in your cluster, let's say in namespace `<kanister-operator-namespace>`
+* Kanister controller version 0.37.0 installed in your cluster, let's say in namespace `<kanister-operator-namespace>`
 * Kanctl CLI installed (https://docs.kanister.io/tooling.html#kanctl)
 
 To install kanister and related tools you can follow [this](https://docs.kanister.io/install.html#install) link.
@@ -28,7 +28,7 @@ To install the cassandra in your Kubernetes cluster you can run below command
 $ helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com
 $ helm repo update
 # remove app-namespace with the namespace you want to deploy the cassandra app in
-$ helm install --namespace "<app-namespace>" "cassandra" incubator/cassandra --set image.repo=kanisterio/cassandra --set image.tag=0.36.0 --set config.cluster_size=2
+$ helm install --namespace "<app-namespace>" "cassandra" incubator/cassandra --set image.repo=kanisterio/cassandra --set image.tag=0.37.0 --set config.cluster_size=2
 ```
 This command will install cassandra on your Kubernetes cluster with 2 nodes. You can notice that we are using custom image of cassandra in the helm to install the cassandra cluster. The reason is we have to use some Kanister tools to take backup, so only change that we have done is including that tooling on top of statndard `cassandra:3.11.3` image.
 

examples/stable/cassandra/cassandra-blueprint.yaml

@@ -104,7 +104,7 @@ actions:
       name: restoreFromObjectStore
       args:
         namespace: "{{ .StatefulSet.Namespace }}"
-        image: kanisterio/kanister-tools:0.36.0
+        image: kanisterio/kanister-tools:0.37.0
         backupArtifactPrefix: "{{ .ArtifactsIn.params.KeyValue.backupPrefixLocation }}"
         pods: "{{ range .StatefulSet.Pods }} {{.}}{{end}}"
         restorePath: "{{ .ArtifactsIn.params.KeyValue.restorePathPrefix }}"

examples/stable/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.36.0 with `profiles.cr.kanister.io` CRD installed
+* Kanister version 0.37.0 with `profiles.cr.kanister.io` CRD installed
 
 ## StatefulSets Details
 * https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/

examples/stable/elasticsearch/elasticsearch-blueprint.yaml

@@ -14,7 +14,7 @@ actions:
       name: backupToObjectStore
       args:
         namespace: "{{ .StatefulSet.Namespace }}"
-        image: "kanisterio/es-sidecar:0.36.0"
+        image: "kanisterio/es-sidecar:0.37.0"
         command:
         - bash
         - -o
@@ -38,7 +38,7 @@ actions:
       name: restoreFromObjectStore
       args:
         namespace: "{{ .StatefulSet.Namespace }}"
-        image: "kanisterio/es-sidecar:0.36.0"
+        image: "kanisterio/es-sidecar:0.37.0"
         command:
         - bash
         - -o
@@ -58,7 +58,7 @@ actions:
       name: deleteFromObjectStore
       args:
         namespace: "{{ .Namespace.Name }}"
-        image: "kanisterio/es-sidecar:0.36.0"
+        image: "kanisterio/es-sidecar:0.37.0"
         command:
         - bash
         - -o

examples/stable/foundationdb/README.md

@@ -24,7 +24,7 @@ cluster.
 on you cluster.
 * Kubernetes 1.9+ with Beta APIs enabled.
 * PV support on the underlying infrastructure.
-* Kanister version 0.36.0 with `profiles.cr.kanister.io` CRD installed.
+* Kanister version 0.37.0 with `profiles.cr.kanister.io` CRD installed.
 
 # Installation
 

examples/stable/mysql-deploymentconfig/README.md

@@ -14,7 +14,7 @@ cluster's DeploymentConfig resources.
 
 - Setup OpenShift, you can follow steps mentioned below
 - PV provisioner support in the underlying infrastructure
-- Kanister controller version 0.36.0 installed in your cluster in namespace `kanister`
+- Kanister controller version 0.37.0 installed in your cluster in namespace `kanister`
 - Kanctl CLI installed (https://docs.kanister.io/tooling.html#kanctl)
 
 **Note**

examples/stable/mysql-deploymentconfig/mysql-dep-config-blueprint.yaml

@@ -18,7 +18,7 @@ actions:
           name: "{{ .DeploymentConfig.Name }}"
           namespace: "{{ .DeploymentConfig.Namespace }}"
       args:
-        image: kanisterio/mysql-sidecar:0.36.0
+        image: kanisterio/mysql-sidecar:0.37.0
         namespace: "{{ .DeploymentConfig.Namespace }}"
         command:
         - bash
@@ -45,7 +45,7 @@ actions:
           name: "{{ .DeploymentConfig.Name }}"
           namespace: "{{ .DeploymentConfig.Namespace }}"
       args:
-        image: kanisterio/mysql-sidecar:0.36.0
+        image: kanisterio/mysql-sidecar:0.37.0
         namespace: "{{ .DeploymentConfig.Namespace }}"
         command:
         - bash
@@ -66,7 +66,7 @@ actions:
     - func: KubeTask
       name: deleteFromBlobStore
       args:
-        image: kanisterio/mysql-sidecar:0.36.0
+        image: kanisterio/mysql-sidecar:0.37.0
         namespace: "{{ .Namespace.Name }}"
         command:
         - bash

examples/stable/mysql/README.md

@@ -10,7 +10,7 @@ This chart bootstraps a single node MySQL deployment on a [Kubernetes](http://ku
 
 - Kubernetes 1.6+ with Beta APIs enabled
 - PV provisioner support in the underlying infrastructure
-- Kanister controller version 0.36.0 installed in your cluster, let's assume in Namespace `kanister`
+- Kanister controller version 0.37.0 installed in your cluster, let's assume in Namespace `kanister`
 - Kanctl CLI installed (https://docs.kanister.io/tooling.html#install-the-tools)
 
 ## Installing the Chart

examples/stable/mysql/mysql-blueprint.yaml

@@ -18,7 +18,7 @@ actions:
           name: '{{ .Deployment.Name }}'
           namespace: '{{ .Deployment.Namespace }}'
       args:
-        image: kanisterio/mysql-sidecar:0.36.0
+        image: kanisterio/mysql-sidecar:0.37.0
         namespace: "{{ .Deployment.Namespace }}"
         command:
         - bash
@@ -45,7 +45,7 @@ actions:
           name: '{{ .Deployment.Name }}'
           namespace: '{{ .Deployment.Namespace }}'
       args:
-        image: kanisterio/mysql-sidecar:0.36.0
+        image: kanisterio/mysql-sidecar:0.37.0
         namespace: "{{ .Deployment.Namespace }}"
         command:
         - bash
@@ -66,7 +66,7 @@ actions:
     - func: KubeTask
       name: deleteFromBlobStore
       args:
-        image: kanisterio/mysql-sidecar:0.36.0
+        image: kanisterio/mysql-sidecar:0.37.0
         namespace: "{{ .Namespace.Name }}"
         command:
         - bash

examples/time-log/blueprint.yaml

@@ -40,7 +40,7 @@ actions:
       args:
         namespace: "{{ .Deployment.Namespace }}"
         pod: "{{ index .Deployment.Pods 0 }}"
-        image: kanisterio/kanister-tools:0.36.0
+        image: kanisterio/kanister-tools:0.37.0
         backupArtifactPrefix: "{{ .ArtifactsIn.timeLog.KeyValue.path }}"
         backupIdentifier: "{{ .ArtifactsIn.backupIdentifier.KeyValue.id }}"
     - func: ScaleWorkload

examples/time-log/time-logger-deployment.yaml

@@ -27,7 +27,7 @@ spec:
     spec:
       containers:
       - name: test-container
-        image: kanisterio/kanister-tools:0.36.0
+        image: kanisterio/kanister-tools:0.37.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:

helm/kanister-operator/Chart.yaml

@@ -9,5 +9,5 @@ maintainers:
   - email: [email protected]
     name: tdmanv
 icon: https://kasten.io/assets/img/kanister-logo.png
-appVersion: 0.36.0
+appVersion: 0.37.0
 source: https://github.com/kanisterio/kanister

helm/kanister-operator/values.yaml

@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 image:
   repository: kanisterio/controller
-  tag: 0.36.0
+  tag: 0.37.0
   pullPolicy: IfNotPresent
 rbac:
   create: true

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.36.0
+version: 0.37.0
 maintainers:
   - email: [email protected]
     name: tdmanv

pkg/app/cassandra.go

@@ -58,7 +58,7 @@ func NewCassandraInstance(name string) App {
 			Version:  "0.13.3",
 			Values: map[string]string{
 				"image.repo":          "kanisterio/cassandra",
-				"image.tag":           "0.36.0",
+				"image.tag":           "0.37.0",
 				"config.cluster_size": "1",
 			},
 		},

pkg/blueprint/blueprints/rds-postgres-blueprint.yaml

@@ -13,7 +13,7 @@ actions:
     - func: KubeTask
       name: backupSnapshots
       args:
-        image: "kanisterio/postgres-kanister-tools:0.36.0"
+        image: "kanisterio/postgres-kanister-tools:0.37.0"
         namespace: "{{ .Object.metadata.namespace }}"
         command:
           - bash
@@ -44,7 +44,7 @@ actions:
     - func: KubeTask
       name: restoreSnapshots
       args:
-        image: "kanisterio/postgres-kanister-tools:0.36.0"
+        image: "kanisterio/postgres-kanister-tools:0.37.0"
         namespace: "{{ .Object.metadata.namespace }}"
         command:
           - bash
@@ -76,7 +76,7 @@ actions:
     - func: KubeTask
       name: restoreSnapshots
       args:
-        image: "kanisterio/postgres-kanister-tools:0.36.0"
+        image: "kanisterio/postgres-kanister-tools:0.37.0"
         namespace: "{{ .Object.metadata.namespace }}"
         command:
           - bash

pkg/function/data_test.go

@@ -134,7 +134,7 @@ func newRestoreDataBlueprint(pvc, identifierArg, identifierVal string) *crv1alph
 						Func: RestoreDataFuncName,
 						Args: map[string]interface{}{
 							RestoreDataNamespaceArg:            "{{ .StatefulSet.Namespace }}",
-							RestoreDataImageArg:                "kanisterio/kanister-tools:0.36.0",
+							RestoreDataImageArg:                "kanisterio/kanister-tools:0.37.0",
 							RestoreDataBackupArtifactPrefixArg: "{{ .Profile.Location.Bucket }}/{{ .Profile.Location.Prefix }}",
 							RestoreDataRestorePathArg:          "/mnt/data",
 							RestoreDataEncryptionKeyArg:        "{{ .Secrets.backupKey.Data.password | toString }}",
@@ -266,7 +266,7 @@ func newRestoreDataAllBlueprint() *crv1alpha1.Blueprint {
 						Func: RestoreDataAllFuncName,
 						Args: map[string]interface{}{
 							RestoreDataAllNamespaceArg:            "{{ .StatefulSet.Namespace }}",
-							RestoreDataAllImageArg:                "kanisterio/kanister-tools:0.36.0",
+							RestoreDataAllImageArg:                "kanisterio/kanister-tools:0.37.0",
 							RestoreDataAllBackupArtifactPrefixArg: "{{ .Profile.Location.Bucket }}/{{ .Profile.Location.Prefix }}",
 							RestoreDataAllBackupInfo:              fmt.Sprintf("{{ .Options.%s }}", BackupDataAllOutput),
 							RestoreDataAllRestorePathArg:          "/mnt/data",
@@ -477,7 +477,7 @@ func newCopyDataTestBlueprint() crv1alpha1.Blueprint {
 						Func: RestoreDataFuncName,
 						Args: map[string]interface{}{
 							RestoreDataNamespaceArg:            "{{ .PVC.Namespace }}",
-							RestoreDataImageArg:                "kanisterio/kanister-tools:0.36.0",
+							RestoreDataImageArg:                "kanisterio/kanister-tools:0.37.0",
 							RestoreDataBackupArtifactPrefixArg: fmt.Sprintf("{{ .Options.%s }}", CopyVolumeDataOutputBackupArtifactLocation),
 							RestoreDataBackupTagArg:            fmt.Sprintf("{{ .Options.%s }}", CopyVolumeDataOutputBackupTag),
 							RestoreDataVolsArg: map[string]string{

pkg/function/export_rds_snapshot_location.go

@@ -60,7 +60,7 @@ const (
 	BackupAction  RDSAction = "backup"
 	RestoreAction RDSAction = "restore"
 
-	postgresToolsImage = "kanisterio/postgres-kanister-tools:0.36.0"
+	postgresToolsImage = "kanisterio/postgres-kanister-tools:0.37.0"
 )
 
 type exportRDSSnapshotToLocationFunc struct{}

pkg/function/kube_exec_test.go

@@ -178,11 +178,11 @@ func (s *KubeExecTest) TestParseLogAndCreateOutput(c *C) {
 		errChecker Checker
 		outChecker Checker
 	}{
-		{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.36.0\"}", map[string]interface{}{"version": "0.36.0"}, IsNil, NotNil},
-		{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.36.0\"}\n###Phase-output###: {\"key\":\"path\",\"value\":\"/backup/path\"}",
-			map[string]interface{}{"version": "0.36.0", "path": "/backup/path"}, IsNil, NotNil},
-		{"Random message ###Phase-output###: {\"key\":\"version\",\"value\":\"0.36.0\"}", map[string]interface{}{"version": "0.36.0"}, IsNil, NotNil},
-		{"Random message with newline \n###Phase-output###: {\"key\":\"version\",\"value\":\"0.36.0\"}", map[string]interface{}{"version": "0.36.0"}, IsNil, NotNil},
+		{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.37.0\"}", map[string]interface{}{"version": "0.37.0"}, IsNil, NotNil},
+		{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.37.0\"}\n###Phase-output###: {\"key\":\"path\",\"value\":\"/backup/path\"}",
+			map[string]interface{}{"version": "0.37.0", "path": "/backup/path"}, IsNil, NotNil},
+		{"Random message ###Phase-output###: {\"key\":\"version\",\"value\":\"0.37.0\"}", map[string]interface{}{"version": "0.37.0"}, IsNil, NotNil},
+		{"Random message with newline \n###Phase-output###: {\"key\":\"version\",\"value\":\"0.37.0\"}", map[string]interface{}{"version": "0.37.0"}, IsNil, NotNil},
 		{"###Phase-output###: Invalid message", nil, NotNil, IsNil},
 		{"Random message", nil, IsNil, IsNil},
 	} {

pkg/function/kube_task_test.go

@@ -70,7 +70,7 @@ func outputPhase(namespace string) crv1alpha1.BlueprintPhase {
 			KubeTaskCommandArg: []string{
 				"sh",
 				"-c",
-				"kando output version 0.36.0",
+				"kando output version 0.37.0",
 			},
 		},
 	}
@@ -143,7 +143,7 @@ func (s *KubeTaskSuite) TestKubeTask(c *C) {
 			bp: newTaskBlueprint(outputPhase(s.namespace), sleepPhase(s.namespace), tickPhase(s.namespace)),
 			outs: []map[string]interface{}{
 				map[string]interface{}{
-					"version": "0.36.0",
+					"version": "0.37.0",
 				},
 				map[string]interface{}{},
 				map[string]interface{}{},

pkg/function/utils.go

@@ -26,7 +26,7 @@ import (
 const (
 	// FunctionOutputVersion returns version
 	FunctionOutputVersion     = "version"
-	kanisterToolsImage        = "kanisterio/kanister-tools:0.36.0"
+	kanisterToolsImage        = "kanisterio/kanister-tools:0.37.0"
 	kanisterToolsImageEnvName = "KANISTER_TOOLS"
 )