Skip to content

Commit 2cf5d09

Browse files
author
Jeff McCormick
committed
update code to client-go api 3.0.0 and change to godep
1 parent cdf1e39 commit 2cf5d09

28 files changed

+1026
-230
lines changed

‎Godeps/Godeps.json‎

Lines changed: 854 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/cmd/backup.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ import (
2323
"github.com/spf13/cobra"
2424
"github.com/spf13/viper"
2525
"k8s.io/apimachinery/pkg/api/errors"
26-
"k8s.io/client-go/pkg/api"
27-
"k8s.io/client-go/pkg/api/v1"
26+
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2827
"time"
2928
)
3029

@@ -57,9 +56,9 @@ func showBackup(args []string) {
5756
//pg-database=basic or
5857
//pgbackup=true
5958
if arg == "all" {
60-
lo := v1.ListOptions{LabelSelector: "pgbackup=true"}
59+
lo := meta_v1.ListOptions{LabelSelector: "pgbackup=true"}
6160
log.Debug("label selector is " + lo.LabelSelector)
62-
pods, err2 := Clientset.Core().Pods(Namespace).List(lo)
61+
pods, err2 := Clientset.CoreV1().Pods(Namespace).List(lo)
6362
if err2 != nil {
6463
log.Error(err2.Error())
6564
return
@@ -97,9 +96,9 @@ func showBackupInfo(name string) {
9796
}
9897

9998
//print the backup jobs if any exists
100-
lo := v1.ListOptions{LabelSelector: "pgbackup=true,pg-database=" + name}
99+
lo := meta_v1.ListOptions{LabelSelector: "pgbackup=true,pg-database=" + name}
101100
log.Debug("label selector is " + lo.LabelSelector)
102-
pods, err2 := Clientset.Core().Pods(Namespace).List(lo)
101+
pods, err2 := Clientset.CoreV1().Pods(Namespace).List(lo)
103102
if err2 != nil {
104103
log.Error(err2.Error())
105104
}
@@ -277,7 +276,7 @@ func getBackupParams(name string) (*tpr.PgBackup, error) {
277276
}
278277

279278
newInstance = &tpr.PgBackup{
280-
Metadata: api.ObjectMeta{
279+
Metadata: meta_v1.ObjectMeta{
281280
Name: name,
282281
},
283282
Spec: spec,

‎client/cmd/clone.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/crunchydata/postgres-operator/tpr"
2222
"github.com/spf13/cobra"
2323
"k8s.io/apimachinery/pkg/api/errors"
24-
"k8s.io/client-go/pkg/api"
24+
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"time"
2626
)
2727

@@ -91,7 +91,7 @@ func createClone(clusterName string) {
9191
spec.Status = ""
9292

9393
newInstance = &tpr.PgClone{
94-
Metadata: api.ObjectMeta{
94+
Metadata: meta_v1.ObjectMeta{
9595
Name: CloneName,
9696
},
9797
Spec: spec,

‎client/cmd/cluster.go‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ import (
2121
"github.com/crunchydata/postgres-operator/tpr"
2222
"github.com/spf13/viper"
2323
kerrors "k8s.io/apimachinery/pkg/api/errors"
24+
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2425
"k8s.io/apimachinery/pkg/labels"
25-
"k8s.io/client-go/pkg/api"
26-
"k8s.io/client-go/pkg/apis/extensions/v1beta1"
27-
2826
"k8s.io/client-go/pkg/api/v1"
27+
"k8s.io/client-go/pkg/apis/extensions/v1beta1"
2928
)
3029

3130
func showCluster(args []string) {
@@ -92,7 +91,7 @@ func showCluster(args []string) {
9291
}
9392

9493
func listReplicaSets(name string) {
95-
lo := v1.ListOptions{LabelSelector: "pg-cluster=" + name}
94+
lo := meta_v1.ListOptions{LabelSelector: "pg-cluster=" + name}
9695
reps, err := Clientset.ReplicaSets(Namespace).List(lo)
9796
if err != nil {
9897
log.Error("error getting list of replicasets" + err.Error())
@@ -104,8 +103,8 @@ func listReplicaSets(name string) {
104103

105104
}
106105
func listDeployments(name string) {
107-
lo := v1.ListOptions{LabelSelector: "pg-cluster=" + name}
108-
deployments, err := Clientset.Deployments(Namespace).List(lo)
106+
lo := meta_v1.ListOptions{LabelSelector: "pg-cluster=" + name}
107+
deployments, err := Clientset.ExtensionsV1beta1().Deployments(Namespace).List(lo)
109108
if err != nil {
110109
log.Error("error getting list of deployments" + err.Error())
111110
return
@@ -129,8 +128,8 @@ func printPolicies(d *v1beta1.Deployment) {
129128
}
130129

131130
func listPods(name string) {
132-
lo := v1.ListOptions{LabelSelector: "pg-cluster=" + name}
133-
pods, err := Clientset.Core().Pods(Namespace).List(lo)
131+
lo := meta_v1.ListOptions{LabelSelector: "pg-cluster=" + name}
132+
pods, err := Clientset.CoreV1().Pods(Namespace).List(lo)
134133
if err != nil {
135134
log.Error("error getting list of pods" + err.Error())
136135
return
@@ -142,8 +141,8 @@ func listPods(name string) {
142141

143142
}
144143
func listServices(name string) {
145-
lo := v1.ListOptions{LabelSelector: "pg-cluster=" + name}
146-
services, err := Clientset.Core().Services(Namespace).List(lo)
144+
lo := meta_v1.ListOptions{LabelSelector: "pg-cluster=" + name}
145+
services, err := Clientset.CoreV1().Services(Namespace).List(lo)
147146
if err != nil {
148147
log.Error("error getting list of services" + err.Error())
149148
return
@@ -305,7 +304,7 @@ func getClusterParams(name string) *tpr.PgCluster {
305304
}
306305

307306
newInstance := &tpr.PgCluster{
308-
Metadata: api.ObjectMeta{
307+
Metadata: meta_v1.ObjectMeta{
309308
Name: name,
310309
},
311310
Spec: spec,
@@ -365,7 +364,7 @@ func getReadyStatus(pod *v1.Pod) string {
365364

366365
func validateSecretFrom(secretname string) error {
367366
var err error
368-
lo := v1.ListOptions{LabelSelector: "pg-database=" + secretname}
367+
lo := meta_v1.ListOptions{LabelSelector: "pg-database=" + secretname}
369368
secrets, err := Clientset.Secrets(Namespace).List(lo)
370369
if err != nil {
371370
log.Error("error getting list of secrets" + err.Error())

‎client/cmd/policy.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import (
2222
"github.com/spf13/viper"
2323
"io/ioutil"
2424
kerrors "k8s.io/apimachinery/pkg/api/errors"
25-
"k8s.io/client-go/pkg/api"
26-
"k8s.io/client-go/pkg/api/v1"
25+
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2726
"os/user"
2827
"strings"
2928
)
@@ -133,7 +132,7 @@ func getPolicyParams(name string) (*tpr.PgPolicy, error) {
133132
}
134133

135134
newInstance := &tpr.PgPolicy{
136-
Metadata: api.ObjectMeta{
135+
Metadata: meta_v1.ObjectMeta{
137136
Name: name,
138137
},
139138
Spec: spec,
@@ -247,8 +246,8 @@ func applyPolicy(policies []string) {
247246
//get filtered list of Deployments
248247
sel := Selector + ",!replica"
249248
log.Debug("selector string=[" + sel + "]")
250-
lo := v1.ListOptions{LabelSelector: sel}
251-
deployments, err := Clientset.Deployments(Namespace).List(lo)
249+
lo := meta_v1.ListOptions{LabelSelector: sel}
250+
deployments, err := Clientset.ExtensionsV1beta1().Deployments(Namespace).List(lo)
252251
if err != nil {
253252
log.Error("error getting list of deployments" + err.Error())
254253
return
@@ -317,7 +316,7 @@ func getPolicylog(policyname, clustername string) (*tpr.PgPolicylog, error) {
317316
spec.ClusterName = clustername
318317

319318
newInstance := &tpr.PgPolicylog{
320-
Metadata: api.ObjectMeta{
319+
Metadata: meta_v1.ObjectMeta{
321320
Name: policyname + clustername,
322321
},
323322
Spec: spec,

‎client/cmd/pvc.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ import (
2525
"io"
2626
"io/ioutil"
2727
"k8s.io/apimachinery/pkg/api/errors"
28+
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2829
"k8s.io/client-go/pkg/api/v1"
30+
2931
"strings"
3032
"text/template"
3133
"time"
@@ -47,7 +49,7 @@ func printPVC(pvcName string) {
4749
var pvc *v1.PersistentVolumeClaim
4850
var err error
4951

50-
pvc, err = Clientset.Core().PersistentVolumeClaims(Namespace).Get(pvcName)
52+
pvc, err = Clientset.CoreV1().PersistentVolumeClaims(Namespace).Get(pvcName, meta_v1.GetOptions{})
5153
if err != nil {
5254
fmt.Printf("\nPVC %s\n", pvcName+" is not found")
5355
fmt.Println(err.Error())
@@ -67,15 +69,15 @@ func PrintPVCListing(pvcName string) {
6769
var podName = "lspvc-" + pvcName
6870

6971
//delete lspvc pod if it was not deleted for any reason prior
70-
_, err = Clientset.Core().Pods(Namespace).Get(podName)
72+
_, err = Clientset.CoreV1().Pods(Namespace).Get(podName, meta_v1.GetOptions{})
7173
if errors.IsNotFound(err) {
7274
//
7375
} else if err != nil {
7476
log.Error(err.Error())
7577
} else {
7678
log.Debug("deleting prior pod " + podName)
7779
err = Clientset.Core().Pods(Namespace).Delete(podName,
78-
&v1.DeleteOptions{})
80+
&meta_v1.DeleteOptions{})
7981
if err != nil {
8082
log.Error("delete pod error " + err.Error()) //TODO this is debug info
8183
}
@@ -125,15 +127,15 @@ func PrintPVCListing(pvcName string) {
125127
return
126128
}
127129
var resultPod *v1.Pod
128-
resultPod, err = Clientset.Core().Pods(Namespace).Create(&newpod)
130+
resultPod, err = Clientset.CoreV1().Pods(Namespace).Create(&newpod)
129131
if err != nil {
130132
log.Error("error creating lspvc Pod " + err.Error())
131133
return
132134
}
133135
log.Debug("created pod " + resultPod.Name)
134136

135137
timeout := time.Duration(6 * time.Second)
136-
lo := v1.ListOptions{LabelSelector: "name=lspvc,pvcname=" + pvcName}
138+
lo := meta_v1.ListOptions{LabelSelector: "name=lspvc,pvcname=" + pvcName}
137139
podPhase := v1.PodSucceeded
138140
err = util.WaitUntilPod(Clientset, lo, podPhase, timeout, Namespace)
139141
if err != nil {
@@ -144,7 +146,7 @@ func PrintPVCListing(pvcName string) {
144146

145147
//get lspvc pod output
146148
logOptions := v1.PodLogOptions{}
147-
req := Clientset.Core().Pods(Namespace).GetLogs(podName, &logOptions)
149+
req := Clientset.CoreV1().Pods(Namespace).GetLogs(podName, &logOptions)
148150
if req == nil {
149151
log.Debug("error in get logs for " + podName)
150152
} else {
@@ -183,8 +185,8 @@ func PrintPVCListing(pvcName string) {
183185
}
184186

185187
//delete lspvc pod
186-
err = Clientset.Core().Pods(Namespace).Delete(podName,
187-
&v1.DeleteOptions{})
188+
err = Clientset.CoreV1().Pods(Namespace).Delete(podName,
189+
&meta_v1.DeleteOptions{})
188190
if err != nil {
189191
log.Error(err.Error())
190192
log.Error("error deleting lspvc pod " + podName)

‎client/cmd/test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/crunchydata/postgres-operator/tpr"
2222
_ "github.com/lib/pq"
2323
"github.com/spf13/cobra"
24-
"k8s.io/client-go/pkg/api/v1"
24+
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
)
2626

2727
var testCmd = &cobra.Command{
@@ -86,14 +86,14 @@ func showTest(args []string) {
8686

8787
func testServices(cluster *tpr.PgCluster) {
8888

89-
lo := v1.ListOptions{LabelSelector: "pg-cluster=" + cluster.Spec.Name}
90-
services, err := Clientset.Core().Services(Namespace).List(lo)
89+
lo := meta_v1.ListOptions{LabelSelector: "pg-cluster=" + cluster.Spec.Name}
90+
services, err := Clientset.CoreV1().Services(Namespace).List(lo)
9191
if err != nil {
9292
log.Error("error getting list of services" + err.Error())
9393
return
9494
}
9595

96-
lo = v1.ListOptions{LabelSelector: "pg-database=" + cluster.Spec.Name}
96+
lo = meta_v1.ListOptions{LabelSelector: "pg-database=" + cluster.Spec.Name}
9797
secrets, err := Clientset.Secrets(Namespace).List(lo)
9898
if err != nil {
9999
log.Error("error getting list of secrets" + err.Error())

‎client/cmd/upgrade.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ import (
2424
"github.com/spf13/cobra"
2525
"github.com/spf13/viper"
2626
kerrors "k8s.io/apimachinery/pkg/api/errors"
27-
"k8s.io/client-go/pkg/api"
28-
"k8s.io/client-go/pkg/api/v1"
27+
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2928
"strconv"
3029
"strings"
3130
)
@@ -135,11 +134,11 @@ func showUpgradeItem(upgrade *tpr.PgUpgrade) {
135134
fmt.Printf("%s%s\n", TREE_TRUNK, "new_pvc_name : "+upgrade.Spec.NEW_PVC_NAME)
136135

137136
//print the upgrade jobs if any exists
138-
lo := v1.ListOptions{
137+
lo := meta_v1.ListOptions{
139138
LabelSelector: "pg-database=" + upgrade.Spec.Name + ",pgupgrade=true",
140139
}
141140
log.Debug("label selector is " + lo.LabelSelector)
142-
pods, err2 := Clientset.Core().Pods(Namespace).List(lo)
141+
pods, err2 := Clientset.CoreV1().Pods(Namespace).List(lo)
143142
if err2 != nil {
144143
log.Error(err2.Error())
145144
}
@@ -352,7 +351,7 @@ func getUpgradeParams(name string) (*tpr.PgUpgrade, error) {
352351
}
353352

354353
newInstance := &tpr.PgUpgrade{
355-
Metadata: api.ObjectMeta{
354+
Metadata: meta_v1.ObjectMeta{
356355
Name: name,
357356
},
358357
Spec: spec,

‎client/cmd/util.go‎

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

22+
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2223
"k8s.io/client-go/kubernetes"
23-
"k8s.io/client-go/pkg/api/v1"
2424
"k8s.io/client-go/rest"
2525
"k8s.io/client-go/tools/clientcmd"
2626
"os"
@@ -60,31 +60,31 @@ func ConnectToKube() {
6060

6161
//verify that the TPRs exist in the Kube
6262
//var tpr *v1beta1.ThirdPartyResource
63-
_, err = Clientset.Extensions().ThirdPartyResources().Get("pg-cluster.crunchydata.com")
63+
_, err = Clientset.Extensions().ThirdPartyResources().Get("pg-cluster.crunchydata.com", meta_v1.GetOptions{})
6464
if err != nil {
6565
log.Error(err.Error())
6666
log.Error("required pg-cluster.crunchydata.com TPR was not found on your kube cluster")
6767
os.Exit(2)
6868
}
69-
_, err = Clientset.Extensions().ThirdPartyResources().Get("pg-backup.crunchydata.com")
69+
_, err = Clientset.Extensions().ThirdPartyResources().Get("pg-backup.crunchydata.com", meta_v1.GetOptions{})
7070
if err != nil {
7171
log.Error(err.Error())
7272
log.Error("required pg-backup.crunchydata.com TPR was not found on your kube cluster")
7373
os.Exit(2)
7474
}
75-
_, err = Clientset.Extensions().ThirdPartyResources().Get("pg-upgrade.crunchydata.com")
75+
_, err = Clientset.Extensions().ThirdPartyResources().Get("pg-upgrade.crunchydata.com", meta_v1.GetOptions{})
7676
if err != nil {
7777
log.Error(err.Error())
7878
log.Error("required pg-upgrade.crunchydata.com TPR was not found on your kube cluster")
7979
os.Exit(2)
8080
}
81-
_, err = Clientset.Extensions().ThirdPartyResources().Get("pg-clone.crunchydata.com")
81+
_, err = Clientset.Extensions().ThirdPartyResources().Get("pg-clone.crunchydata.com", meta_v1.GetOptions{})
8282
if err != nil {
8383
log.Error(err.Error())
8484
log.Error("required pg-clone.crunchydata.com TPR was not found on your kube cluster")
8585
os.Exit(2)
8686
}
87-
_, err = Clientset.Extensions().ThirdPartyResources().Get("pg-policylog.crunchydata.com")
87+
_, err = Clientset.Extensions().ThirdPartyResources().Get("pg-policylog.crunchydata.com", meta_v1.GetOptions{})
8888
if err != nil {
8989
log.Error(err.Error())
9090
log.Error("required pg-policylog.crunchydata.com TPR was not found on your kube cluster")
@@ -143,7 +143,7 @@ func configureTPRClient(config *rest.Config) {
143143

144144
func PrintSecrets(db string) {
145145

146-
lo := v1.ListOptions{LabelSelector: "pg-database=" + db}
146+
lo := meta_v1.ListOptions{LabelSelector: "pg-database=" + db}
147147
secrets, err := Clientset.Secrets(Namespace).List(lo)
148148
if err != nil {
149149
log.Error("error getting list of secrets" + err.Error())
@@ -162,7 +162,7 @@ func PrintSecrets(db string) {
162162

163163
func GetMasterSecretPassword(db string) string {
164164

165-
lo := v1.ListOptions{LabelSelector: "pg-database=" + db}
165+
lo := meta_v1.ListOptions{LabelSelector: "pg-database=" + db}
166166
secrets, err := Clientset.Secrets(Namespace).List(lo)
167167
if err != nil {
168168
log.Error("error getting list of secrets" + err.Error())

‎docs/build.asciidoc‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
= PostgreSQL Operator Build and Setup
2-
v1.4, {docdate}
2+
v1.4.1, {docdate}
33

44
== Table of Contents
55

@@ -188,11 +188,15 @@ Install a golang compiler, this can be done with either
188188
your package manager or by following directions
189189
from https://golang.org/dl/
190190

191-
Then install the project library dependencies:
191+
Then install the project library dependencies, starting
192+
with version 1.4.1 the godep dependency manager is used
193+
as follows:
192194
....
193195
cd $COROOT
194-
go get -u github.com/FiloSottile/gvt
195-
gvt restore
196+
go get github.com/tools/godep
197+
godep restore
198+
go get github.com/spf13/cobra github.com/spf13/viper
199+
go get github.com/docker/docker/api github.com/docker/docker/client
196200
....
197201

198202
In a development environment you will likely want to create a

0 commit comments

Comments
 (0)