Merge pull request #383 from dims/keep-up-with-1.13-tags

Switch to Kubernetes 1.13.0 release

Gopkg.toml

@@ -31,7 +31,7 @@
 
 [[constraint]]
   branch = "master"
-  name = "github.com/golang/glog"
+  name = "k8s.io/klog"
 
 [[constraint]]
   branch = "master"
@@ -115,23 +115,23 @@
 
 [[override]]
   name = "k8s.io/api"
-  version = "kubernetes-1.13.0-beta.0"
+  version = "kubernetes-1.13.0"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.13.0-beta.0"
+  version = "kubernetes-1.13.0"
 
 [[override]]
   name = "k8s.io/apiserver"
-  version = "kubernetes-1.13.0-beta.0"
+  version = "kubernetes-1.13.0"
 
 [[override]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.13.0-beta.0"
+  version = "kubernetes-1.13.0"
 
 [[override]]
   name = "k8s.io/kubernetes"
-  version = "v1.13.0-beta.0"
+  version = "v1.13.0"
 
 [[constraint]]
   branch = "master"
@@ -155,6 +155,10 @@ revision = "a9fbbdc8dd8794b20af358382ab780559bca589d"
 name = "github.com/docker/distribution"
 revision="edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
 
+[[override]]
+name = "bitbucket.org/ww/goautoneg"
+source = "https://github.com/munnerz/goautoneg.git"
+
 [prune]
   go-tests = true
   unused-packages = true

cmd/cinder-csi-plugin/main.go

@@ -22,7 +22,9 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 	"k8s.io/cloud-provider-openstack/pkg/csi/cinder"
+	"k8s.io/klog"
 )
 
 var (
@@ -42,6 +44,24 @@ func main() {
 	cmd := &cobra.Command{
 		Use:   "Cinder",
 		Short: "CSI based Cinder driver",
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			// Glog requires this otherwise it complains.
+			flag.CommandLine.Parse(nil)
+
+			// This is a temporary hack to enable proper logging until upstream dependencies
+			// are migrated to fully utilize klog instead of glog.
+			klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
+			klog.InitFlags(klogFlags)
+
+			// Sync the glog and klog flags.
+			cmd.Flags().VisitAll(func(f1 *pflag.Flag) {
+				f2 := klogFlags.Lookup(f1.Name)
+				if f2 != nil {
+					value := f1.Value.String()
+					f2.Value.Set(value)
+				}
+			})
+		},
 		Run: func(cmd *cobra.Command, args []string) {
 			handle()
 		},

cmd/cinder-flex-volume-driver/main.go

@@ -17,13 +17,31 @@ limitations under the License.
 package main
 
 import (
+	"flag"
 	"os"
 
 	"k8s.io/cloud-provider-openstack/pkg/flexvolume"
 	"k8s.io/cloud-provider-openstack/pkg/flexvolume/uuid"
+	"k8s.io/klog"
 )
 
 func main() {
+	// Glog requires this otherwise it complains.
+	flag.CommandLine.Parse(nil)
+	// This is a temporary hack to enable proper logging until upstream dependencies
+	// are migrated to fully utilize klog instead of glog.
+	klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(klogFlags)
+
+	// Sync the glog and klog flags.
+	flag.CommandLine.VisitAll(func(f1 *flag.Flag) {
+		f2 := klogFlags.Lookup(f1.Name)
+		if f2 != nil {
+			value := f1.Value.String()
+			f2.Value.Set(value)
+		}
+	})
+
 	driver := flexvolume.NewFlexVolumeDriver(uuid.NewUUID())
 	os.Stdout.WriteString(driver.Run(os.Args[1:]))
 }

cmd/cinder-provisioner/main.go

@@ -18,8 +18,8 @@ package main
 
 import (
 	"flag"
-	"github.com/golang/glog"
 	"github.com/spf13/pflag"
+	"k8s.io/klog"
 
 	"github.com/kubernetes-incubator/external-storage/lib/controller"
 	"k8s.io/cloud-provider-openstack/pkg/volume/cinder/provisioner"
@@ -41,17 +41,32 @@ var (
 )
 
 func main() {
-	flag.CommandLine.Parse([]string{})
 	pflag.StringVar(&master, "master", "", "Master URL")
 	pflag.StringVar(&kubeconfig, "kubeconfig", "", "Absolute path to the kubeconfig")
 	pflag.StringVar(&id, "id", "", "Unique provisioner identity")
 	pflag.StringVar(&cloudconfig, "cloud-config", "", "Path to OpenStack config file")
 
+	// Glog requires this otherwise it complains.
+	flag.CommandLine.Parse(nil)
+	// This is a temporary hack to enable proper logging until upstream dependencies
+	// are migrated to fully utilize klog instead of glog.
+	klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(klogFlags)
+
+	// Sync the glog and klog flags.
+	flag.CommandLine.VisitAll(func(f1 *flag.Flag) {
+		f2 := klogFlags.Lookup(f1.Name)
+		if f2 != nil {
+			value := f1.Value.String()
+			f2.Value.Set(value)
+		}
+	})
+
 	kflag.InitFlags()
 	logs.InitLogs()
 	defer logs.FlushLogs()
 
-	glog.V(1).Infof("cinder-provisioner version: %s", version)
+	klog.V(1).Infof("cinder-provisioner version: %s", version)
 
 	var config *rest.Config
 	var err error
@@ -65,25 +80,25 @@ func main() {
 		prID = id
 	}
 	if err != nil {
-		glog.Fatalf("Failed to create config: %v", err)
+		klog.Fatalf("Failed to create config: %v", err)
 	}
 	clientset, err := kubernetes.NewForConfig(config)
 	if err != nil {
-		glog.Fatalf("Failed to create client: %v", err)
+		klog.Fatalf("Failed to create client: %v", err)
 	}
 
 	// The controller needs to know what the server version is because out-of-tree
 	// provisioners aren't officially supported until 1.5
 	serverVersion, err := clientset.Discovery().ServerVersion()
 	if err != nil {
-		glog.Fatalf("Error getting server version: %v", err)
+		klog.Fatalf("Error getting server version: %v", err)
 	}
 
 	// Create the provisioner: it implements the Provisioner interface expected by
 	// the controller
 	cinderProvisioner, err := provisioner.NewCinderProvisioner(clientset, prID, cloudconfig)
 	if err != nil {
-		glog.Fatalf("Error creating Cinder provisioner: %v", err)
+		klog.Fatalf("Error creating Cinder provisioner: %v", err)
 	}
 
 	// Start the provision controller which will dynamically provision cinder

cmd/client-keystone-auth/main.go

@@ -17,6 +17,7 @@ limitations under the License.
 package main
 
 import (
+	"flag"
 	"fmt"
 	"io"
 	"os"
@@ -30,6 +31,7 @@ import (
 
 	kflag "k8s.io/apiserver/pkg/util/flag"
 	"k8s.io/cloud-provider-openstack/pkg/identity/keystone"
+	"k8s.io/klog"
 )
 
 const errRespTemplate string = `{
@@ -118,6 +120,22 @@ func prompt(url string, domain string, user string, project string, password str
 }
 
 func main() {
+	// Glog requires this otherwise it complains.
+	flag.CommandLine.Parse(nil)
+	// This is a temporary hack to enable proper logging until upstream dependencies
+	// are migrated to fully utilize klog instead of glog.
+	klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(klogFlags)
+
+	// Sync the glog and klog flags.
+	flag.CommandLine.VisitAll(func(f1 *flag.Flag) {
+		f2 := klogFlags.Lookup(f1.Name)
+		if f2 != nil {
+			value := f1.Value.String()
+			f2.Value.Set(value)
+		}
+	})
+
 	var url string
 	var domain string
 	var user string

cmd/k8s-keystone-auth/main.go

@@ -15,17 +15,34 @@ limitations under the License.
 package main
 
 import (
+	"flag"
 	"os"
 
-	"github.com/golang/glog"
 	"github.com/spf13/pflag"
+	"k8s.io/klog"
 
 	kflag "k8s.io/apiserver/pkg/util/flag"
 	"k8s.io/apiserver/pkg/util/logs"
 	"k8s.io/cloud-provider-openstack/pkg/identity/keystone"
 )
 
 func main() {
+	// Glog requires this otherwise it complains.
+	flag.CommandLine.Parse(nil)
+	// This is a temporary hack to enable proper logging until upstream dependencies
+	// are migrated to fully utilize klog instead of glog.
+	klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(klogFlags)
+
+	// Sync the glog and klog flags.
+	flag.CommandLine.VisitAll(func(f1 *flag.Flag) {
+		f2 := klogFlags.Lookup(f1.Name)
+		if f2 != nil {
+			value := f1.Value.String()
+			f2.Value.Set(value)
+		}
+	})
+
 	logs.InitLogs()
 	defer logs.FlushLogs()
 
@@ -34,13 +51,13 @@ func main() {
 	kflag.InitFlags()
 
 	if err := config.ValidateFlags(); err != nil {
-		glog.Errorf("%v", err)
+		klog.Errorf("%v", err)
 		os.Exit(1)
 	}
 
 	keystoneAuth, err := keystone.NewKeystoneAuth(config)
 	if err != nil {
-		glog.Errorf("%v", err)
+		klog.Errorf("%v", err)
 		os.Exit(1)
 	}
 	keystoneAuth.Run()