fix(dashboard): centraldashboard-angular build with common-lib fetch (#92)

The migration from `kubeflow/kubeflow` to `kubeflow/dashboard` resulted in a broken build process for `centraldashboard-angular` application.

This PR provides the following functionality to allow local builds and docker builds to return successfully:
- `COMMON_LIB_COMMIT` file to designate a deterministic mechanism to referencing `kubeflow/kubeflow` `kubeflow-common-lib` dependency
- new helper methods in `Makefile` to fetch and build `kubeflow-common-lib`
- reworked `Dockerfile` to only pass `.` as context
    - all required files now exist in the `components/centraldashboard-angular` directory
- default logic for `kubeflowversion` `Dockerfile` `ARG`
    - no tags exist on `kubeflow/dashboard` which breaks existing logic!
- fixed typo `git verions` on docker label

Signed-off-by: Andy Stoneberg <[email protected]>

Author: andyatmiami

components/centraldashboard-angular/.gitignore

@@ -0,0 +1,2 @@
+# dependencies
+/kubeflow-common-lib

components/centraldashboard-angular/Dockerfile

@@ -1,7 +1,7 @@
 # --- Build the backend ---
 FROM node:16.20.2-bullseye as backend
 
-COPY ./centraldashboard-angular/backend/ ./src
+COPY ./backend/ ./src
 WORKDIR /src
 
 RUN npm ci && \
@@ -14,22 +14,22 @@ FROM node:16.20.2-bullseye as frontend-kubeflow-lib
 WORKDIR /src
 
 ENV NG_CLI_ANALYTICS "ci"
-COPY ./crud-web-apps/common/frontend/kubeflow-common-lib/package.json ./
-COPY ./crud-web-apps/common/frontend/kubeflow-common-lib/package-lock.json ./
+COPY ./kubeflow-common-lib/package.json ./
+COPY ./kubeflow-common-lib/package-lock.json ./
 RUN npm ci
 
-COPY ./crud-web-apps/common/frontend/kubeflow-common-lib/projects ./projects
-COPY ./crud-web-apps/common/frontend/kubeflow-common-lib/angular.json .
-COPY ./crud-web-apps/common/frontend/kubeflow-common-lib/tsconfig.json .
+COPY ./kubeflow-common-lib/projects ./projects
+COPY ./kubeflow-common-lib/angular.json .
+COPY ./kubeflow-common-lib/tsconfig.json .
 RUN npm run build
 
 # --- Build the frontend ---
 FROM node:16.20.2-bullseye as frontend
 
-ARG kubeflowversion
+ARG kubeflowversion=unknown
 ENV BUILD_VERSION=$kubeflowversion
 
-COPY ./centraldashboard-angular/frontend ./src
+COPY ./frontend /src
 WORKDIR /src
 
 ENV NG_CLI_ANALYTICS "ci"

components/centraldashboard-angular/Makefile

@@ -2,13 +2,34 @@ IMG ?= ghcr.io/kubeflow/kubeflow/centraldashboard-angular
 TAG ?= $(shell git describe --tags --always --dirty)
 COMMIT = $(shell git rev-parse HEAD)
 
+COMMON_LIB_COMMIT ?= $(shell head -n 1 frontend/COMMON_LIB_COMMIT)
+COMMON_LIB_TARGET_DIR = kubeflow-common-lib
+COMMON_LIB_TMP_TGZ := /tmp/kubeflow-$(COMMON_LIB_COMMIT).tar.gz
+
+.PHONY:fetch-common-lib
+fetch-common-lib:
+	curl -L -f -o $(COMMON_LIB_TMP_TGZ) https://github.com/kubeflow/kubeflow/archive/$(COMMON_LIB_COMMIT).tar.gz
+
+	rm -rf $(COMMON_LIB_TARGET_DIR)
+	mkdir -p $(COMMON_LIB_TARGET_DIR)
+	tar -C /tmp -xzf $(COMMON_LIB_TMP_TGZ) kubeflow-$(COMMON_LIB_COMMIT)/components/crud-web-apps/common/frontend/kubeflow-common-lib/
+	mv /tmp/kubeflow-$(COMMON_LIB_COMMIT)/components/crud-web-apps/common/frontend/kubeflow-common-lib/* $(COMMON_LIB_TARGET_DIR)/
+
+	rm -f $(COMMON_LIB_TMP_TGZ)
+	rm -rf /tmp/kubeflow-$(COMMON_LIB_COMMIT)
+
+.PHONY: build-common-lib
+build-common-lib: fetch-common-lib
+	cd $(COMMON_LIB_TARGET_DIR) && npm i && npm run build && cd dist/kubeflow && npm link
+
+
 # To build without the cache set the environment variable
 # export DOCKER_BUILD_OPTS=--no-cache
-docker-build:
-	docker build ${DOCKER_BUILD_OPTS} -t $(IMG):$(TAG) -f Dockerfile .. \
-		--build-arg kubeflowversion=$(shell git describe --abbrev=0 --tags) \
+docker-build: fetch-common-lib
+	docker build ${DOCKER_BUILD_OPTS} -t $(IMG):$(TAG) -f Dockerfile . \
+		--build-arg kubeflowversion=$(shell git describe --abbrev=0 --tags || git rev-parse --abbrev-ref HEAD) \
 		--build-arg commit=$(COMMIT) \
-		--label=git-verions=$(TAG)
+		--label=git-version=$(TAG)
 
 docker-push:
 	docker push $(IMG):$(TAG)

components/centraldashboard-angular/frontend/.gitignore

@@ -4,6 +4,7 @@
 /dist
 /tmp
 /out-tsc
+/.angular
 # Only exists if Bazel was run
 /bazel-out
 

components/centraldashboard-angular/frontend/COMMON_LIB_COMMIT

@@ -0,0 +1 @@
+4a26c7b5e9575410613faf7df6735aa1883a2d24