Add operator and dashboard image builds (#156)

* new brancb fuasdc:x * dashboard image added * tests added * dashboard fix * small fix * small fix * small fi * FINAL FIX * improvement * small fix * small fix * small fi * small * small fix * additional testing * sasdas * path * final fix * print gopath * done * added controller * FINAL FIX FS
kubeflow · Dec 18, 2018 · d9e5551 · d9e5551
1 parent 4f58a83
commit d9e5551
Show file tree

Hide file tree

Showing 10 changed files with 136 additions and 21 deletions.
diff --git a/Dockerfile_controller b/Dockerfile_controller
diff --git a/Dockerfile_dashboard b/Dockerfile_dashboard
diff --git a/build/images/dashboard/Dockerfile b/build/images/dashboard/Dockerfile
@@ -0,0 +1,3 @@
+FROM golang:1.8 AS build
+COPY kubebench-dashboard /app/kubebench-dashboard
+ENTRYPOINT /app/kubebench-dashboard
diff --git a/build/images/dashboard/build_image.sh b/build/images/dashboard/build_image.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+#
+# Build Docker images for Kubebench controller.
+# This is intended to be invoked as a step in Argo to build the docker image.
+#
+# build_image.sh ${SRC_DIR} ${DOCKERFILE} ${IMAGE} ${VERSION}
+set -ex
+
+SRC_DIR=$(realpath $1)
+DOCKERFILE=$(realpath $2)
+IMAGE=$3
+VERSION=$4
+if [ -z ${VERSION} ]; then
+  VERSION=$(git describe --tags --always --dirty)
+fi
+TAG=${REGISTRY}/${REPO_NAME}/${IMAGE}:${VERSION}
+
+echo "Setup build directory"
+export GOPATH=`mktemp -d -p $(dirname $SRC_DIR)`
+export PATH=${GOPATH}/bin:/usr/local/go/bin:${PATH}
+mkdir -p ${GOPATH}/src/github.com/kubeflow/kubebench
+BUILD_DIR=${GOPATH}/src/github.com/kubeflow/kubebench
+
+echo "Copy source and Dockerfile to build directory"
+cp -r ${SRC_DIR}/vendor ${BUILD_DIR}/vendor
+mkdir -p ${BUILD_DIR}/dashboard/
+cp -r ${SRC_DIR}/dashboard/kubebench-dashboard ${BUILD_DIR}/dashboard
+cp -r ${SRC_DIR}/controller ${BUILD_DIR}/controller
+cp ${DOCKERFILE} ${BUILD_DIR}/Dockerfile
+
+echo "Change working directory to ${BUILD_DIR}"
+cd ${BUILD_DIR}
+
+echo "Build go binaries"
+GOOS=linux CGO_ENABLED=0 go build -o kubebench-dashboard github.com/kubeflow/kubebench/dashboard/kubebench-dashboard
+
+echo "Authenticate gcloud account"
+gcloud auth activate-service-account --key-file=${GOOGLE_APPLICATION_CREDENTIALS}
+echo "Build image ${TAG}"
+gcloud builds submit --tag=${TAG} --project=${PROJECT} .
+
+echo "Clean up go build directory"
+cd
+rm -rf ${GOPATH}
+
+echo "Image ${TAG} built successfully"
diff --git a/build/images/kubebench-operator/Dockerfile b/build/images/kubebench-operator/Dockerfile
@@ -0,0 +1,3 @@
+FROM golang:1.8 AS build
+COPY kubebench-operator /app/kubebench-operator
+ENTRYPOINT /app/kubebench-operator
diff --git a/build/images/kubebench-operator/build_image.sh b/build/images/kubebench-operator/build_image.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# Build Docker images for Kubebench controller.
+# This is intended to be invoked as a step in Argo to build the docker image.
+#
+# build_image.sh ${SRC_DIR} ${DOCKERFILE} ${IMAGE} ${VERSION}
+set -ex
+
+SRC_DIR=$(realpath $1)
+DOCKERFILE=$(realpath $2)
+IMAGE=$3
+VERSION=$4
+if [ -z ${VERSION} ]; then
+  VERSION=$(git describe --tags --always --dirty)
+fi
+TAG=${REGISTRY}/${REPO_NAME}/${IMAGE}:${VERSION}
+
+echo "Setup build directory"
+export GOPATH=`mktemp -d -p $(dirname $SRC_DIR)`
+export PATH=${GOPATH}/bin:/usr/local/go/bin:${PATH}
+mkdir -p ${GOPATH}/src/github.com/kubeflow/kubebench
+BUILD_DIR=${GOPATH}/src/github.com/kubeflow/kubebench
+
+echo "Copy source and Dockerfile to build directory"
+cp -r ${SRC_DIR}/vendor ${BUILD_DIR}/vendor
+cp -r ${SRC_DIR}/controller ${BUILD_DIR}/controller
+cp ${DOCKERFILE} ${BUILD_DIR}/Dockerfile
+
+echo "Change working directory to ${BUILD_DIR}"
+cd ${BUILD_DIR}
+
+echo "Build go binaries"
+GOOS=linux CGO_ENABLED=0 go build github.com/kubeflow/kubebench/controller/cmd/kubebench-operator
+
+echo "Authenticate gcloud account"
+gcloud auth activate-service-account --key-file=${GOOGLE_APPLICATION_CREDENTIALS}
+echo "Build image ${TAG}"
+gcloud builds submit --tag=${TAG} --project=${PROJECT} .
+
+echo "Clean up go build directory"
+cd
+rm -rf ${GOPATH}
+
+echo "Image ${TAG} built successfully"
diff --git a/controller/cmd/kubebench-operator/main.go b/controller/cmd/kubebench-operator/main.go
@@ -5,12 +5,12 @@ import (
 	"os/signal"
 	"syscall"
 
+	kubeclient "github.com/kubeflow/kubebench/controller/pkg/client"
+	controllers "github.com/kubeflow/kubebench/controller/pkg/controller"
 	log "github.com/sirupsen/logrus"
-	kubeclient "github.com/kubeflow/kubebench/controller/kubebench-operator/pkg/client"
-	controllers "github.com/kubeflow/kubebench/controller/kubebench-operator/pkg/controller"
 
-	// "github.com/kubeflow/kubebench/controller/kubebench-operator/pkg/handler"
-	"github.com/kubeflow/kubebench/controller/kubebench-operator/pkg/util"
+	// "github.com/kubeflow/kubebench/controller/pkg/handler"
+	"github.com/kubeflow/kubebench/controller/pkg/util"
 )
 
 func main() {

diff --git a/dashboard/kubebench-dashboard/backend.go b/dashboard/kubebench-dashboard/backend.go
@@ -8,12 +8,12 @@ import (
 
 	argoproj "github.com/argoproj/argo/pkg/client/clientset/versioned/typed/workflow/v1alpha1"
 	"github.com/ghodss/yaml"
-	kbjob "github.com/kubeflow/kubebench/controller/kubebench-operator/pkg/apis/kubebenchjob/v1"
-	kubeclient "github.com/kubeflow/kubebench/controller/kubebench-operator/pkg/client"
-	kubebenchjobclientset "github.com/kubeflow/kubebench/controller/kubebench-operator/pkg/client/clientset/versioned"
-	kubebench "github.com/kubeflow/kubebench/controller/kubebench-operator/pkg/client/clientset/versioned/typed/kubebenchjob/v1"
-	"github.com/kubeflow/kubebench/controller/kubebench-operator/pkg/util"
-	utils "github.com/kubeflow/kubebench/controller/kubebench-operator/pkg/util"
+	kbjob "github.com/kubeflow/kubebench/controller/pkg/apis/kubebenchjob/v1"
+	kubeclient "github.com/kubeflow/kubebench/controller/pkg/client"
+	kubebenchjobclientset "github.com/kubeflow/kubebench/controller/pkg/client/clientset/versioned"
+	kubebench "github.com/kubeflow/kubebench/controller/pkg/client/clientset/versioned/typed/kubebenchjob/v1"
+	"github.com/kubeflow/kubebench/controller/pkg/util"
+	utils "github.com/kubeflow/kubebench/controller/pkg/util"
 	log "github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"

diff --git a/main3 b/main3
diff --git a/test/workflows/components/workflows.libsonnet b/test/workflows/components/workflows.libsonnet
@@ -216,6 +216,14 @@
                     name: "build-kubebench-examples",
                     template: "build-kubebench-examples",
                   },
+                  {
+                    name: "build-kubebench-operator",
+                    template: "build-kubebench-operator",
+                  },
+                  {
+                    name: "build-kubebench-dashboard",
+                    template: "build-kubebench-dashboard",
+                  },
                 ],
                 [
                   {
@@ -322,6 +330,28 @@
               ],
               workingDir=srcDir,
             ),  // build-kubebench-controller
+            $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate(
+              "build-kubebench-operator",
+              [
+                srcDir + "/build/images/kubebench-operator/build_image.sh",
+                srcDir,
+                srcDir + "/build/images/kubebench-operator/Dockerfile",
+                "kubebench-operator",
+                versionTag,
+              ],
+              workingDir=srcDir,
+            ),  // build-kubebench-operator
+            $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate(
+              "build-kubebench-dashboard",
+              [
+                srcDir + "/build/images/dashboard/build_image.sh",
+                srcDir,
+                srcDir + "/build/images/dashboard/Dockerfile",
+                "kubebench-dashboard",
+                versionTag,
+              ],
+              workingDir=srcDir,
+            ),  // build-kubebench-dashboard
             $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate(
               "build-kubebench-examples",
               [