fix various rename issues in the config templates

Jeff McCormick · Jeff McCormick · commit f4218e098f81 · 2017-10-18T10:10:17.000-05:00
diff --git a/apis/cr/v1/cluster.go b/apis/cr/v1/cluster.go
@@ -41,7 +41,6 @@ type PgclusterSpec struct {
 	PrimaryStorage    PgStorageSpec     `json:primarystorage`
 	ReplicaStorage    PgStorageSpec     `json:replicastorage`
 	PrimaryHost       string            `json:"primaryhost"`
-	PrimaryUser       string            `json:"primaryuser"`
 	PrimaryPassword   string            `json:"primarypassword"`
 	User              string            `json:"user"`
 	Password          string            `json:"password"`
diff --git a/apis/cr/v1/common.go b/apis/cr/v1/common.go
@@ -18,13 +18,13 @@ limitations under the License.
 import ()
 
 // RootSecretSuffix ...
-const RootSecretSuffix = "-pgroot-secret"
+const RootSecretSuffix = "-root-secret"
 
 // UserSecretSuffix ...
-const UserSecretSuffix = "-pguser-secret"
+const UserSecretSuffix = "-user-secret"
 
 // PrimarySecretSuffix ...
-const PrimarySecretSuffix = "-pgprimary-secret"
+const PrimarySecretSuffix = "-primary-secret"
 
 // StorageExisting ...
 const StorageExisting = "existing"
diff --git a/conf/postgres-operator/cluster/1/cluster-deployment-1.json b/conf/postgres-operator/cluster/1/cluster-deployment-1.json
@@ -34,20 +34,20 @@
                         "timeoutSeconds": 8
                     },
                     "env": [{
-                        "name": "PG_MASTER_PORT",
+                        "name": "PG_PRIMARY_PORT",
                         "value": "{{.Port}}"
                     }, {
                         "name": "PG_MODE",
                         "value": "primary"
                     }, {
                         "name": "PGDATA_PATH_OVERRIDE",
-                        "value": "{{.PgdataPathOverride}}"
+                        "value": "{{.DataPathOverride}}"
                     }, {
                         "name": "BACKUP_PATH",
                         "value": "{{.BackupPath}}"
                     }, {
                         "name": "PG_DATABASE",
-                        "value": "{{.PgDatabase}}"
+                        "value": "{{.Database}}"
                     }, {
                         "name": "PGHOST",
                         "value": "/tmp"
@@ -62,13 +62,13 @@
                             "readOnly": true
                         }, {
                             "mountPath": "/pguser",
-                            "name": "pguser-volume"
+                            "name": "user-volume"
                         }, {
                             "mountPath": "/pgprimary",
-                            "name": "pgprimary-volume"
+                            "name": "primary-volume"
                         }, {
                             "mountPath": "/pgroot",
-                            "name": "pgroot-volume"
+                            "name": "root-volume"
                         }
 
                     ],
@@ -87,19 +87,19 @@
                         "name": "backup",
                         {{.BackupPVCName}}
                     }, {
-                        "name": "pguser-volume",
+                        "name": "user-volume",
                         "secret": {
-                            "secretName": "{{.PgUserSecretName}}"
+                            "secretName": "{{.UserSecretName}}"
                         }
                     }, {
-                        "name": "pgprimary-volume",
+                        "name": "primary-volume",
                         "secret": {
-                            "secretName": "{{.PgPrimarySecretName}}"
+                            "secretName": "{{.PrimarySecretName}}"
                         }
                     }, {
-                        "name": "pgroot-volume",
+                        "name": "root-volume",
                         "secret": {
-                            "secretName": "{{.PgRootSecretName}}"
+                            "secretName": "{{.RootSecretName}}"
                         }
                     }
 
diff --git a/conf/postgres-operator/pvc-storageclass.json b/conf/postgres-operator/pvc-storageclass.json
@@ -2,19 +2,19 @@
     "kind": "PersistentVolumeClaim",
     "apiVersion": "v1",
     "metadata": {
-        "name": "{{.PVCName}}",
+        "name": "{{.Name}}",
         "labels": {
             "pgremove": "true"
         }
     },
     "spec": {
         "accessModes": [
-            "{{.PVCAccessMode}}"
+            "{{.AccessMode}}"
         ],
 	"storageClassName": "{{.StorageClass}}",
         "resources": {
             "requests": {
-                "storage": "{{.PVCSize}}"
+                "storage": "{{.Size}}"
             }
         }
     }
diff --git a/conf/postgres-operator/pvc.json b/conf/postgres-operator/pvc.json
@@ -2,18 +2,18 @@
     "kind": "PersistentVolumeClaim",
     "apiVersion": "v1",
     "metadata": {
-        "name": "{{.PVCName}}",
+        "name": "{{.Name}}",
         "labels": {
             "pgremove": "true"
         }
     },
     "spec": {
         "accessModes": [
-            "{{.PVCAccessMode}}"
+            "{{.AccessMode}}"
         ],
         "resources": {
             "requests": {
-                "storage": "{{.PVCSize}}"
+                "storage": "{{.Size}}"
             }
         }
     }
diff --git a/docs/config.asciidoc b/docs/config.asciidoc
@@ -29,8 +29,7 @@ Kubeconfig:  /etc/kubernetes/admin.conf
 Cluster:
   CCPImageTag:  centos7-9.6.5-1.6.0
   Port:  5432
-  Primary_USER:  master
-  Primary_PASSWORD:  password
+  PrimaryPassword:  password
   User:  testuser
   Password:  password
   Database:  userdb
@@ -80,8 +79,7 @@ Values in the pgo configuration file have the following meaning:
 |Kubeconfig        | the path to the kubeconfig file
 |Cluster.CCPImageTag        |newly created containers will be based on this image version (e.g. centos7-9.6.5-1.6.0), unless you override it using the --ccp-image-tag command line flag
 |Cluster.Port        | the PostgreSQL port to use for new containers (e.g. 5432)
-|Cluster.PrimaryUser        | the PostgreSQL master user name
-|Cluster.PrimaryPassword        | the PostgreSQL master user password, when specified, it will be stored in the secret holding the master user credentials, if not specified the value will be generated
+|Cluster.PrimaryPassword        | the PostgreSQL primary user password, when specified, it will be stored in the secret holding the primary user credentials, if not specified the value will be generated
 |Cluster.User        | the PostgreSQL normal user name
 |Cluster.Password        | the PostgreSQL normal user password, when specified, it will be stored in the secret holding the normal user credentials, if not specified the value will be generated
 |Cluster.RootPassword        | the PostgreSQL *postgres* user password, when specified, it will be stored in the secret holding the root user credentials, if not specified the value will be generated
@@ -90,11 +88,11 @@ Values in the pgo configuration file have the following meaning:
 |Cluster.Policies        | optional, list of policies to apply to a newly created cluster, comma separated, must be valid policies in the catalog
 |Cluster.PasswordAgeDays        | optional, if set, will set the VALID UNTIL date on passwords to this many days in the future when creating users or setting passwords, defaults to 365 days
 |Cluster.PasswordLength        | optional, if set, will determine the password length used when creating passwords, defaults to 8
-|PrimaryStorage.Name        |for the master PostgreSQL deployment, if set, the PVC to use for created databases, used when the storage type is *existing*
-|PrimaryStorage.StorageClass        |for the master PostgreSQL deployment, for a dynamic storage type, you can specify the storage class used for storage provisioning(e.g. standard, gold, fast)
-|PrimaryStorage.AccessMode        |for the master PostgreSQL deployment, the access mode for new PVCs (e.g. ReadWriteMany, ReadWriteOnce, ReadOnlyMany). See below for descriptions of these.
-|PrimaryStorage.Size        |for the master PostgreSQL deployment, the size to use when creating new PVCs (e.g. 100M, 1Gi)
-|PrimaryStorage.StorageType        |for the master PostgreSQL deployment, supported values are either *dynamic*, *existing*, *create*, or *emptydir*, if not supplied, *emptydir* is used
+|PrimaryStorage.Name        |for the primary PostgreSQL deployment, if set, the PVC to use for created databases, used when the storage type is *existing*
+|PrimaryStorage.StorageClass        |for the primary PostgreSQL deployment, for a dynamic storage type, you can specify the storage class used for storage provisioning(e.g. standard, gold, fast)
+|PrimaryStorage.AccessMode        |for the primary PostgreSQL deployment, the access mode for new PVCs (e.g. ReadWriteMany, ReadWriteOnce, ReadOnlyMany). See below for descriptions of these.
+|PrimaryStorage.Size        |for the primary PostgreSQL deployment, the size to use when creating new PVCs (e.g. 100M, 1Gi)
+|PrimaryStorage.StorageType        |for the primary PostgreSQL deployment, supported values are either *dynamic*, *existing*, *create*, or *emptydir*, if not supplied, *emptydir* is used
 |PrimaryStorage.Fsgroup        | optional, if set, will cause a *SecurityContext* and *fsGroup* attributes to be added to generated Pod and Deployment definitions
 |PrimaryStorage.SupplementalGroups        | optional, if set, will cause a SecurityContext to be added to generated Pod and Deployment definitions
 |ReplicaStorage.Name        |for the replica PostgreSQL deployments, if set, the PVC to use for created databases, used when the storage type is *existing*
diff --git a/pgo/cmd/cluster.go b/pgo/cmd/cluster.go
@@ -270,13 +270,12 @@ func getClusterParams(name string) *crv1.Pgcluster {
 	spec.BackupPath = ""
 	spec.BackupPVCName = ""
 	spec.PrimaryHost = name
-	spec.PrimaryUser = "primary"
 	if PoliciesFlag == "" {
 		spec.Policies = viper.GetString("Cluster.Policies")
 	} else {
 		spec.Policies = PoliciesFlag
 	}
-	spec.PrimaryPassword = viper.GetString("Cluster.PgPrimaryPassword")
+	spec.PrimaryPassword = viper.GetString("Cluster.PrimaryPassword")
 	spec.User = "testuser"
 	spec.Password = viper.GetString("Cluster.Password")
 	spec.Database = "userdb"
@@ -291,10 +290,6 @@ func getClusterParams(name string) *crv1.Pgcluster {
 	if str != "" {
 		spec.Port = str
 	}
-	str = viper.GetString("Cluster.PrimaryUser")
-	if str != "" {
-		spec.PrimaryUser = str
-	}
 	str = viper.GetString("Cluster.User")
 	if str != "" {
 		spec.User = str
diff --git a/util/secrets.go b/util/secrets.go
@@ -51,13 +51,13 @@ func CreateDatabaseSecrets(clientset *kubernetes.Clientset, restclient *rest.RES
 	}
 
 	cl.Spec.RootSecretName = secretName
-	err = Patch(restclient, "/spec/pgrootsecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)
+	err = Patch(restclient, "/spec/rootsecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)
 	if err != nil {
 		log.Error("error patching cluster" + err.Error())
 	}
 
-	///pgprimary
-	username = "primary"
+	///primary
+	username = "primaryuser"
 	suffix = crv1.PrimarySecretSuffix
 
 	secretName = cl.Spec.Name + suffix
@@ -67,7 +67,7 @@ func CreateDatabaseSecrets(clientset *kubernetes.Clientset, restclient *rest.RES
 	}
 
 	cl.Spec.PrimarySecretName = secretName
-	err = Patch(restclient, "/spec/pgprimarysecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)
+	err = Patch(restclient, "/spec/primarysecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)
 	if err != nil {
 		log.Error("error patching cluster " + err.Error())
 	}
@@ -83,7 +83,7 @@ func CreateDatabaseSecrets(clientset *kubernetes.Clientset, restclient *rest.RES
 	}
 
 	cl.Spec.UserSecretName = secretName
-	err = Patch(restclient, "/spec/pgusersecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)
+	err = Patch(restclient, "/spec/usersecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)
 	if err != nil {
 		log.Error("error patching cluster " + err.Error())
 	}

Original file line number	Diff line number	Diff line change
`@@ -2,19 +2,19 @@`
`2`	`2`	`"kind": "PersistentVolumeClaim",`
`3`	`3`	`"apiVersion": "v1",`
`4`	`4`	`"metadata": {`
`5`		`- "name": "{{.PVCName}}",`
	`5`	`+ "name": "{{.Name}}",`
`6`	`6`	`"labels": {`
`7`	`7`	`"pgremove": "true"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`"spec": {`
`11`	`11`	`"accessModes": [`
`12`		`- "{{.PVCAccessMode}}"`
	`12`	`+ "{{.AccessMode}}"`
`13`	`13`	`],`
`14`	`14`	`"storageClassName": "{{.StorageClass}}",`
`15`	`15`	`"resources": {`
`16`	`16`	`"requests": {`
`17`		`- "storage": "{{.PVCSize}}"`
	`17`	`+ "storage": "{{.Size}}"`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,18 +2,18 @@`
`2`	`2`	`"kind": "PersistentVolumeClaim",`
`3`	`3`	`"apiVersion": "v1",`
`4`	`4`	`"metadata": {`
`5`		`- "name": "{{.PVCName}}",`
	`5`	`+ "name": "{{.Name}}",`
`6`	`6`	`"labels": {`
`7`	`7`	`"pgremove": "true"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`"spec": {`
`11`	`11`	`"accessModes": [`
`12`		`- "{{.PVCAccessMode}}"`
	`12`	`+ "{{.AccessMode}}"`
`13`	`13`	`],`
`14`	`14`	`"resources": {`
`15`	`15`	`"requests": {`
`16`		`- "storage": "{{.PVCSize}}"`
	`16`	`+ "storage": "{{.Size}}"`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,13 @@ func CreateDatabaseSecrets(clientset kubernetes.Clientset, restclient rest.RES`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`cl.Spec.RootSecretName = secretName`
`54`		`- err = Patch(restclient, "/spec/pgrootsecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)`
	`54`	`+ err = Patch(restclient, "/spec/rootsecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)`
`55`	`55`	`if err != nil {`
`56`	`56`	`log.Error("error patching cluster" + err.Error())`
`57`	`57`	`}`
`58`	`58`
`59`		`- ///pgprimary`
`60`		`- username = "primary"`
	`59`	`+ ///primary`
	`60`	`+ username = "primaryuser"`
`61`	`61`	`suffix = crv1.PrimarySecretSuffix`
`62`	`62`
`63`	`63`	`secretName = cl.Spec.Name + suffix`
`@@ -67,7 +67,7 @@ func CreateDatabaseSecrets(clientset kubernetes.Clientset, restclient rest.RES`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`cl.Spec.PrimarySecretName = secretName`
`70`		`- err = Patch(restclient, "/spec/pgprimarysecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)`
	`70`	`+ err = Patch(restclient, "/spec/primarysecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)`
`71`	`71`	`if err != nil {`
`72`	`72`	`log.Error("error patching cluster " + err.Error())`
`73`	`73`	`}`
`@@ -83,7 +83,7 @@ func CreateDatabaseSecrets(clientset kubernetes.Clientset, restclient rest.RES`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`cl.Spec.UserSecretName = secretName`
`86`		`- err = Patch(restclient, "/spec/pgusersecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)`
	`86`	`+ err = Patch(restclient, "/spec/usersecretname", secretName, crv1.PgclusterResourcePlural, cl.Spec.Name, namespace)`
`87`	`87`	`if err != nil {`
`88`	`88`	`log.Error("error patching cluster " + err.Error())`
`89`	`89`	`}`