code changes for 3.0 upgrade

Jeff McCormick · Jeff McCormick · commit cdf1e3956521 · 2017-08-06T16:19:06.000-05:00
diff --git a/client/cmd/backup.go b/client/cmd/backup.go
@@ -22,8 +22,8 @@ import (
 	"github.com/crunchydata/postgres-operator/tpr"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/api/v1"
 	"time"
 )
diff --git a/client/cmd/clone.go b/client/cmd/clone.go
@@ -20,8 +20,8 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/crunchydata/postgres-operator/tpr"
 	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/errors"
 	"time"
 )
 
diff --git a/client/cmd/cluster.go b/client/cmd/cluster.go
@@ -20,10 +20,10 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/crunchydata/postgres-operator/tpr"
 	"github.com/spf13/viper"
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/pkg/api"
-	kerrors "k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/apis/extensions/v1beta1"
-	"k8s.io/client-go/pkg/labels"
 
 	"k8s.io/client-go/pkg/api/v1"
 )
diff --git a/client/cmd/policy.go b/client/cmd/policy.go
@@ -21,8 +21,8 @@ import (
 	"github.com/crunchydata/postgres-operator/tpr"
 	"github.com/spf13/viper"
 	"io/ioutil"
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/pkg/api"
-	kerrors "k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/api/v1"
 	"os/user"
 	"strings"
diff --git a/client/cmd/pvc.go b/client/cmd/pvc.go
@@ -24,7 +24,7 @@ import (
 	"github.com/spf13/viper"
 	"io"
 	"io/ioutil"
-	"k8s.io/client-go/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/pkg/api/v1"
 	"strings"
 	"text/template"
diff --git a/client/cmd/root.go b/client/cmd/root.go
@@ -24,8 +24,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/resource"
 )
 
 var RED, GREEN func(a ...interface{}) string
diff --git a/client/cmd/upgrade.go b/client/cmd/upgrade.go
@@ -23,8 +23,8 @@ import (
 	"github.com/crunchydata/postgres-operator/tpr"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/pkg/api"
-	kerrors "k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/api/v1"
 	"strconv"
 	"strings"
diff --git a/client/cmd/util.go b/client/cmd/util.go
@@ -27,11 +27,10 @@ import (
 
 	//for TPR client
 	"github.com/crunchydata/postgres-operator/tpr"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/unversioned"
-	//"k8s.io/client-go/pkg/apis/extensions/v1beta1"
-	"k8s.io/client-go/pkg/runtime"
-	"k8s.io/client-go/pkg/runtime/serializer"
 )
 
 var Config *rest.Config
@@ -108,7 +107,7 @@ func ConnectToKube() {
 }
 
 func configureTPRClient(config *rest.Config) {
-	groupversion := unversioned.GroupVersion{
+	groupversion := schema.GroupVersion{
 		Group:   "crunchydata.com",
 		Version: "v1",
 	}
diff --git a/operator/cluster/clone.go b/operator/cluster/clone.go
@@ -29,8 +29,8 @@ import (
 
 	"k8s.io/client-go/kubernetes"
 
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/pkg/api"
-	kerrors "k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/api/v1"
 	//v1batch "k8s.io/client-go/pkg/apis/batch/v1"
 
diff --git a/operator/cluster/cluster_strategy_1.go b/operator/cluster/cluster_strategy_1.go
@@ -25,9 +25,9 @@ import (
 	"github.com/crunchydata/postgres-operator/operator/util"
 	"github.com/crunchydata/postgres-operator/tpr"
 	jsonpatch "github.com/evanphx/json-patch"
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/pkg/api"
-	kerrors "k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/api/meta"
 	"k8s.io/client-go/pkg/api/v1"
 	"strconv"
diff --git a/operator/cluster/policies.go b/operator/cluster/policies.go
@@ -19,8 +19,8 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/crunchydata/postgres-operator/operator/util"
 	"github.com/crunchydata/postgres-operator/tpr"
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes"
-	kerrors "k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/api/v1"
 	//"k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/pkg/fields"
diff --git a/operator/cluster/service.go b/operator/cluster/service.go
@@ -23,8 +23,8 @@ import (
 	"encoding/json"
 	log "github.com/Sirupsen/logrus"
 	"github.com/crunchydata/postgres-operator/operator/util"
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes"
-	kerrors "k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/api/v1"
 
 	"text/template"
diff --git a/operator/util/policy.go b/operator/util/policy.go
@@ -17,7 +17,7 @@ package util
 
 import (
 	"github.com/crunchydata/postgres-operator/tpr"
-	kerrors "k8s.io/client-go/pkg/api/errors"
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
 
 	log "github.com/Sirupsen/logrus"
 	"io/ioutil"
diff --git a/operator/util/secrets.go b/operator/util/secrets.go
@@ -19,8 +19,8 @@ import (
 	//"encoding/base64"
 	log "github.com/Sirupsen/logrus"
 	"github.com/crunchydata/postgres-operator/tpr"
+	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/rest"
 
 	"k8s.io/client-go/pkg/api/v1"
diff --git a/operator/util/waituntil.go b/operator/util/waituntil.go
@@ -17,9 +17,9 @@ package util
 
 import (
 	log "github.com/Sirupsen/logrus"
+	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/pkg/api/v1"
-	"k8s.io/client-go/pkg/watch"
 	"time"
 )
 
diff --git a/tpr/backup.go b/tpr/backup.go
@@ -20,9 +20,9 @@ package tpr
 
 import (
 	"encoding/json"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/meta"
-	"k8s.io/client-go/pkg/api/unversioned"
 )
 
 const BACKUP_RESOURCE = "pgbackups"
@@ -39,32 +39,32 @@ type PgBackupSpec struct {
 }
 
 type PgBackup struct {
-	unversioned.TypeMeta `json:",inline"`
-	Metadata             api.ObjectMeta `json:"metadata"`
+	metav1.TypeMeta `json:",inline"`
+	Metadata        api.ObjectMeta `json:"metadata"`
 
 	Spec PgBackupSpec `json:"spec"`
 }
 
 type PgBackupList struct {
-	unversioned.TypeMeta `json:",inline"`
-	Metadata             unversioned.ListMeta `json:"metadata"`
+	metav1.TypeMeta `json:",inline"`
+	Metadata        unversioned.ListMeta `json:"metadata"`
 
 	Items []PgBackup `json:"items"`
 }
 
-func (e *PgBackup) GetObjectKind() unversioned.ObjectKind {
+func (e *PgBackup) GetObjectKind() schema.ObjectKind {
 	return &e.TypeMeta
 }
 
-func (e *PgBackup) GetObjectMeta() meta.Object {
+func (e *PgBackup) GetObjectMeta() metav1.Object {
 	return &e.Metadata
 }
 
-func (el *PgBackupList) GetObjectKind() unversioned.ObjectKind {
+func (el *PgBackupList) GetObjectKind() schema.ObjectKind {
 	return &el.TypeMeta
 }
 
-func (el *PgBackupList) GetListMeta() unversioned.List {
+func (el *PgBackupList) GetListMeta() metav1.List {
 	return &el.Metadata
 }
 
diff --git a/tpr/clone.go b/tpr/clone.go
@@ -20,9 +20,9 @@ package tpr
 
 import (
 	"encoding/json"
-	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/meta"
-	"k8s.io/client-go/pkg/api/unversioned"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 const CLONE_RESOURCE = "pgclones"
@@ -34,32 +34,32 @@ type PgCloneSpec struct {
 }
 
 type PgClone struct {
-	unversioned.TypeMeta `json:",inline"`
-	Metadata             api.ObjectMeta `json:"metadata"`
+	metav1.TypeMeta `json:",inline"`
+	Metadata        metav1.ObjectMeta `json:"metadata"`
 
 	Spec PgCloneSpec `json:"spec"`
 }
 
 type PgCloneList struct {
-	unversioned.TypeMeta `json:",inline"`
-	Metadata             unversioned.ListMeta `json:"metadata"`
+	metav1.TypeMeta `json:",inline"`
+	Metadata        metav1.ListMeta `json:"metadata"`
 
 	Items []PgClone `json:"items"`
 }
 
-func (e *PgClone) GetObjectKind() unversioned.ObjectKind {
+func (e *PgClone) GetObjectKind() metav1.ObjectKind {
 	return &e.TypeMeta
 }
 
-func (e *PgClone) GetObjectMeta() meta.Object {
+func (e *PgClone) GetObjectMeta() schema.Object {
 	return &e.Metadata
 }
 
-func (el *PgCloneList) GetObjectKind() unversioned.ObjectKind {
+func (el *PgCloneList) GetObjectKind() schema.ObjectKind {
 	return &el.TypeMeta
 }
 
-func (el *PgCloneList) GetListMeta() unversioned.List {
+func (el *PgCloneList) GetListMeta() metav1.List {
 	return &el.Metadata
 }
 
diff --git a/tpr/cluster.go b/tpr/cluster.go
@@ -20,9 +20,8 @@ package tpr
 
 import (
 	"encoding/json"
-	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/meta"
-	"k8s.io/client-go/pkg/api/unversioned"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 const CLUSTER_RESOURCE = "pgclusters"
@@ -57,32 +56,32 @@ type PgClusterSpec struct {
 }
 
 type PgCluster struct {
-	unversioned.TypeMeta `json:",inline"`
-	Metadata             api.ObjectMeta `json:"metadata"`
+	metav1.TypeMeta `json:",inline"`
+	Metadata        metav1.ObjectMeta `json:"metadata"`
 
 	Spec PgClusterSpec `json:"spec"`
 }
 
 type PgClusterList struct {
-	unversioned.TypeMeta `json:",inline"`
-	Metadata             unversioned.ListMeta `json:"metadata"`
+	metav1.TypeMeta `json:",inline"`
+	Metadata        metav1.ListMeta `json:"metadata"`
 
 	Items []PgCluster `json:"items"`
 }
 
-func (e *PgCluster) GetObjectKind() unversioned.ObjectKind {
+func (e *PgCluster) GetObjectKind() schema.ObjectKind {
 	return &e.TypeMeta
 }
 
-func (e *PgCluster) GetObjectMeta() meta.Object {
+func (e *PgCluster) GetObjectMeta() metav1.Object {
 	return &e.Metadata
 }
 
-func (el *PgClusterList) GetObjectKind() unversioned.ObjectKind {
+func (el *PgClusterList) GetObjectKind() schema.ObjectKind {
 	return &el.TypeMeta
 }
 
-func (el *PgClusterList) GetListMeta() unversioned.List {
+func (el *PgClusterList) GetListMeta() metav1.List {
 	return &el.Metadata
 }
 
diff --git a/tpr/policy.go b/tpr/policy.go
@@ -20,9 +20,8 @@ package tpr
 
 import (
 	"encoding/json"
-	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/meta"
-	"k8s.io/client-go/pkg/api/unversioned"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 const POLICY_RESOURCE = "pgpolicies"
@@ -35,32 +34,32 @@ type PgPolicySpec struct {
 }
 
 type PgPolicy struct {
-	unversioned.TypeMeta `json:",inline"`
-	Metadata             api.ObjectMeta `json:"metadata"`
+	metav1.TypeMeta `json:",inline"`
+	Metadata        metav1.ObjectMeta `json:"metadata"`
 
 	Spec PgPolicySpec `json:"spec"`
 }
 
 type PgPolicyList struct {
-	unversioned.TypeMeta `json:",inline"`
-	Metadata             unversioned.ListMeta `json:"metadata"`
+	metav1.TypeMeta `json:",inline"`
+	Metadata        metav1.ListMeta `json:"metadata"`
 
 	Items []PgPolicy `json:"items"`
 }
 
-func (e *PgPolicy) GetObjectKind() unversioned.ObjectKind {
+func (e *PgPolicy) GetObjectKind() schema.ObjectKind {
 	return &e.TypeMeta
 }
 
-func (e *PgPolicy) GetObjectMeta() meta.Object {
+func (e *PgPolicy) GetObjectMeta() schema.Object {
 	return &e.Metadata
 }
 
-func (el *PgPolicyList) GetObjectKind() unversioned.ObjectKind {
+func (el *PgPolicyList) GetObjectKind() schema.ObjectKind {
 	return &el.TypeMeta
 }
 
-func (el *PgPolicyList) GetListMeta() unversioned.List {
+func (el *PgPolicyList) GetListMeta() metav1.List {
 	return &el.Metadata
 }
 
diff --git a/tpr/policylog.go b/tpr/policylog.go
diff --git a/tpr/upgrade.go b/tpr/upgrade.go
diff --git a/vendor/manifest b/vendor/manifest

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ import (`
`20`	`20`	`log "github.com/Sirupsen/logrus"`
`21`	`21`	`"github.com/crunchydata/postgres-operator/tpr"`
`22`	`22`	`"github.com/spf13/cobra"`
	`23`	`+ "k8s.io/apimachinery/pkg/api/errors"`
`23`	`24`	`"k8s.io/client-go/pkg/api"`
`24`		`- "k8s.io/client-go/pkg/api/errors"`
`25`	`25`	`"time"`
`26`	`26`	`)`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ import (`
`24`	`24`	`"github.com/spf13/cobra"`
`25`	`25`	`"github.com/spf13/viper"`
`26`	`26`
	`27`	`+ "k8s.io/apimachinery/pkg/api/resource"`
`27`	`28`	`"k8s.io/client-go/pkg/api"`
`28`		`- "k8s.io/client-go/pkg/api/resource"`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`var RED, GREEN func(a ...interface{}) string`