Updates dev cluster docs and fixes GOOS target for image

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

Author: JoshVanL

.dockerignore

@@ -1,2 +1,2 @@
 *
-!/bin/kube-oidc-proxy
+!/bin/kube-oidc-proxy-linux

Dockerfile

@@ -4,6 +4,6 @@ LABEL description="OIDC reverse proxy authenticator based on Kubernetes"
 
 RUN apk --no-cache --update add ca-certificates
 
-COPY ./bin/kube-oidc-proxy /usr/bin/kube-oidc-proxy
+COPY ./bin/kube-oidc-proxy-linux /usr/bin/kube-oidc-proxy
 
 CMD ["/usr/bin/kube-oidc-proxy"]

Makefile

@@ -99,17 +99,18 @@ build: generate ## build kube-oidc-proxy
 	CGO_ENABLED=0 go build -ldflags '-w $(shell hack/version-ldflags.sh)' -o ./bin/kube-oidc-proxy ./cmd/.
 
 docker_build: generate test build ## build docker image
+	GOOS=linux CGO_ENABLED=0 go build -ldflags '-w $(shell hack/version-ldflags.sh)' -o ./bin/kube-oidc-proxy-linux  ./cmd/.
 	docker build -t kube-oidc-proxy .
 
 all: test build ## runs tests, build
 
 image: all docker_build ## runs tests, build and docker build
 
-dev_cluster_create: ## create dev cluster for development testing
+dev_cluster_create: depend ## create dev cluster for development testing
 	KUBE_OIDC_PROXY_ROOT_PATH="$$(pwd)" go run -v ./test/environment/dev create
 
-dev_cluster_deploy: ## deploy into dev cluster
+dev_cluster_deploy: depend ## deploy into dev cluster
 	KUBE_OIDC_PROXY_ROOT_PATH="$$(pwd)" go run -v ./test/environment/dev deploy
 
-dev_cluster_destroy: ## destroy dev cluster
+dev_cluster_destroy: depend ## destroy dev cluster
 	KUBE_OIDC_PROXY_ROOT_PATH="$$(pwd)" go run -v ./test/environment/dev destroy

docs/tasks/development-testing.md

@@ -11,10 +11,15 @@ onto each node.
 
 # Deploying the Proxy
 
-Use `make dev_cluster_deploy` to build the proxy and other tooling from source,
-build the images, and load them onto each node. This will then deploy the proxy
-alongside a fake OIDC issuer so that the proxy is fully functional. The proxy
-will then be reachable from a node port service in the cluster.
+This will build the proxy and other tooling from source,build the images, and
+load them onto each node. This will then deploy the proxy alongside a fake OIDC
+issuer so that the proxy is fully functional. The proxy will then be reachable
+from a node port service in the cluster.
+
+
+```bash
+make dev_cluster_deploy
+```
 
 This command will output a signed OIDC token that is valid for the proxy. You
 can then make calls to the proxy, like the following:

test/kind/image.go

@@ -32,15 +32,15 @@ func (k *Kind) LoadAllImages() error {
 }
 
 func (k *Kind) LoadKubeOIDCProxy() error {
-	binPath := filepath.Join(k.rootPath, "./bin/kube-oidc-proxy")
+	binPath := filepath.Join(k.rootPath, "./bin/kube-oidc-proxy-linux")
 	mainPath := filepath.Join(k.rootPath, "./cmd/.")
 	image := "kube-oidc-proxy-e2e"
 
 	return k.loadImage(binPath, mainPath, image, k.rootPath)
 }
 
 func (k *Kind) LoadIssuer() error {
-	binPath := filepath.Join(k.rootPath, "./test/tools/issuer/bin/oidc-issuer")
+	binPath := filepath.Join(k.rootPath, "./test/tools/issuer/bin/oidc-issuer-linux")
 	dockerfilePath := filepath.Join(k.rootPath, "./test/tools/issuer")
 	mainPath := filepath.Join(dockerfilePath, "cmd")
 	image := "oidc-issuer-e2e"
@@ -49,7 +49,7 @@ func (k *Kind) LoadIssuer() error {
 }
 
 func (k *Kind) LoadFakeAPIServer() error {
-	binPath := filepath.Join(k.rootPath, "./test/tools/fake-apiserver/bin/fake-apiserver")
+	binPath := filepath.Join(k.rootPath, "./test/tools/fake-apiserver/bin/fake-apiserver-linux")
 	dockerfilePath := filepath.Join(k.rootPath, "./test/tools/fake-apiserver")
 	mainPath := filepath.Join(dockerfilePath, "cmd")
 	image := "fake-apiserver-e2e"
@@ -127,7 +127,8 @@ func (k *Kind) runCmdWithOut(w io.Writer, command string, args ...string) error
 	cmd.Stdout = w
 	cmd.Env = append(cmd.Env,
 		"GO111MODULE=on", "CGO_ENABLED=0", "HOME="+os.Getenv("HOME"),
-		"PATH="+os.Getenv("PATH"))
+		"PATH="+os.Getenv("PATH"),
+		"GOOS=linux")
 
 	if err := cmd.Start(); err != nil {
 		return err

test/tools/fake-apiserver/Dockerfile

@@ -5,6 +5,6 @@ LABEL description="A fake API server that will respond to requests with the same
 
 RUN apk --no-cache --update add ca-certificates
 
-COPY ./bin/fake-apiserver /usr/bin/fake-apiserver
+COPY ./bin/fake-apiserver-linux /usr/bin/fake-apiserver
 
 CMD ["/usr/bin/fake-apiserver"]

test/tools/issuer/Dockerfile

@@ -5,6 +5,6 @@ LABEL description="A basic OIDC issuer that prsents a well-known and certs endpo
 
 RUN apk --no-cache --update add ca-certificates
 
-COPY ./bin/oidc-issuer /usr/bin/oidc-issuer
+COPY ./bin/oidc-issuer-linux /usr/bin/oidc-issuer
 
 CMD ["/usr/bin/oidc-issuer"]