chore(builder): upgrade k8s.io api version

Author: lijianguo

boot.go

@@ -18,7 +18,7 @@ import (
 	"github.com/drycc/builder/pkg/sys"
 	pkglog "github.com/drycc/pkg/log"
 	"github.com/kelseyhightower/envconfig"
-	kcl "k8s.io/kubernetes/pkg/client/unversioned"
+	"github.com/drycc/builder/pkg/k8s"
 )
 
 const (
@@ -68,22 +68,22 @@ func main() {
 					os.Exit(1)
 				}
 
-				kubeClient, err := kcl.NewInCluster()
+				kubeClient, err := k8s.NewInCluster()
 				if err != nil {
 					log.Printf("Error getting kubernetes client [%s]", err)
 					os.Exit(1)
 				}
 				log.Printf("Starting health check server on port %d", cnf.HealthSrvPort)
 				healthSrvCh := make(chan error)
 				go func() {
-					if err := healthsrv.Start(cnf, kubeClient.Namespaces(), storageDriver, circ); err != nil {
+					if err := healthsrv.Start(cnf, kubeClient.CoreV1().Namespaces(), storageDriver, circ); err != nil {
 						healthSrvCh <- err
 					}
 				}()
 				log.Printf("Starting deleted app cleaner")
 				cleanerErrCh := make(chan error)
 				go func() {
-					if err := cleaner.Run(gitHomeDir, kubeClient.Namespaces(), fs, cnf.CleanerPollSleepDuration(), storageDriver); err != nil {
+					if err := cleaner.Run(gitHomeDir, kubeClient.CoreV1().Namespaces(), fs, cnf.CleanerPollSleepDuration(), storageDriver); err != nil {
 						cleanerErrCh <- err
 					}
 				}()

go.mod

@@ -3,48 +3,22 @@ module github.com/drycc/builder
 go 1.13
 
 require (
-	github.com/Azure/azure-sdk-for-go v35.0.0+incompatible // indirect
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/Sirupsen/logrus v0.7.3 // indirect
+	github.com/Sirupsen/logrus v0.0.0-00010101000000-000000000000 // indirect
 	github.com/arschles/assert v0.0.0-20150820224400-6882f85ccdc7
 	github.com/aws/aws-sdk-go v1.28.2
-	github.com/blang/semver v3.5.0+incompatible // indirect
 	github.com/codegangsta/cli v1.9.0
-	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
 	github.com/docker/distribution v0.0.0-00010101000000-000000000000
-	github.com/docker/docker v1.4.2-0.20150722082610-0f5c9d301b9b // indirect
-	github.com/docker/go-units v0.4.0 // indirect
 	github.com/drycc/controller-sdk-go v0.0.0-20190417134318-39a6c81f21f3
 	github.com/drycc/pkg v0.0.0-20190121053802-5c1dfa7b5446
-	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-ini/ini v1.8.6 // indirect
-	github.com/google/cadvisor v0.35.0 // indirect
-	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/gorilla/context v1.1.1 // indirect
-	github.com/gorilla/mux v1.7.0 // indirect
-	github.com/goware/urlx v0.0.0-20160722204212-8bb4a2e4339f // indirect
-	github.com/juju/ratelimit v0.0.0-20151125201925-77ed1c8a0121 // indirect
+	github.com/gorilla/mux v1.7.4 // indirect
+	github.com/goware/urlx v0.3.1 // indirect
 	github.com/kelseyhightower/envconfig v1.2.0
-	github.com/mitchellh/mapstructure v1.1.2 // indirect
-	github.com/ncw/swift v1.0.20-0.20151102203822-c54732e87b0b // indirect
-	github.com/opencontainers/runc v0.0.7
-	github.com/opencontainers/runtime-spec v1.0.2 // indirect
 	github.com/pborman/uuid v1.2.0
-	github.com/prometheus/client_golang v1.0.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/ugorji/go v0.0.0-20160211161415-f4485b318aad // indirect
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
-	golang.org/x/tools v0.0.0-20200725200936-102e7d357031 // indirect
-	google.golang.org/api v0.6.1-0.20190607001116-5213b8090861 // indirect
-	google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8 // indirect
-	google.golang.org/grpc v1.26.0 // indirect
+	golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
 	gopkg.in/yaml.v2 v2.2.8
-	k8s.io/kubernetes v1.2.4
-	speter.net/go/exp/math/dec/inf v0.0.0-00010101000000-000000000000 // indirect
+	k8s.io/api v0.18.6
+	k8s.io/apimachinery v0.18.6
+	k8s.io/client-go v0.18.6
 )
 
 replace (

go.sum

@@ -9,16 +9,19 @@ import (
 	"regexp"
 	"strings"
 	"time"
+	"context"
 
-	"github.com/docker/distribution/context"
+	//"github.com/docker/distribution/context"
 	storagedriver "github.com/docker/distribution/registry/storage/driver"
 	"github.com/drycc/builder/pkg/gitreceive"
 	"github.com/drycc/builder/pkg/k8s"
 	"github.com/drycc/builder/pkg/sys"
 	"github.com/drycc/pkg/log"
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/labels"
+	corev1 "k8s.io/api/core/v1"
+	//"k8s.io/apimachinery/pkg/labels"
+	//"k8s.io/apimachinery/pkg/fields"
+	//"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
@@ -46,7 +49,7 @@ func localDirs(gitHome string, filter func(string) bool) ([]string, error) {
 }
 
 // getDiff gets the directories that are not in namespaceList
-func getDiff(namespaceList []api.Namespace, dirs []string) []string {
+func getDiff(namespaceList []corev1.Namespace, dirs []string) []string {
 	var ret []string
 
 	// create a set of lowercase namespace names
@@ -123,7 +126,7 @@ func deleteFromObjectStore(app string, storageDriver storagedriver.StorageDriver
 // On any error, it uses log messages to output a human readable description of what happened.
 func Run(gitHome string, nsLister k8s.NamespaceLister, fs sys.FS, pollSleepDuration time.Duration, storageDriver storagedriver.StorageDriver) error {
 	for {
-		nsList, err := nsLister.List(api.ListOptions{LabelSelector: labels.Everything(), FieldSelector: fields.Everything()})
+		nsList, err := nsLister.List(context.TODO(), metav1.ListOptions{})
 		if err != nil {
 			log.Err("Cleaner error listing namespaces (%s)", err)
 			continue

pkg/cleaner/cleaner.go

@@ -7,13 +7,14 @@ import (
 	"testing"
 
 	"github.com/arschles/assert"
-	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestGetDiff(t *testing.T) {
-	nsList := []api.Namespace{
-		{ObjectMeta: api.ObjectMeta{Name: "app1"}},
-		{ObjectMeta: api.ObjectMeta{Name: "app2"}},
+	nsList := []v1.Namespace{
+		{ObjectMeta: metav1.ObjectMeta{Name: "app1"}},
+		{ObjectMeta: metav1.ObjectMeta{Name: "app2"}},
 	}
 	dirList := []string{"app1", "app3"}
 	diff := getDiff(nsList, dirList)

pkg/cleaner/cleaner_test.go

@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	ctx "context"
 
 	"github.com/docker/distribution/context"
 	storagedriver "github.com/docker/distribution/registry/storage/driver"
@@ -22,8 +23,9 @@ import (
 	"github.com/drycc/controller-sdk-go/hooks"
 	"github.com/drycc/pkg/log"
 	"gopkg.in/yaml.v2"
-	"k8s.io/kubernetes/pkg/api"
-	client "k8s.io/kubernetes/pkg/client/unversioned"
+	"k8s.io/client-go/kubernetes"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // repoCmd returns exec.Command(first, others...) with its current working directory repoDir
@@ -48,7 +50,8 @@ func run(cmd *exec.Cmd) error {
 func build(
 	conf *Config,
 	storageDriver storagedriver.StorageDriver,
-	kubeClient *client.Client,
+	//kubeClient *client.Client,
+	kubeClient *kubernetes.Clientset,
 	fs sys.FS,
 	env sys.Env,
 	builderKey,
@@ -146,7 +149,7 @@ func build(
 		return fmt.Errorf("uploading %s to %s (%v)", absAppTgz, slugBuilderInfo.TarKey(), err)
 	}
 
-	var pod *api.Pod
+	var pod *corev1.Pod
 	var buildPodName string
 	image := appName
 
@@ -160,7 +163,7 @@ func build(
 		registryLocation := conf.RegistryLocation
 		registryEnv := make(map[string]string)
 		if registryLocation != "on-cluster" {
-			registryEnv, err = getRegistryDetails(kubeClient, &image, registryLocation, conf.PodNamespace)
+			registryEnv, err = getRegistryDetails(kubeClient.CoreV1(), &image, registryLocation, conf.PodNamespace)
 			if err != nil {
 				return fmt.Errorf("error getting private registry details %s", err)
 			}
@@ -192,12 +195,12 @@ func build(
 			cacheKey = slugBuilderInfo.CacheKey()
 		}
 		envSecretName := fmt.Sprintf("%s-build-env", appName)
-		err = createAppEnvConfigSecret(kubeClient.Secrets(conf.PodNamespace), envSecretName, appConf.Values)
+		err = createAppEnvConfigSecret(kubeClient.CoreV1().Secrets(conf.PodNamespace), envSecretName, appConf.Values)
 		if err != nil {
 			return fmt.Errorf("error creating/updating secret %s: (%s)", envSecretName, err)
 		}
 		defer func() {
-			if err := kubeClient.Secrets(conf.PodNamespace).Delete(envSecretName); err != nil {
+			if err := kubeClient.CoreV1().Secrets(conf.PodNamespace).Delete(ctx.TODO(), envSecretName, metav1.DeleteOptions{}); err != nil {
 				log.Info("unable to delete secret %s (%s)", envSecretName, err)
 			}
 		}()
@@ -227,14 +230,14 @@ func build(
 		log.Debug("Error creating json representation of pod spec: %v", err)
 	}
 
-	podsInterface := kubeClient.Pods(conf.PodNamespace)
+	podsInterface := kubeClient.CoreV1().Pods(conf.PodNamespace)
 
-	newPod, err := podsInterface.Create(pod)
+	newPod, err := podsInterface.Create(ctx.TODO(), pod, metav1.CreateOptions{})
 	if err != nil {
 		return fmt.Errorf("creating builder pod (%s)", err)
 	}
 
-	pw := k8s.NewPodWatcher(kubeClient, conf.PodNamespace)
+	pw := k8s.NewPodWatcher(*kubeClient, conf.PodNamespace)
 	stopCh := make(chan struct{})
 	defer close(stopCh)
 	go pw.Controller.Run(stopCh)
@@ -243,12 +246,12 @@ func build(
 		return fmt.Errorf("watching events for builder pod startup (%s)", err)
 	}
 
-	req := kubeClient.Get().Namespace(newPod.Namespace).Name(newPod.Name).Resource("pods").SubResource("log").VersionedParams(
-		&api.PodLogOptions{
+	req := kubeClient.CoreV1().RESTClient().Get().Namespace(newPod.Namespace).Name(newPod.Name).Resource("pods").SubResource("log").VersionedParams(
+		&corev1.PodLogOptions{
 			Follow: true,
-		}, api.ParameterCodec)
+		}, metav1.ParameterCodec)
 
-	rc, err := req.Stream()
+	rc, err := req.Stream(ctx.TODO())
 	if err != nil {
 		return fmt.Errorf("attempting to stream logs (%s)", err)
 	}
@@ -274,7 +277,7 @@ func build(
 	}
 	log.Debug("Done")
 	log.Debug("Checking for builder pod exit code")
-	buildPod, err := kubeClient.Pods(newPod.Namespace).Get(newPod.Name)
+	buildPod, err := kubeClient.CoreV1().Pods(newPod.Namespace).Get(ctx.TODO(), newPod.Name, metav1.GetOptions{})
 	if err != nil {
 		return fmt.Errorf("error getting builder pod status (%s)", err)
 	}