Update k8s to 1.15

Signed-off-by: JoshVanL <[email protected]>

Author: JoshVanL

Gopkg.lock

@@ -4,44 +4,40 @@ required = [
 
 [[override]]
   name = "k8s.io/api"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.15.0"
 
 [[override]]
   name = "k8s.io/apiserver"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.15.0"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.15.0"
 
 [[override]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.15.0"
 
 [[override]]
   name = "k8s.io/apiextensions-apiserver"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.15.0"
 
 [[override]]
   name = "k8s.io/cli-runtime"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.15.0"
 
 [[override]]
   name = "k8s.io/kubernetes"
-  version = "v1.13.4"
+  version = "v1.15.0"
 
 [[override]]
   name = "k8s.io/kube-openapi"
-  revision = "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d"
+  revision = "b3a7cee44a305be0a69e1b9ac03018307287e1b0"
 
 [[override]]
   name = "github.com/docker/docker"
   revision = "a9fbbdc8dd8794b20af358382ab780559bca589d"
 
-[[override]]
-  name = "github.com/docker/spdystream"
-  revision = "449fdfce4d962303d702fec724ef0ad181c92528"
-
 [[override]]
   name = "github.com/gophercloud/gophercloud"
   revision = "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d"
@@ -69,3 +65,15 @@ required = [
 [[override]]
   name = "github.com/russross/blackfriday"
   revision = "300106c228d52c8941d4b3de6054a6062a86dda3"
+
+[[override]]
+  name = "sigs.k8s.io/kustomize"
+  revision = "v2.0.3"
+
+[[override]]
+  name = "sigs.k8s.io/structured-merge-diff"
+  revision = "e85c7b244fd2cc57bb829d73a061f93a441e63ce"
+
+[[override]]
+  name = "github.com/prometheus/client_golang"
+  version = "v0.9.2"

Gopkg.toml

@@ -10,11 +10,14 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apiserver/pkg/authentication/request/bearertoken"
 	"k8s.io/apiserver/pkg/server"
-	apiserverflag "k8s.io/apiserver/pkg/util/flag"
-	"k8s.io/apiserver/pkg/util/globalflag"
+	//apiserverflag "k8s.io/apiserver/pkg/util/flag"
+	//"k8s.io/apiserver/pkg/util/globalflag"
+	"k8s.io/apiserver/pkg/util/term"
 	"k8s.io/apiserver/plugin/pkg/authenticator/token/oidc"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/rest"
+	cliflag "k8s.io/component-base/cli/flag"
+	"k8s.io/component-base/cli/globalflag"
 	apiserveroptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
 
 	"github.com/jetstack/kube-oidc-proxy/pkg/probe"
@@ -33,7 +36,7 @@ func NewRunCommand(stopCh <-chan struct{}) *cobra.Command {
 	}
 	secureServingOptions := apiserveroptions.NewSecureServingOptions()
 	secureServingOptions.ServerCert.PairName = "kube-oidc-proxy"
-	clientConfigFlags := genericclioptions.NewConfigFlags()
+	clientConfigFlags := genericclioptions.NewConfigFlags(true)
 
 	healthCheck := probe.New(strconv.Itoa(readinessProbePort))
 
@@ -88,21 +91,22 @@ func NewRunCommand(stopCh <-chan struct{}) *cobra.Command {
 			p := proxy.New(restConfig, reqAuther, secureServingInfo)
 
 			// run proxy
-			if err := p.Run(stopCh); err != nil {
+			waitCh, err := p.Run(stopCh)
+			if err != nil {
 				return err
 			}
 
 			time.Sleep(time.Second * 3)
 			healthCheck.SetReady()
 
-			<-stopCh
+			<-waitCh
 
 			return nil
 		},
 	}
 
 	// add flags to command sets
-	var namedFlagSets apiserverflag.NamedFlagSets
+	var namedFlagSets cliflag.NamedFlagSets
 	fs := cmd.Flags()
 
 	oidcfs := namedFlagSets.FlagSet("OIDC")
@@ -125,15 +129,15 @@ func NewRunCommand(stopCh <-chan struct{}) *cobra.Command {
 
 	// pretty output from kube-apiserver
 	usageFmt := "Usage:\n  %s\n"
-	cols, _, _ := apiserverflag.TerminalSize(cmd.OutOrStdout())
+	cols, _, _ := term.TerminalSize(cmd.OutOrStdout())
 	cmd.SetUsageFunc(func(cmd *cobra.Command) error {
 		fmt.Fprintf(cmd.OutOrStderr(), usageFmt, cmd.UseLine())
-		apiserverflag.PrintSections(cmd.OutOrStderr(), namedFlagSets, cols)
+		cliflag.PrintSections(cmd.OutOrStderr(), namedFlagSets, cols)
 		return nil
 	})
 	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
 		fmt.Fprintf(cmd.OutOrStdout(), "%s\n\n"+usageFmt, cmd.Long, cmd.UseLine())
-		apiserverflag.PrintSections(cmd.OutOrStdout(), namedFlagSets, cols)
+		cliflag.PrintSections(cmd.OutOrStdout(), namedFlagSets, cols)
 	})
 
 	return cmd

cmd/run.go

@@ -0,0 +1,109 @@
+module github.com/jetstack/kube-oidc-proxy
+
+go 1.12
+
+require (
+	bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c
+	cloud.google.com/go v0.40.0
+	contrib.go.opencensus.io/exporter/ocagent v0.4.12
+	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
+	github.com/Azure/go-autorest v12.1.0+incompatible
+	github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e
+	github.com/Masterminds/semver v1.4.2
+	github.com/NYTimes/gziphandler v1.1.1
+	github.com/PuerkitoBio/purell v1.1.1
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578
+	github.com/beorn7/perks v1.0.0
+	github.com/census-instrumentation/opencensus-proto v0.2.0
+	github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1
+	github.com/coreos/etcd v3.3.13+incompatible
+	github.com/coreos/go-oidc v2.0.0+incompatible
+	github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a
+	github.com/davecgh/go-spew v0.0.0-20170626231645-782f4967f2dc
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/docker/distribution v2.7.1+incompatible
+	github.com/docker/docker v0.0.0-20180612054059-a9fbbdc8dd87
+	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c
+	github.com/emicklei/go-restful v2.9.6+incompatible
+	github.com/evanphx/json-patch v4.2.0+incompatible
+	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d
+	github.com/fatih/camelcase v1.0.0
+	github.com/ghodss/yaml v1.0.0
+	github.com/go-openapi/jsonpointer v0.19.2
+	github.com/go-openapi/jsonreference v0.19.2
+	github.com/go-openapi/spec v0.19.2
+	github.com/go-openapi/swag v0.19.2
+	github.com/gogo/protobuf v1.2.1
+	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef
+	github.com/golang/mock v0.0.0-20190508161146-9fa652df1129
+	github.com/golang/protobuf v1.3.1
+	github.com/google/btree v1.0.0
+	github.com/google/go-cmp v0.3.0
+	github.com/google/gofuzz v1.0.0
+	github.com/google/uuid v1.1.1
+	github.com/googleapis/gnostic v0.3.0
+	github.com/gophercloud/gophercloud v0.0.0-20180330165814-781450b3c4fc
+	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
+	github.com/grpc-ecosystem/grpc-gateway v1.9.2
+	github.com/hashicorp/golang-lru v0.5.1
+	github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40
+	github.com/imdario/mergo v0.3.7
+	github.com/inconshreveable/mousetrap v1.0.0
+	github.com/json-iterator/go v1.1.6
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2
+	github.com/mailru/easyjson v0.0.0-20190620125010-da37f6c1e481
+	github.com/matttproud/golang_protobuf_extensions v1.0.1
+	github.com/mitchellh/go-wordwrap v1.0.0
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
+	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742
+	github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30
+	github.com/opencontainers/go-digest v1.0.0-rc1
+	github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709
+	github.com/petar/GoLLRB v0.0.0-20190514000832-33fb24c13b99
+	github.com/peterbourgon/diskv v0.0.0-20190425080511-0be1b92a6df0
+	github.com/pkg/errors v0.8.1
+	github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35
+	github.com/prometheus/client_golang v0.0.0-20190623115659-7c68e7286a5c
+	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
+	github.com/prometheus/common v0.6.0
+	github.com/prometheus/procfs v0.0.2
+	github.com/russross/blackfriday v0.0.0-20151117072312-300106c228d5
+	github.com/shurcooL/sanitized_anchor_name v1.0.0
+	github.com/sirupsen/logrus v1.4.2
+	github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937
+	github.com/spf13/pflag v1.0.3
+	go.opencensus.io v0.19.3
+	golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4
+	golang.org/x/net v0.0.0-20190620200207-3b0461eec859
+	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
+	golang.org/x/sync v0.0.0-20190423024810-112230192c58
+	golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0
+	golang.org/x/text v0.3.2
+	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
+	golang.org/x/tools v0.0.0-20190624150748-8ea4f8e3e5bf
+	google.golang.org/api v0.6.0
+	google.golang.org/appengine v1.6.1
+	google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601
+	google.golang.org/grpc v1.21.1
+	gopkg.in/inf.v0 v0.9.1
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3
+	gopkg.in/square/go-jose.v2 v2.3.1
+	gopkg.in/yaml.v2 v2.2.2
+	k8s.io/api v0.0.0-20190620084959-7cf5895f2711
+	k8s.io/apiextensions-apiserver v0.0.0-20190620085554-14e95df34f1f
+	k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
+	k8s.io/apiserver v0.0.0-20190620085212-47dc9a115b18
+	k8s.io/cli-runtime v0.0.0-20190620085706-2090e6d8f84c
+	k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
+	k8s.io/cloud-provider v0.0.0-20190624091323-9dc79cf4f9c7
+	k8s.io/component-base v0.0.0-20190624085813-dd74dcc4bb91
+	k8s.io/klog v0.3.3
+	k8s.io/kube-openapi v0.0.0-20181109181836-c59034cc13d5
+	k8s.io/kubernetes v1.15.0
+	k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a
+	sigs.k8s.io/kind v0.3.0
+	sigs.k8s.io/kustomize v2.0.3+incompatible
+	sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e
+	sigs.k8s.io/yaml v1.1.0
+)

go.mod

@@ -47,13 +47,13 @@ func New(restConfig *rest.Config, auther *bearertoken.Authenticator,
 	}
 }
 
-func (p *Proxy) Run(stopCh <-chan struct{}) error {
+func (p *Proxy) Run(stopCh <-chan struct{}) (<-chan struct{}, error) {
 	klog.Infof("waiting for oidc provider to become ready...")
 
 	// get golang tls config to the API server
 	tlsConfig, err := rest.TLSConfigFor(p.restConfig)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	// create tls transport to request
@@ -64,20 +64,20 @@ func (p *Proxy) Run(stopCh <-chan struct{}) error {
 	// get kube transport config form rest client config
 	restTransportConfig, err := p.restConfig.TransportConfig()
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	// wrap golang tls config with kube transport round tripper
 	clientRT, err := transport.HTTPWrappersForConfig(restTransportConfig, tlsTransport)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	p.clientTransport = clientRT
 
 	// get API server url
 	url, err := url.Parse(p.restConfig.Host)
 	if err != nil {
-		return fmt.Errorf("failed to parse url: %s", err)
+		return nil, fmt.Errorf("failed to parse url: %s", err)
 	}
 
 	// set up proxy handler using proxy
@@ -88,23 +88,24 @@ func (p *Proxy) Run(stopCh <-chan struct{}) error {
 	// wait for oidc auther to become ready
 	time.Sleep(10 * time.Second)
 
-	if err := p.serve(proxyHandler, stopCh); err != nil {
-		return err
+	waitCh, err := p.serve(proxyHandler, stopCh)
+	if err != nil {
+		return nil, err
 	}
 
 	klog.Infof("proxy ready")
 
-	return nil
+	return waitCh, nil
 }
 
-func (p *Proxy) serve(proxyHandler *httputil.ReverseProxy, stopCh <-chan struct{}) error {
+func (p *Proxy) serve(proxyHandler *httputil.ReverseProxy, stopCh <-chan struct{}) (<-chan struct{}, error) {
 	// securely serve using serving config
-	err := p.secureServingInfo.Serve(proxyHandler, time.Second*60, stopCh)
+	waitCh, err := p.secureServingInfo.Serve(proxyHandler, time.Second*60, stopCh)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
-	return nil
+	return waitCh, nil
 }
 
 func (p *Proxy) RoundTrip(req *http.Request) (*http.Response, error) {