[cherry-pick] Don't overwrite superuser password of restored database (#660) (#669)

/cherry-pick
Signed-off-by: Emruz Hossain <emruz@appscode.com>

Co-authored-by: Emruz Hossain <emruz@appscode.com>

Author: 1gtm

.github/workflows/ci.yml

@@ -81,6 +81,7 @@ jobs:
           helm repo add appscode https://charts.appscode.com/stable/
           helm repo update
           helm install stash-crds appscode/stash-crds
+          helm install kubedb-crds appscode/kubedb-crds
           helm install kmodules-crds appscode/kmodules-crds
           kubectl wait --for=condition=NamesAccepted crds --all --timeout=5m
 

Makefile

@@ -572,3 +572,10 @@ release:
 .PHONY: clean
 clean:
 	rm -rf .go bin
+
+# make and load docker image to kind cluster
+.PHONY: push-to-kind
+push-to-kind: container
+	@echo "Loading docker image into kind cluster...."
+	@kind load docker-image $(REGISTRY)/stash-postgres:$(TAG)
+	@echo "Image has been pushed successfully into kind cluster."

docs/examples/backup/appbinding.yaml

@@ -7,10 +7,7 @@ metadata:
     app.kubernetes.io/component: database
     app.kubernetes.io/instance: sample-postgres
     app.kubernetes.io/managed-by: kubedb.com
-    app.kubernetes.io/name: postgres
-    app.kubernetes.io/version: "12.4"
-    kubedb.com/kind: Postgres
-    kubedb.com/name: sample-postgres
+    app.kubernetes.io/name: postgreses.kubedb.com
   name: sample-postgres
   namespace: demo
 spec:

docs/examples/backup/postgres.yaml

@@ -1,4 +1,4 @@
-apiVersion: kubedb.com/v1alpha1
+apiVersion: kubedb.com/v1alpha2
 kind: Postgres
 metadata:
   name: sample-postgres

docs/examples/restore/restored-postgres.yaml

@@ -1,13 +1,13 @@
-apiVersion: kubedb.com/v1alpha1
+apiVersion: kubedb.com/v1alpha2
 kind: Postgres
 metadata:
   name: restored-postgres
   namespace: demo
 spec:
   version: "12.4"
   storageType: Durable
-  databaseSecret:
-    secretName: sample-postgres-auth # use same secret as original the database
+  authSecret:
+    name: sample-postgres-auth # use same secret as original the database
   storage:
     storageClassName: "standard"
     accessModes:
@@ -16,6 +16,5 @@ spec:
       requests:
         storage: 1Gi
   init:
-    stashRestoreSession:
-      name: sample-postgres-restore
+    waitForInitialRestore: true
   terminationPolicy: Delete

docs/examples/restore/restoresession.yaml

@@ -4,7 +4,7 @@ metadata:
   name: sample-postgres-restore
   namespace: demo
   labels:
-    kubedb.com/kind: Postgres # this label is mandatory if you are using KubeDB to deploy the database.
+    app.kubernetes.io/name: postgreses.kubedb.com # this label is mandatory if you are using KubeDB to deploy the database.
 spec:
   task:
     name: postgres-restore-12.4.0-v4

docs/standalone.md

@@ -56,7 +56,7 @@ Let's deploy a sample PostgreSQL database and insert some data into it.
 Below is the YAML of a sample Postgres crd that we are going to create for this tutorial:
 
 ```yaml
-apiVersion: kubedb.com/v1alpha1
+apiVersion: kubedb.com/v1alpha2
 kind: Postgres
 metadata:
   name: sample-postgres
@@ -132,10 +132,7 @@ metadata:
     app.kubernetes.io/component: database
     app.kubernetes.io/instance: sample-postgres
     app.kubernetes.io/managed-by: kubedb.com
-    app.kubernetes.io/name: postgres
-    app.kubernetes.io/version: "12.4"
-    kubedb.com/kind: Postgres
-    kubedb.com/name: sample-postgres
+    app.kubernetes.io/name: postgreses.kubedb.com
   name: sample-postgres
   namespace: demo
 spec:
@@ -417,16 +414,16 @@ Now, we have to deploy the restored database similarly as we have deployed the o
 Below is the YAML for `Postgres` crd we are going deploy to initialize from backup,
 
 ```yaml
-apiVersion: kubedb.com/v1alpha1
+apiVersion: kubedb.com/v1alpha2
 kind: Postgres
 metadata:
   name: restored-postgres
   namespace: demo
 spec:
   version: "12.4"
   storageType: Durable
-  databaseSecret:
-    secretName: sample-postgres-auth # use same secret as original the database
+  authSecret:
+    name: sample-postgres-auth # use same secret as original the database
   storage:
     storageClassName: "standard"
     accessModes:
@@ -435,15 +432,14 @@ spec:
       requests:
         storage: 1Gi
   init:
-    stashRestoreSession:
-      name: sample-postgres-restore
+    waitForInitialRestore: true
   terminationPolicy: Delete
 ```
 
 Here,
 
 - `spec.databaseSecret.secretName` specifies the name of the database secret of the original database. You must use the same secret in the restored database. Otherwise, the restore process will fail.
-- `spec.init.stashRestoreSession.name` specifies the `RestoreSession` crd name that we are going to use to restore this database.
+- `spec.init.waitForInitialRestore` tells KubeDB to wait for the first restore to complete before marking the database as ready.
 
 Let's create the above database,
 
@@ -483,7 +479,7 @@ metadata:
   name: sample-postgres-restore
   namespace: demo
   labels:
-    kubedb.com/kind: Postgres # this label is mandatory if you are using KubeDB to deploy the database.
+    app.kubernetes.io/name: postgreses.kubedb.com # this label is mandatory if you are using KubeDB to deploy the database.
 spec:
   task:
     name: postgres-restore-{{< param "info.subproject_version" >}}
@@ -500,13 +496,13 @@ spec:
 
 Here,
 
-- `metadata.labels` specifies a `kubedb.com/kind: Postgres` label that is used by KubeDB to watch this `RestoreSession`.
+- `metadata.labels` specifies a `app.kubernetes.io/name: postgreses.kubedb.com` label that is used by KubeDB to watch this `RestoreSession`.
 - `spec.task.name` specifies the name of the `Task` crd that specifies the Functions and their execution order to restore a PostgreSQL database.
 - `spec.repository.name` specifies the `Repository` crd that holds the backend information where our backed up data has been stored.
 - `spec.target.ref` refers to the AppBinding crd for the `restored-postgres` database where the backed up data will be restored.
 - `spec.rules` specifies that we are restoring from the latest backup snapshot of the original database.
 
-> **Warning:** Label `kubedb.com/kind: Postgres` is mandatory if you are using KubeDB to deploy the database. Otherwise, the database will be stuck in `Initializing` state.
+> **Warning:** Label `app.kubernetes.io/name: postgreses.kubedb.com` is mandatory if you are using KubeDB to deploy the database. Otherwise, the database will be stuck in `Initializing` state.
 
 Let's create the `RestoreSession` crd we have shown above,
 

go.mod

@@ -11,11 +11,11 @@ require (
 	k8s.io/api v0.18.9
 	k8s.io/apimachinery v0.18.9
 	k8s.io/client-go v0.18.9
-	kmodules.xyz/client-go v0.0.0-20210118094617-273ba20ad7ca
-	kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c
-	kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2
+	kmodules.xyz/client-go v0.0.0-20210218100652-8f345ddfe801
+	kmodules.xyz/custom-resources v0.0.0-20210218144958-579bf8307d65
+	kmodules.xyz/offshoot-api v0.0.0-20210218144050-e1d794cb382a
 	kmodules.xyz/schema-checker v0.1.0
-	stash.appscode.dev/apimachinery v0.11.8
+	stash.appscode.dev/apimachinery v0.11.10-0.20210219134546-33840ed82608
 )
 
 replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d