Merge pull request #12 from cheftako/image

Added build target for image push.

Author: k8s-ci-robot

Gopkg.lock

@@ -43,3 +43,7 @@ required = [
 [prune]
   go-tests = true
   unused-packages = true
+
+[[constraint]]
+  name = "k8s.io/klog"
+  version = "0.3.0"

Gopkg.toml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-.PHONY: gen clean certs build docker/proxy-server docker/proxy-agent
+.PHONY: gen clean certs build docker/proxy-server docker/proxy-agent push-images
 proto/agent/agent.pb.go: proto/agent/agent.proto
 	protoc -I proto proto/agent/agent.proto --go_out=plugins=grpc:proto
 
@@ -43,7 +43,7 @@ bin/proxy-server: bin cmd/proxy/main.go proto/agent/agent.pb.go proto/proxy.pb.g
 docker/proxy-server: cmd/proxy/main.go proto/agent/agent.pb.go proto/proxy.pb.go
 	@[ "${REGISTRY}" ] || ( echo "REGISTRY is not set"; exit 1 )
 	@[ "${PROJECT_ID}" ] || ( echo "PROJECT_ID is not set"; exit 1 )
-	docker build . -f artifacts/images/server-build.Dockerfile -t ${REGISTRY}/${PROJECT_ID}/server-proxy:latest
+	docker build . -f artifacts/images/server-build.Dockerfile -t ${REGISTRY}/${PROJECT_ID}/proxy-server:latest
 
 bin/proxy-test-client: bin cmd/client/main.go proto/proxy.pb.go
 	go build -o bin/proxy-test-client cmd/client/main.go
@@ -92,5 +92,10 @@ gen: proto/agent/agent.pb.go proto/proxy.pb.go
 
 build: bin/proxy-agent bin/proxy-server bin/proxy-test-client
 
+push-images: docker/proxy-agent docker/proxy-server
+	@[ "${DOCKER_CMD}" ] || ( echo "DOCKER_CMD is not set"; exit 1 )
+	${DOCKER_CMD} push ${REGISTRY}/${PROJECT_ID}/proxy-agent:latest
+	${DOCKER_CMD} push ${REGISTRY}/${PROJECT_ID}/proxy-server:latest
+
 clean:
 	rm -rf proto/agent/agent.pb.go proto/proxy.pb.go easy-rsa.tar.gz easy-rsa-master cfssl cfssljson certs bin

Makefile

@@ -19,18 +19,20 @@ package main
 import (
 	"crypto/tls"
 	"crypto/x509"
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"os"
 
-	"github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/agentclient"
+	"sigs.k8s.io/apiserver-network-proxy/pkg/util"
+	"k8s.io/klog"
 )
 
 func main() {
@@ -39,8 +41,15 @@ func main() {
 	command := newAgentCommand(agent, o)
 	flags := command.Flags()
 	flags.AddFlagSet(o.Flags())
+	local := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
+	klog.InitFlags(local)
+	local.VisitAll(func(fl *flag.Flag) {
+		fl.Name = util.Normalize(fl.Name)
+		flags.AddGoFlag(fl)
+	})
 	if err := command.Execute(); err != nil {
-		glog.Errorf("error: %v\n", err)
+		klog.Errorf("error: %v\n", err)
+		klog.Flush()
 		os.Exit(1)
 	}
 }
@@ -52,17 +61,17 @@ type GrpcProxyAgentOptions struct {
 }
 
 func (o *GrpcProxyAgentOptions) Flags() *pflag.FlagSet {
-	flags := pflag.NewFlagSet("proxy", pflag.ContinueOnError)
+	flags := pflag.NewFlagSet("proxy-agent", pflag.ContinueOnError)
 	flags.StringVar(&o.agentCert, "agentCert", o.agentCert, "If non-empty secure communication with this cert.")
 	flags.StringVar(&o.agentKey, "agentKey", o.agentKey, "If non-empty secure communication with this key.")
 	flags.StringVar(&o.caCert, "caCert", o.caCert, "If non-empty the CAs we use to validate clients.")
 	return flags
 }
 
 func (o *GrpcProxyAgentOptions) Print() {
-	glog.Warningf("AgentCert set to \"%s\".\n", o.agentCert)
-	glog.Warningf("AgentKey set to \"%s\".\n", o.agentKey)
-	glog.Warningf("CACert set to \"%s\".\n", o.caCert)
+	klog.Warningf("AgentCert set to \"%s\".\n", o.agentCert)
+	klog.Warningf("AgentKey set to \"%s\".\n", o.agentKey)
+	klog.Warningf("CACert set to \"%s\".\n", o.caCert)
 }
 
 func (o *GrpcProxyAgentOptions) Validate() error {
@@ -192,9 +201,9 @@ func (p *Agent) runAdminServer(o *GrpcProxyAgentOptions) error {
 	go func() {
 		err := adminServer.ListenAndServe()
 		if err != nil {
-			glog.Warningf("health server received %v.\n", err)
+			klog.Warningf("health server received %v.\n", err)
 		}
-		glog.Warningf("Health server stopped listening\n")
+		klog.Warningf("Health server stopped listening\n")
 	}()
 
 	return nil

cmd/agent/main.go

@@ -19,17 +19,19 @@ package main
 import (
 	"crypto/tls"
 	"crypto/x509"
+	"flag"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
 
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"k8s.io/klog"
 	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/client"
+	"sigs.k8s.io/apiserver-network-proxy/pkg/util"
 )
 
 func main() {
@@ -38,8 +40,15 @@ func main() {
 	command := newGrpcProxyClientCommand(client, o)
 	flags := command.Flags()
 	flags.AddFlagSet(o.Flags())
+	local := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
+	klog.InitFlags(local)
+	local.VisitAll(func(fl *flag.Flag) {
+		fl.Name = util.Normalize(fl.Name)
+		flags.AddGoFlag(fl)
+	})
 	if err := command.Execute(); err != nil {
-		glog.Errorf("error: %v\n", err)
+		klog.Errorf("error: %v\n", err)
+		klog.Flush()
 		os.Exit(1)
 	}
 }
@@ -59,9 +68,9 @@ func (o *GrpcProxyClientOptions) Flags() *pflag.FlagSet {
 }
 
 func (o *GrpcProxyClientOptions) Print() {
-	glog.Warningf("ClientCert set to \"%s\".\n", o.clientCert)
-	glog.Warningf("ClientKey set to \"%s\".\n", o.clientKey)
-	glog.Warningf("CACert set to \"%s\".\n", o.caCert)
+	klog.Warningf("ClientCert set to \"%s\".\n", o.clientCert)
+	klog.Warningf("ClientKey set to \"%s\".\n", o.clientKey)
+	klog.Warningf("CACert set to \"%s\".\n", o.caCert)
 }
 
 func (o *GrpcProxyClientOptions) Validate() error {
@@ -168,7 +177,7 @@ func (c *Client) run(o *GrpcProxyClientOptions) error {
 		if err != nil {
 			return err
 		}
-		glog.Info(string(buf[:n]))
+		klog.Info(string(buf[:n]))
 	}
 	return nil
 }