Skip to content

Commit 8353913

Browse files
author
Jeff McCormick
committed
fix bug in pgo cluster, replace NamespaceDefault with Namespace from configuration
1 parent 578736e commit 8353913

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

README.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
= PostgreSQL Operator
2-
v2.0, {docdate}
2+
v2.0.1, {docdate}
33

44
== Table of Contents
55

docs/build.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= PostgreSQL Operator Build and Setup
22
:toc:
3-
v2.0.0, {docdate}
3+
v2.0.1, {docdate}
44

55
== Table of Contents
66

docs/config.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
= PostgreSQL Operator Configuration
2-
v2.0.0, {docdate}
2+
v2.0.1, {docdate}
33

44

55
This document describes the configuration options

docs/design.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
= postgres Operator Design
2-
v2.0, {docdate}
2+
v2.0.1, {docdate}
33

44
image::crunchy_logo.png?raw=true[]
55

docs/user-guide.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
= postgres Operator User Guide
2-
v2.0, {docdate}
2+
v2.0.1, {docdate}
33

44
This document is meant for users and demonstrates
55
the basic interface of the *pgo* command line interface.

pgo/cmd/cluster.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func showCluster(args []string) {
5252
log.Debugf("label selector is [%v]\n", myselector)
5353
err = RestClient.Get().
5454
Resource(crv1.PgclusterResourcePlural).
55-
Namespace(v1.NamespaceDefault).
55+
Namespace(Namespace).
5656
LabelsSelectorParam(myselector).
5757
Do().
5858
Into(&clusterList)
@@ -103,7 +103,7 @@ func showCluster(args []string) {
103103

104104
func listReplicaSets(name string) {
105105
lo := meta_v1.ListOptions{LabelSelector: "pg-cluster=" + name}
106-
reps, err := Clientset.ReplicaSets(v1.NamespaceDefault).List(lo)
106+
reps, err := Clientset.ReplicaSets(Namespace).List(lo)
107107
if err != nil {
108108
log.Error("error getting list of replicasets" + err.Error())
109109
return
@@ -115,7 +115,7 @@ func listReplicaSets(name string) {
115115
}
116116
func listDeployments(name string) {
117117
lo := meta_v1.ListOptions{LabelSelector: "pg-cluster=" + name}
118-
deployments, err := Clientset.ExtensionsV1beta1().Deployments(v1.NamespaceDefault).List(lo)
118+
deployments, err := Clientset.ExtensionsV1beta1().Deployments(Namespace).List(lo)
119119
if err != nil {
120120
log.Error("error getting list of deployments" + err.Error())
121121
return
@@ -141,7 +141,7 @@ func printPolicies(d *v1beta1.Deployment) {
141141

142142
func listPods(name string) {
143143
lo := meta_v1.ListOptions{LabelSelector: "pg-cluster=" + name}
144-
pods, err := Clientset.CoreV1().Pods(v1.NamespaceDefault).List(lo)
144+
pods, err := Clientset.CoreV1().Pods(Namespace).List(lo)
145145
if err != nil {
146146
log.Error("error getting list of pods" + err.Error())
147147
return
@@ -154,7 +154,7 @@ func listPods(name string) {
154154
}
155155
func listServices(name string) {
156156
lo := meta_v1.ListOptions{LabelSelector: "pg-cluster=" + name}
157-
services, err := Clientset.CoreV1().Services(v1.NamespaceDefault).List(lo)
157+
services, err := Clientset.CoreV1().Services(Namespace).List(lo)
158158
if err != nil {
159159
log.Error("error getting list of services" + err.Error())
160160
return
@@ -191,7 +191,7 @@ func createCluster(args []string) {
191191
// error if it already exists
192192
err = RestClient.Get().
193193
Resource(crv1.PgclusterResourcePlural).
194-
Namespace(v1.NamespaceDefault).
194+
Namespace(Namespace).
195195
Name(clusterName).
196196
Do().
197197
Into(&result)
@@ -222,7 +222,7 @@ func createCluster(args []string) {
222222

223223
err = RestClient.Post().
224224
Resource(crv1.PgclusterResourcePlural).
225-
Namespace(v1.NamespaceDefault).
225+
Namespace(Namespace).
226226
Body(newInstance).
227227
Do().Into(&result)
228228
if err != nil {
@@ -354,7 +354,7 @@ func deleteCluster(args []string) {
354354
//get the clusters list
355355
err = RestClient.Get().
356356
Resource(crv1.PgclusterResourcePlural).
357-
Namespace(v1.NamespaceDefault).
357+
Namespace(Namespace).
358358
LabelsSelectorParam(myselector).
359359
Do().
360360
Into(&clusterList)
@@ -385,7 +385,7 @@ func deleteCluster(args []string) {
385385
clusterFound = true
386386
err := RestClient.Delete().
387387
Resource(crv1.PgclusterResourcePlural).
388-
Namespace(v1.NamespaceDefault).
388+
Namespace(Namespace).
389389
Name(arg).
390390
Do().
391391
Error()
@@ -482,7 +482,7 @@ func validateNodeName(nodeName string) error {
482482
func validateSecretFrom(secretname string) error {
483483
var err error
484484
lo := meta_v1.ListOptions{LabelSelector: "pg-database=" + secretname}
485-
secrets, err := Clientset.Core().Secrets(v1.NamespaceDefault).List(lo)
485+
secrets, err := Clientset.Core().Secrets(Namespace).List(lo)
486486
if err != nil {
487487
log.Error("error getting list of secrets" + err.Error())
488488
return err

0 commit comments

Comments
 (0)