Skip to content

Commit 260bc50

Browse files
author
Jeff McCormick
committed
code cleanup
1 parent f463907 commit 260bc50

File tree

9 files changed

+81
-122
lines changed

9 files changed

+81
-122
lines changed

‎client/cmd/cluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func getClusterParams(name string) *tpr.PgCluster {
179179
PVC_SIZE: "100M",
180180
PVC_ACCESS_MODE: "ReadWriteMany",
181181
BACKUP_PATH: "",
182-
BACKUP_PVC_NAME: name + "-backup-pvc-empty",
182+
BACKUP_PVC_NAME: "",
183183
PG_MASTER_HOST: name,
184184
PG_MASTER_USER: "master",
185185
PG_MASTER_PASSWORD: "password",

‎client/cmd/create.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ func init() {
6767

6868
// Cobra supports Persistent Flags which will work for this command
6969
// and all subcommands, e.g.:
70-
//createCmd.PersistentFlags().String("from-pvc", "", "The PVC which contains a backup archive to restore from")
71-
//createCmd.PersistentFlags().String("from-backup", "", "The backup archive path to restore from")
7270

7371
// Cobra supports local flags which will only run when this command
7472
// is called directly, e.g.:

‎conf/postgres-operator/cluster/1/cluster-deployment-1.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@
8383
}
8484
}, {
8585
"name": "backup",
86-
"persistentVolumeClaim": {
87-
"claimName": "{{.BACKUP_PVC_NAME}}"
88-
}
86+
{{.BACKUP_PVC_NAME}}
8987
}, {
9088
"name": "pguser-volume",
9189
"secret": {

‎docs/user-guide.asciidoc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,12 @@ pgo show pvc crunchy-pvc
188188
In this example, the PVC is *crunchy-pvc*. This command is useful
189189
in some cases to examine what files are on a given PVC.
190190

191+
In the case where you want to list a specific path on a PVC
192+
you can specify the path option as follows:
193+
....
194+
pgo show pvc crunchy-pvc --pvc-root=mycluster-backups
195+
....
196+
191197
== Viewing Passwords
192198

193199
You can view the passwords used by the cluster as follows:

‎operator/backup/backupjob.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,13 @@ import (
1919
log "github.com/Sirupsen/logrus"
2020
"os"
2121

22-
//"github.com/crunchydata/postgres-operator/operator/database"
2322
"github.com/crunchydata/postgres-operator/operator/util"
2423
"github.com/crunchydata/postgres-operator/tpr"
25-
2624
"k8s.io/client-go/kubernetes"
27-
28-
//"k8s.io/client-go/pkg/api/errors"
2925
"k8s.io/client-go/pkg/api/v1"
3026
v1batch "k8s.io/client-go/pkg/apis/batch/v1"
31-
//"k8s.io/client-go/pkg/fields"
3227
"k8s.io/client-go/pkg/watch"
3328
"k8s.io/client-go/rest"
34-
//"k8s.io/client-go/tools/cache"
3529
)
3630

3731
func ProcessJobs(clientset *kubernetes.Clientset, tprclient *rest.RESTClient, stopchan chan struct{}, namespace string) {

‎operator/cluster/cluster.go‎

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -49,27 +49,22 @@ type ServiceTemplateFields struct {
4949
}
5050

5151
type DeploymentTemplateFields struct {
52-
Name string
53-
ClusterName string
54-
Port string
55-
CCP_IMAGE_TAG string
56-
// PG_MASTER_USER string
57-
// PG_MASTER_PASSWORD string
58-
// PG_USER string
59-
// PG_PASSWORD string
60-
PG_DATABASE string
61-
// PG_ROOT_PASSWORD string
52+
Name string
53+
ClusterName string
54+
Port string
55+
CCP_IMAGE_TAG string
56+
PG_DATABASE string
6257
PGDATA_PATH_OVERRIDE string
6358
PVC_NAME string
6459
BACKUP_PVC_NAME string
6560
BACKUP_PATH string
6661
PGROOT_SECRET_NAME string
6762
PGUSER_SECRET_NAME string
6863
PGMASTER_SECRET_NAME string
64+
SECURITY_CONTEXT string
6965
//next 2 are for the replica deployment only
70-
REPLICAS string
71-
PG_MASTER_HOST string
72-
SECURITY_CONTEXT string
66+
REPLICAS string
67+
PG_MASTER_HOST string
7368
}
7469

7570
const REPLICA_SUFFIX = "-replica"
@@ -141,19 +136,6 @@ func addCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, cl *tp
141136
}
142137
log.Info("created PVC =" + cl.Spec.PVC_NAME + " in namespace " + namespace)
143138
}
144-
log.Debug("creating PgCluster object strategy is [" + cl.Spec.STRATEGY + "]")
145-
if cl.Spec.BACKUP_PVC_NAME == cl.Spec.Name+"-backup-pvc-empty" {
146-
cl.Spec.BACKUP_PVC_NAME = cl.Spec.Name + "-backup-pvc-empty"
147-
log.Debug("BACKUP_PVC_NAME=%s PVC_SIZE=%s PVC_ACCESS_MODE=%s\n",
148-
cl.Spec.BACKUP_PVC_NAME, cl.Spec.PVC_ACCESS_MODE, cl.Spec.PVC_SIZE)
149-
err = pvc.Create(clientset, cl.Spec.BACKUP_PVC_NAME, cl.Spec.PVC_ACCESS_MODE, cl.Spec.PVC_SIZE, namespace)
150-
if err != nil {
151-
log.Error(err.Error())
152-
return
153-
}
154-
log.Info("created PVC =" + cl.Spec.BACKUP_PVC_NAME + " in namespace " + namespace)
155-
}
156-
157139
log.Debug("creating PgCluster object strategy is [" + cl.Spec.STRATEGY + "]")
158140

159141
err = util.CreateDatabaseSecrets(clientset, client, cl, namespace)
@@ -210,14 +192,7 @@ func deleteCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, cl
210192
}
211193
strategy.DeleteCluster(clientset, client, cl, namespace)
212194
util.DeleteDatabaseSecrets(clientset, cl.Spec.Name, namespace)
213-
//remove the backup PVC if exists
214-
pvcName := cl.Spec.Name + "-backup-pvc-empty"
215-
err := pvc.Delete(clientset, pvcName, namespace)
216-
if err != nil {
217-
log.Error("error deleting pvc " + pvcName)
218-
}
219-
//delete any upgrade for this cluster
220-
err = client.Delete().
195+
err := client.Delete().
221196
Resource("pgupgrades").
222197
Namespace(namespace).
223198
Name(cl.Spec.Name).

‎operator/cluster/cluster_strategy_1.go‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -119,20 +119,15 @@ func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *re
119119

120120
//create the master deployment
121121
deploymentFields := DeploymentTemplateFields{
122-
Name: cl.Spec.Name,
123-
ClusterName: cl.Spec.Name,
124-
Port: cl.Spec.Port,
125-
CCP_IMAGE_TAG: cl.Spec.CCP_IMAGE_TAG,
126-
PVC_NAME: cl.Spec.PVC_NAME,
127-
BACKUP_PVC_NAME: cl.Spec.BACKUP_PVC_NAME,
128-
BACKUP_PATH: cl.Spec.BACKUP_PATH,
129-
//PG_MASTER_USER: cl.Spec.PG_MASTER_USER,
130-
//PG_MASTER_PASSWORD: cl.Spec.PG_MASTER_PASSWORD,
122+
Name: cl.Spec.Name,
123+
ClusterName: cl.Spec.Name,
124+
Port: cl.Spec.Port,
125+
CCP_IMAGE_TAG: cl.Spec.CCP_IMAGE_TAG,
126+
PVC_NAME: cl.Spec.PVC_NAME,
127+
BACKUP_PVC_NAME: util.CreateBackupPVCSnippet(cl.Spec.BACKUP_PVC_NAME),
128+
BACKUP_PATH: cl.Spec.BACKUP_PATH,
131129
PGDATA_PATH_OVERRIDE: cl.Spec.Name,
132-
//PG_USER: cl.Spec.PG_USER,
133-
//PG_PASSWORD: cl.Spec.PG_PASSWORD,
134-
PG_DATABASE: cl.Spec.PG_DATABASE,
135-
//PG_ROOT_PASSWORD: cl.Spec.PG_ROOT_PASSWORD,
130+
PG_DATABASE: cl.Spec.PG_DATABASE,
136131
SECURITY_CONTEXT: util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
137132
PGROOT_SECRET_NAME: cl.Spec.PGROOT_SECRET_NAME,
138133
PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,
@@ -163,18 +158,13 @@ func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *re
163158

164159
//create the replica deployment
165160
replicaDeploymentFields := DeploymentTemplateFields{
166-
Name: cl.Spec.Name + REPLICA_SUFFIX,
167-
ClusterName: cl.Spec.Name,
168-
Port: cl.Spec.Port,
169-
CCP_IMAGE_TAG: cl.Spec.CCP_IMAGE_TAG,
170-
PVC_NAME: cl.Spec.PVC_NAME,
171-
PG_MASTER_HOST: cl.Spec.PG_MASTER_HOST,
172-
//PG_MASTER_USER: cl.Spec.PG_MASTER_USER,
173-
//PG_MASTER_PASSWORD: cl.Spec.PG_MASTER_PASSWORD,
174-
//PG_USER: cl.Spec.PG_USER,
175-
//PG_PASSWORD: cl.Spec.PG_PASSWORD,
176-
PG_DATABASE: cl.Spec.PG_DATABASE,
177-
//PG_ROOT_PASSWORD: cl.Spec.PG_ROOT_PASSWORD,
161+
Name: cl.Spec.Name + REPLICA_SUFFIX,
162+
ClusterName: cl.Spec.Name,
163+
Port: cl.Spec.Port,
164+
CCP_IMAGE_TAG: cl.Spec.CCP_IMAGE_TAG,
165+
PVC_NAME: cl.Spec.PVC_NAME,
166+
PG_MASTER_HOST: cl.Spec.PG_MASTER_HOST,
167+
PG_DATABASE: cl.Spec.PG_DATABASE,
178168
REPLICAS: cl.Spec.REPLICAS,
179169
SECURITY_CONTEXT: util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
180170
PGROOT_SECRET_NAME: cl.Spec.PGROOT_SECRET_NAME,

‎operator/cluster/upgrade_strategy_1.go‎

Lines changed: 31 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,18 @@ func (r ClusterStrategy1) MinorUpgrade(clientset *kubernetes.Clientset, tprclien
7272
//create the master deployment
7373

7474
deploymentFields := DeploymentTemplateFields{
75-
Name: cl.Spec.Name,
76-
ClusterName: cl.Spec.Name,
77-
Port: cl.Spec.Port,
78-
CCP_IMAGE_TAG: upgrade.Spec.CCP_IMAGE_TAG,
79-
PVC_NAME: cl.Spec.PVC_NAME,
80-
BACKUP_PVC_NAME: cl.Spec.BACKUP_PVC_NAME,
81-
//PG_MASTER_USER: cl.Spec.PG_MASTER_USER,
82-
//PG_MASTER_PASSWORD: cl.Spec.PG_MASTER_PASSWORD,
75+
Name: cl.Spec.Name,
76+
ClusterName: cl.Spec.Name,
77+
Port: cl.Spec.Port,
78+
CCP_IMAGE_TAG: upgrade.Spec.CCP_IMAGE_TAG,
79+
PVC_NAME: cl.Spec.PVC_NAME,
80+
BACKUP_PVC_NAME: util.CreateBackupPVCSnippet(cl.Spec.BACKUP_PVC_NAME),
8381
PGDATA_PATH_OVERRIDE: cl.Spec.Name,
84-
//PG_USER: cl.Spec.PG_USER,
8582
PGROOT_SECRET_NAME: cl.Spec.PGROOT_SECRET_NAME,
8683
PGUSER_SECRET_NAME: cl.Spec.PGUSER_SECRET_NAME,
8784
PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,
88-
//PG_PASSWORD: cl.Spec.PG_PASSWORD,
89-
PG_DATABASE: cl.Spec.PG_DATABASE,
90-
//PG_ROOT_PASSWORD: cl.Spec.PG_ROOT_PASSWORD,
91-
SECURITY_CONTEXT: util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
85+
PG_DATABASE: cl.Spec.PG_DATABASE,
86+
SECURITY_CONTEXT: util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
9287
}
9388

9489
err = DeploymentTemplate1.Execute(&masterDoc, deploymentFields)
@@ -115,23 +110,18 @@ func (r ClusterStrategy1) MinorUpgrade(clientset *kubernetes.Clientset, tprclien
115110

116111
//create the replica deployment
117112
replicaDeploymentFields := DeploymentTemplateFields{
118-
Name: replicaName,
119-
ClusterName: cl.Spec.Name,
120-
Port: cl.Spec.Port,
121-
CCP_IMAGE_TAG: upgrade.Spec.CCP_IMAGE_TAG,
122-
PVC_NAME: cl.Spec.PVC_NAME,
123-
PG_MASTER_HOST: cl.Spec.PG_MASTER_HOST,
124-
//PG_MASTER_USER: cl.Spec.PG_MASTER_USER,
125-
//PG_MASTER_PASSWORD: cl.Spec.PG_MASTER_PASSWORD,
126-
//PG_USER: cl.Spec.PG_USER,
127-
//PG_PASSWORD: cl.Spec.PG_PASSWORD,
113+
Name: replicaName,
114+
ClusterName: cl.Spec.Name,
115+
Port: cl.Spec.Port,
116+
CCP_IMAGE_TAG: upgrade.Spec.CCP_IMAGE_TAG,
117+
PVC_NAME: cl.Spec.PVC_NAME,
118+
PG_MASTER_HOST: cl.Spec.PG_MASTER_HOST,
128119
PG_DATABASE: cl.Spec.PG_DATABASE,
129120
PGROOT_SECRET_NAME: cl.Spec.PGROOT_SECRET_NAME,
130121
PGUSER_SECRET_NAME: cl.Spec.PGUSER_SECRET_NAME,
131122
PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,
132-
//PG_ROOT_PASSWORD: cl.Spec.PG_ROOT_PASSWORD,
133-
REPLICAS: cl.Spec.REPLICAS,
134-
SECURITY_CONTEXT: util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
123+
REPLICAS: cl.Spec.REPLICAS,
124+
SECURITY_CONTEXT: util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
135125
}
136126

137127
err = ReplicaDeploymentTemplate1.Execute(&replicaDoc, replicaDeploymentFields)
@@ -240,23 +230,18 @@ func (r ClusterStrategy1) MajorUpgradeFinalize(clientset *kubernetes.Clientset,
240230

241231
//start the master deployment
242232
deploymentFields := DeploymentTemplateFields{
243-
Name: cl.Spec.Name,
244-
ClusterName: cl.Spec.Name,
245-
Port: cl.Spec.Port,
246-
CCP_IMAGE_TAG: upgrade.Spec.CCP_IMAGE_TAG,
247-
PVC_NAME: upgrade.Spec.NEW_PVC_NAME,
248-
BACKUP_PVC_NAME: upgrade.Spec.BACKUP_PVC_NAME,
249-
//PG_MASTER_USER: cl.Spec.PG_MASTER_USER,
250-
//PG_MASTER_PASSWORD: cl.Spec.PG_MASTER_PASSWORD,
233+
Name: cl.Spec.Name,
234+
ClusterName: cl.Spec.Name,
235+
Port: cl.Spec.Port,
236+
CCP_IMAGE_TAG: upgrade.Spec.CCP_IMAGE_TAG,
237+
PVC_NAME: upgrade.Spec.NEW_PVC_NAME,
238+
BACKUP_PVC_NAME: util.CreateBackupPVCSnippet(upgrade.Spec.BACKUP_PVC_NAME),
251239
PGDATA_PATH_OVERRIDE: upgrade.Spec.NEW_DATABASE_NAME,
252-
//PG_USER: cl.Spec.PG_USER,
253-
//PG_PASSWORD: cl.Spec.PG_PASSWORD,
254240
PG_DATABASE: cl.Spec.PG_DATABASE,
255241
PGROOT_SECRET_NAME: cl.Spec.PGROOT_SECRET_NAME,
256242
PGUSER_SECRET_NAME: cl.Spec.PGUSER_SECRET_NAME,
257243
PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,
258-
//PG_ROOT_PASSWORD: cl.Spec.PG_ROOT_PASSWORD,
259-
SECURITY_CONTEXT: util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
244+
SECURITY_CONTEXT: util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
260245
}
261246

262247
err = DeploymentTemplate1.Execute(&masterDoc, deploymentFields)
@@ -284,23 +269,18 @@ func (r ClusterStrategy1) MajorUpgradeFinalize(clientset *kubernetes.Clientset,
284269
//start the replica deployment
285270

286271
replicaDeploymentFields := DeploymentTemplateFields{
287-
Name: cl.Spec.Name + REPLICA_SUFFIX,
288-
ClusterName: cl.Spec.Name,
289-
Port: cl.Spec.Port,
290-
CCP_IMAGE_TAG: upgrade.Spec.CCP_IMAGE_TAG,
291-
PVC_NAME: cl.Spec.PVC_NAME,
292-
PG_MASTER_HOST: cl.Spec.PG_MASTER_HOST,
293-
//PG_MASTER_USER: cl.Spec.PG_MASTER_USER,
294-
//PG_MASTER_PASSWORD: cl.Spec.PG_MASTER_PASSWORD,
295-
//PG_USER: cl.Spec.PG_USER,
296-
//PG_PASSWORD: cl.Spec.PG_PASSWORD,
272+
Name: cl.Spec.Name + REPLICA_SUFFIX,
273+
ClusterName: cl.Spec.Name,
274+
Port: cl.Spec.Port,
275+
CCP_IMAGE_TAG: upgrade.Spec.CCP_IMAGE_TAG,
276+
PVC_NAME: cl.Spec.PVC_NAME,
277+
PG_MASTER_HOST: cl.Spec.PG_MASTER_HOST,
297278
PG_DATABASE: cl.Spec.PG_DATABASE,
298279
PGROOT_SECRET_NAME: cl.Spec.PGROOT_SECRET_NAME,
299280
PGUSER_SECRET_NAME: cl.Spec.PGUSER_SECRET_NAME,
300281
PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,
301-
//PG_ROOT_PASSWORD: cl.Spec.PG_ROOT_PASSWORD,
302-
REPLICAS: cl.Spec.REPLICAS,
303-
SECURITY_CONTEXT: util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
282+
REPLICAS: cl.Spec.REPLICAS,
283+
SECURITY_CONTEXT: util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
304284
}
305285

306286
err = ReplicaDeploymentTemplate1.Execute(&replicaDoc, replicaDeploymentFields)

‎operator/util/util.go‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,21 @@ func DrainDeployment(clientset *kubernetes.Clientset, name string, namespace str
127127
return err
128128

129129
}
130+
131+
func CreateBackupPVCSnippet(BACKUP_PVC_NAME string) string {
132+
133+
var sc bytes.Buffer
134+
135+
if BACKUP_PVC_NAME != "" {
136+
sc.WriteString("\"persistentVolumeClaim\": {\n")
137+
sc.WriteString("\t \"claimName\": \"" + BACKUP_PVC_NAME + "\"")
138+
sc.WriteString("\n")
139+
} else {
140+
sc.WriteString("\"emptyDir\": {")
141+
sc.WriteString("\n")
142+
}
143+
144+
sc.WriteString("}")
145+
146+
return sc.String()
147+
}

0 commit comments

Comments
 (0)