Merge remote-tracking branch 'kubeflow/master' into rebase-2.4-master

# Conflicts:
#	backend/Dockerfile
#	backend/Dockerfile.driver
#	backend/Dockerfile.launcher
#	backend/Dockerfile.persistenceagent
#	backend/Dockerfile.scheduledworkflow

Author: hbelmiro

backend/Dockerfile.cacheserver

@@ -22,22 +22,13 @@ WORKDIR /go/src/github.com/kubeflow/pipelines
 
 COPY ./go.mod ./
 COPY ./go.sum ./
-COPY ./hack/install-go-licenses.sh ./hack/
 
 RUN GO111MODULE=on go mod download
-RUN ./hack/install-go-licenses.sh
 
 COPY . .
 
 RUN GO111MODULE=on go build -o /bin/cache_server backend/src/cache/*.go
 
-# Check licenses and comply with license terms.
-# First, make sure there's no forbidden license.
-RUN go-licenses check ./backend/src/cache
-RUN go-licenses csv ./backend/src/cache > /tmp/licenses.csv && \
-    diff /tmp/licenses.csv backend/third_party_licenses/cache_server.csv && \
-    go-licenses save ./backend/src/cache --save_path /tmp/NOTICES
-
 FROM alpine:3.19
 
 RUN adduser -S appuser
@@ -46,8 +37,5 @@ USER appuser
 WORKDIR /bin
 
 COPY --from=builder /bin/cache_server /bin/cache_server
-# Copy licenses and notices.
-COPY --from=builder /tmp/licenses.csv /third_party/licenses.csv
-COPY --from=builder /tmp/NOTICES /third_party/NOTICES
 
 ENTRYPOINT [ "/bin/cache_server" ]

backend/Dockerfile.viewercontroller

@@ -21,30 +21,19 @@ WORKDIR /src/github.com/kubeflow/pipelines
 
 COPY ./go.mod ./
 COPY ./go.sum ./
-COPY ./hack/install-go-licenses.sh ./hack/
 
 RUN GO111MODULE=on go mod download
-RUN ./hack/install-go-licenses.sh
 
 COPY . .
 
 RUN GO111MODULE=on go build -o /bin/controller backend/src/crd/controller/viewer/*.go
-# Check licenses and comply with license terms.
-# First, make sure there's no forbidden license.
-RUN go-licenses check ./backend/src/crd/controller/viewer
-RUN go-licenses csv ./backend/src/crd/controller/viewer > /tmp/licenses.csv && \
-    diff /tmp/licenses.csv backend/third_party_licenses/viewer.csv && \
-    go-licenses save ./backend/src/crd/controller/viewer --save_path /tmp/NOTICES
 
 FROM alpine
 WORKDIR /bin
 
 COPY --from=builder /bin/controller /bin/controller
 RUN chmod +x /bin/controller
 
-# Copy licenses and notices.
-COPY --from=builder /tmp/licenses.csv /third_party/licenses.csv
-COPY --from=builder /tmp/NOTICES /third_party/NOTICES
 
 ENV MAX_NUM_VIEWERS "50"
 ENV NAMESPACE "kubeflow"

backend/Makefile

@@ -17,51 +17,12 @@ IMG_TAG_LAUNCHER          ?= kfp-launcher
 # Whenever build command for any of the binaries change, we should update them both here and in backend/Dockerfiles.
 
 .PHONY: all
-all: license_apiserver license_persistence_agent license_cache_server license_swf license_viewer license_driver license_launcher
+all: image_all
 
 .PHONY: clean
 clean:
 	rm -rf $(BUILD)
 
-$(BUILD)/apiserver:
-	GO111MODULE=on go build -o $(BUILD)/apiserver github.com/kubeflow/pipelines/backend/src/apiserver
-$(BUILD)/persistence_agent:
-	GO111MODULE=on go build -o $(BUILD)/persistence_agent github.com/kubeflow/pipelines/backend/src/agent/persistence
-$(BUILD)/cache_server:
-	GO111MODULE=on go build -o $(BUILD)/cache_server github.com/kubeflow/pipelines/backend/src/cache
-$(BUILD)/swf:
-	GO111MODULE=on go build -o $(BUILD)/swf github.com/kubeflow/pipelines/backend/src/crd/controller/scheduledworkflow
-$(BUILD)/viewer:
-	GO111MODULE=on go build -o $(BUILD)/viewer github.com/kubeflow/pipelines/backend/src/crd/controller/viewer
-$(BUILD)/driver:
-	GO111MODULE=on go build -o $(BUILD)/driver github.com/kubeflow/pipelines/backend/src/v2/cmd/driver
-$(BUILD)/launcher:
-	GO111MODULE=on go build -o $(BUILD)/launcher github.com/kubeflow/pipelines/backend/src/v2/cmd/launcher-v2
-
-# Update licenses info after dependencies changed.
-# See README.md#updating-licenses-info section for more details.
-.PHONY: license_apiserver
-license_apiserver: $(BUILD)/apiserver
-	cd $(MOD_ROOT) && go-licenses csv ./backend/src/apiserver > $(CSV_PATH)/apiserver.csv
-.PHONY: license_persistence_agent
-license_persistence_agent: $(BUILD)/persistence_agent
-	cd $(MOD_ROOT) && go-licenses csv ./backend/src/agent/persistence > $(CSV_PATH)/persistence_agent.csv
-.PHONY: license_cache_server
-license_cache_server: $(BUILD)/cache_server
-	cd $(MOD_ROOT) && go-licenses csv ./backend/src/cache > $(CSV_PATH)/cache_server.csv
-.PHONY: license_swf
-license_swf: $(BUILD)/swf
-	cd $(MOD_ROOT) && go-licenses csv ./backend/src/crd/controller/scheduledworkflow > $(CSV_PATH)/swf.csv
-.PHONY: license_viewer
-license_viewer: $(BUILD)/viewer
-	cd $(MOD_ROOT) && go-licenses csv ./backend/src/crd/controller/viewer > $(CSV_PATH)/viewer.csv
-.PHONY: license_driver
-license_driver: $(BUILD)/driver
-	cd $(MOD_ROOT) && go-licenses csv ./backend/src/v2/cmd/driver > $(CSV_PATH)/driver.csv
-.PHONY: license_launcher
-license_launcher: $(BUILD)/launcher
-	cd $(MOD_ROOT) && go-licenses csv ./backend/src/v2/cmd/launcher-v2 > $(CSV_PATH)/launcher.csv
-
 .PHONY: image_all
 image_all: image_apiserver image_persistence_agent image_cache image_swf image_viewer image_visualization image_driver image_launcher
 

backend/README.md

@@ -10,7 +10,6 @@ This README will help you set up your coding environment in order to build and r
 ## Prerequisites
 Before you begin, ensure you have:
 - Go programming language installed
-- [go-licenses tool](../hack/install-go-licenses.sh)
 - Docker or Podman installed (for building container images)
 
 Note that you may need to restart your shell after installing these resources in order for the changes to take effect.
@@ -50,16 +49,6 @@ Change it to point to your own build, after saving and closing the file, apiserv
 After making changes to proto files, the Go client libraries, Python client libraries and swagger files
 need to be regenerated and checked-in. Refer to [backend/api](./api/README.md) for details.
 
-### Updating licenses info
-
-1. [Install go-licenses tool](../hack/install-go-licenses.sh) (if you haven't already) and refer to [its documentation](https://github.com/google/go-licenses) for how to use it.
-
-2. Run the tool to update all licenses:
-
-    ```bash
-    make -C backend all
-    ```
-
 ### Updating python dependencies
 
 [pip-tools](https://github.com/jazzband/pip-tools) is used to manage python

backend/src/v2/Makefile

@@ -22,8 +22,6 @@ REPO_ROOT=../../..
 GOOS_VALUE?=linux
 GOARCH_VALUE?=amd64
 # override this via env to increase verbosity of go-licenses, example:
-# GO_LICENSES_FLAGS=-v4 make license-launcher
-GO_LICENSES_FLAGS?=
 GO_FLAGS=GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS_VALUE} GOARCH=${GOARCH_VALUE}
 GO_BUILD_FLAGS=-tags netgo -ldflags '-extldflags "-static"'
 KO_VERSION?=v0.8.3

backend/src/v2/README.md

@@ -115,29 +115,3 @@ Instructions:
     ```
 
     Read [v2 sample test documentation](./test/README.md) for more details.
-
-### Update licenses
-
-Note, this is currently outdated instructions for v2 compatible mode. We haven't set up licensing workflow for v2 engine.
-
-Download the license tool binary from <https://github.com/Bobgy/go-licenses/releases> and put it into $PATH.
-
-Update licenses info by:
-
-```bash
-make license-launcher
-```
-
-or run the following to enable verbose output:
-
-```bash
-GO_LICENSES_FLAGS=-v4 make license-launcher
-```
-
-After the update, check generated third_party/licenses/launcher.csv file to
-make sure licenses of new dependencies are correctly identified.
-
-If something is unexpected, examine the unexpected dependencies by yourself and add
-overrides to [go-licenses.yaml](./go-licenses.yaml).
-
-For detailed documentation about the tool: <https://github.com/Bobgy/go-licenses/tree/main/v2>.

backend/src/v2/test/presubmit-v2-go-test.sh

@@ -50,9 +50,3 @@ kubectl port-forward svc/metadata-grpc-service 8080:8080 -n "$NAMESPACE" & PORT_
 # wait for kubectl port forward
 sleep 10
 go test -v -cover ./...
-
-# TODO(zijianjoy): re-enable license check for v2 images
-# verify licenses are up-to-date,  because all license updates must be reviewed by a human.
-# ../hack/install-go-licenses.sh
-# make license-launcher
-# git diff --exit-code -- third_party/licenses/launcher.csv || (echo "v2/third_party/licenses/launcher.csv is outdated, refer to https://github.com/kubeflow/pipelines/tree/master/v2#update-licenses for update instructions.")