Skip to content

Commit 411e384

Browse files
aduongaduong
committed
Fix golang-examples/
The examples were referring to packages that didn't exist and so could not be built. Notably, there seemed to be confusion between usages of client-go and apimachinery. Commented imports were also removed and goimports was run on the files.
1 parent 2bae209 commit 411e384

14 files changed

+61
-87
lines changed

‎golang-examples/addlabel.go

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
11
package main
22

33
import (
4+
"encoding/json"
45
"flag"
56
"fmt"
6-
jsonpatch "github.com/evanphx/json-patch"
7-
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
87

9-
"k8s.io/client-go/kubernetes"
10-
//"k8s.io/client-go/pkg/api"
11-
"k8s.io/apimachinery/pkg/types"
12-
//"k8s.io/client-go/pkg/api/errors"
13-
"encoding/json"
8+
"github.com/evanphx/json-patch"
149
"k8s.io/api/extensions/v1beta1"
15-
//"k8s.io/client-go/pkg/runtime"
16-
//"k8s.io/client-go/pkg/runtime/serializer"
17-
18-
//"k8s.io/client-go/pkg/api/unversioned"
19-
//"k8s.io/client-go/pkg/api/v1"
20-
//"k8s.io/client-go/rest"
2110
"k8s.io/apimachinery/pkg/api/meta"
22-
11+
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
12+
"k8s.io/apimachinery/pkg/types"
13+
"k8s.io/client-go/kubernetes"
2314
"k8s.io/client-go/tools/clientcmd"
2415
)
2516

‎golang-examples/addlabeltopod.go

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,16 @@
11
package main
22

33
import (
4+
"encoding/json"
45
"flag"
56
"fmt"
6-
jsonpatch "github.com/evanphx/json-patch"
7-
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
87

9-
"k8s.io/client-go/kubernetes"
10-
//"k8s.io/client-go/pkg/api"
11-
"k8s.io/apimachinery/pkg/types"
12-
//"k8s.io/client-go/pkg/api/errors"
13-
"encoding/json"
14-
//"k8s.io/api/extensions/v1beta1"
8+
"github.com/evanphx/json-patch"
159
"k8s.io/api/core/v1"
16-
17-
//"k8s.io/client-go/pkg/runtime"
18-
//"k8s.io/client-go/pkg/runtime/serializer"
19-
20-
//"k8s.io/client-go/pkg/api/unversioned"
21-
//"k8s.io/client-go/pkg/api/v1"
22-
//"k8s.io/client-go/rest"
2310
"k8s.io/apimachinery/pkg/api/meta"
24-
11+
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
12+
"k8s.io/apimachinery/pkg/types"
13+
"k8s.io/client-go/kubernetes"
2514
"k8s.io/client-go/tools/clientcmd"
2615
)
2716

‎golang-examples/addreplica.go

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
package main
22

3-
import "fmt"
4-
import "flag"
5-
import "encoding/json"
6-
import log "github.com/Sirupsen/logrus"
3+
import (
4+
"encoding/json"
5+
"flag"
6+
"fmt"
77

8-
//import "k8s.io/client-go/pkg/api/v1"
9-
10-
//import "github.com/crunchydata/postgres-operator/operator/util"
11-
import "k8s.io/client-go/tools/clientcmd"
12-
import "k8s.io/client-go/kubernetes"
13-
14-
//import v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
15-
import api "k8s.io/client-go/pkg/api"
8+
log "github.com/Sirupsen/logrus"
9+
"k8s.io/apimachinery/pkg/types"
10+
"k8s.io/client-go/kubernetes"
11+
"k8s.io/client-go/tools/clientcmd"
12+
)
1613

1714
type ThingSpec struct {
1815
Op string `json:"op"`
@@ -51,7 +48,7 @@ func main() {
5148
}
5249
log.Debug(string(patchBytes))
5350

54-
_, err = clientset.Deployments("default").Patch(deploymentName, api.JSONPatchType, patchBytes)
51+
_, err = clientset.AppsV1beta1().Deployments("default").Patch(deploymentName, types.JSONPatchType, patchBytes)
5552
if err != nil {
5653
log.Error("error creating master Deployment " + err.Error())
5754
panic(err.Error())

‎golang-examples/config.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ package main
22

33
import (
44
"encoding/json"
5-
log "github.com/Sirupsen/logrus"
65
"io/ioutil"
76
"os"
7+
8+
log "github.com/Sirupsen/logrus"
89
)
910

1011
type ContainerResource struct {

‎golang-examples/crdread.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"flag"
5+
56
log "github.com/Sirupsen/logrus"
67
crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
78
clientset "github.com/crunchydata/postgres-operator/client"

‎golang-examples/createsecret.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,8 @@ import (
2020
"flag"
2121
"fmt"
2222

23+
"k8s.io/api/core/v1"
2324
"k8s.io/client-go/kubernetes"
24-
//"k8s.io/client-go/pkg/api"
25-
//"k8s.io/client-go/pkg/api/errors"
26-
27-
//"k8s.io/client-go/pkg/runtime"
28-
//"k8s.io/client-go/pkg/runtime/serializer"
29-
30-
//"k8s.io/client-go/pkg/api/unversioned"
31-
"k8s.io/client-go/pkg/api/v1"
32-
//"k8s.io/client-go/rest"
3325
"k8s.io/client-go/tools/clientcmd"
3426
)
3527

@@ -58,7 +50,7 @@ func main() {
5850
secret.Data["username"] = []byte("testuser")
5951
secret.Data["password"] = []byte("mypassword")
6052

61-
_, err = clientset.Secrets(namespace).Create(&secret)
53+
_, err = clientset.CoreV1().Secrets(namespace).Create(&secret)
6254
if err != nil {
6355
fmt.Println(err.Error())
6456
} else {

‎golang-examples/dfcalc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package main
1818

1919
import (
2020
"fmt"
21+
2122
"k8s.io/apimachinery/pkg/api/resource"
2223
)
2324

‎golang-examples/exec.go

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,17 @@ import (
44
"bytes"
55
"flag"
66
"fmt"
7-
"github.com/gorilla/websocket"
87
"io"
9-
//"io/ioutil"
10-
"k8s.io/client-go/kubernetes"
11-
"k8s.io/client-go/pkg/api"
128
"net/http"
139
"net/url"
14-
//"k8s.io/client-go/pkg/api/errors"
15-
16-
"k8s.io/client-go/pkg/runtime"
17-
"k8s.io/client-go/pkg/runtime/serializer"
1810

19-
"k8s.io/client-go/pkg/api/unversioned"
20-
//"k8s.io/client-go/pkg/api/v1"
11+
"github.com/gorilla/websocket"
12+
"k8s.io/apimachinery/pkg/apis/meta/v1"
13+
"k8s.io/apimachinery/pkg/runtime"
14+
"k8s.io/apimachinery/pkg/runtime/schema"
15+
"k8s.io/apimachinery/pkg/runtime/serializer"
16+
"k8s.io/client-go/kubernetes"
17+
"k8s.io/client-go/kubernetes/scheme"
2118
"k8s.io/client-go/rest"
2219
"k8s.io/client-go/tools/clientcmd"
2320
)
@@ -103,26 +100,25 @@ func getCommandString(cmd string) string {
103100
}
104101

105102
func configureClient(config *rest.Config) {
106-
groupversion := unversioned.GroupVersion{
103+
groupversion := schema.GroupVersion{
107104
Group: "k8s.io",
108105
Version: "v1",
109106
}
110107

111108
config.GroupVersion = &groupversion
112-
//config.APIPath = "/apis"
113109
config.ContentType = runtime.ContentTypeJSON
114-
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs}
110+
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
115111

116112
schemeBuilder := runtime.NewSchemeBuilder(
117113
func(scheme *runtime.Scheme) error {
118114
scheme.AddKnownTypes(
119115
groupversion,
120-
&api.ListOptions{},
121-
&api.DeleteOptions{},
116+
&v1.ListOptions{},
117+
&v1.DeleteOptions{},
122118
)
123119
return nil
124120
})
125-
schemeBuilder.AddToScheme(api.Scheme)
121+
schemeBuilder.AddToScheme(scheme.Scheme)
126122
}
127123

128124
type RoundTripCallback func(conn *websocket.Conn, resp *http.Response, err error) error

‎golang-examples/failoverevent.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package main
22

33
import (
4-
log "github.com/Sirupsen/logrus"
54
"os"
65
"os/signal"
76
"sync"
87
"syscall"
98
"time"
9+
10+
log "github.com/Sirupsen/logrus"
1011
)
1112

1213
// StateMachine holds a state machine that is created when

‎golang-examples/gen-pgpool-pass.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ import (
2020
"crypto/md5"
2121
"encoding/hex"
2222
"fmt"
23-
"golang.org/x/crypto/ssh/terminal"
2423
"os"
2524
"strings"
25+
26+
"golang.org/x/crypto/ssh/terminal"
2627
)
2728

2829
func main() {

0 commit comments

Comments
 (0)