You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@submarine.apache.org by ka...@apache.org on 2021/07/15 12:20:18 UTC
[submarine] branch master updated: SUBMARINE-920. remove
submarine-cloud from building progress
This is an automated email from the ASF dual-hosted git repository.
kaihsun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 23bac52 SUBMARINE-920. remove submarine-cloud from building progress
23bac52 is described below
commit 23bac52ecc5b39911f4d72f6ec934bb038041d00
Author: brandonlin <br...@verizonmedia.com>
AuthorDate: Thu Jul 15 00:12:41 2021 +0800
SUBMARINE-920. remove submarine-cloud from building progress
### What is this PR for?
since the submarine-cloud module is no longer in used, I remove the related section from building progress.
### What type of PR is it?
Improvement
### Todos
N/A
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-920
### How should this be tested?
This PR shouldn't break any working function.
### Screenshots (if appropriate)
the submarine-cloud module is removed from maven building progress.
<img width="567" alt="ζͺε 2021-07-14 δΈε11 33 48" src="https://user-images.githubusercontent.com/5687317/125653226-1e3a7078-23f5-42a0-b7a9-c27b8204f8f8.png">
### Questions:
* Do the license files need updating? Yes/No
* Are there breaking changes for older versions? Yes/No
* Does this need new documentation? Yes/No
Author: brandonlin <br...@verizonmedia.com>
Signed-off-by: Kai-Hsun Chen <ka...@apache.org>
Closes #679 from FatalLin/SUBMARINE-920 and squashes the following commits:
b3be0d6d [brandonlin] update script
83657fac [brandonlin] remove submarine-cloud from building progress
---
.github/workflows/master.yml | 17 ++++----
dev-support/k8s/deploy-notebook-controller.sh | 62 ---------------------------
dev-support/k8s/deploy-traefik.sh | 59 -------------------------
dev-support/style-check/lint-java.sh | 2 +-
pom.xml | 1 -
submarine-dist/src/assembly/distribution.xml | 13 ------
6 files changed, 9 insertions(+), 145 deletions(-)
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index a89eca7..e6c2aa5 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -31,7 +31,6 @@ env:
EXCLUDE_SUBMITTER_K8S: "!:submarine-submitter-k8s"
EXCLUDE_SUBMITTER: "!:submarine-server-submitter,!:submarine-submitter-k8s,!:submarine-submitter-yarn"
EXCLUDE_COMMONS: "!:submarine-commons-cluster,!:submarine-commons-metastore,!:submarine-commons-rpc,!:submarine-commons-runtime,!:submarine-commons-utils"
- EXCLUDE_CLOUD: "!:submarine-cloud"
EXCLUDE_DIST: "!:submarine-dist"
EXCLUDE_TEST: "!:submarine-test,!:submarine-test-e2e,!:submarine-test-k8s"
EXCLUDE_SPARK_SECURTITY: "!:submarine-spark-security"
@@ -214,7 +213,7 @@ jobs:
java -version
- name: Build
env:
- MODULES: "-pl ${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_SUBMITTER}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLIENT}},${{env.EXCLUDE_CLOUD}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
+ MODULES: "-pl ${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_SUBMITTER}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLIENT}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
run: |
echo ">>> mvn $BUILD_FLAG $MODULES $PROFILE -B"
mvn $BUILD_FLAG $MODULES $PROFILE -B
@@ -259,7 +258,7 @@ jobs:
python3 ./dev-support/database/init-database.py
- name: Build
env:
- MODULES: "-pl ${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_SUBMITTER}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLIENT}},${{env.EXCLUDE_CLOUD}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
+ MODULES: "-pl ${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_SUBMITTER}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLIENT}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
run: |
echo ">>> mvn $BUILD_FLAG $MODULES $PROFILE -B"
mvn $BUILD_FLAG $MODULES $PROFILE -B
@@ -290,7 +289,7 @@ jobs:
java -version
- name: Build
env:
- MODULES: "-pl ${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_SUBMITTER}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLIENT}},${{env.EXCLUDE_CLOUD}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
+ MODULES: "-pl ${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_SUBMITTER}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLIENT}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
run: |
echo ">>> mvn $BUILD_FLAG $MODULES $PROFILE -B"
mvn $BUILD_FLAG $MODULES $PROFILE -B
@@ -321,7 +320,7 @@ jobs:
java -version
- name: Build
env:
- MODULES: "-pl ${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_SUBMITTER}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLIENT}},${{env.EXCLUDE_CLOUD}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
+ MODULES: "-pl ${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_SUBMITTER}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLIENT}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
run: |
echo ">>> mvn $BUILD_FLAG $MODULES $PROFILE -B"
mvn $BUILD_FLAG $MODULES $PROFILE -B
@@ -352,7 +351,7 @@ jobs:
java -version
- name: Build
env:
- MODULES: "-pl ${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_SUBMITTER}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLIENT}},${{env.EXCLUDE_CLOUD}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
+ MODULES: "-pl ${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_SUBMITTER}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLIENT}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
run: |
echo ">>> mvn $BUILD_FLAG $MODULES $PROFILE -B"
mvn $BUILD_FLAG $MODULES $PROFILE -B
@@ -397,7 +396,7 @@ jobs:
python3 ./dev-support/database/init-database.py
- name: Build
env:
- MODULES: "-pl ${{env.EXCLUDE_SUBMITTER_K8S}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLOUD}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
+ MODULES: "-pl ${{env.EXCLUDE_SUBMITTER_K8S}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}}"
run: |
echo ">>> mvn $BUILD_FLAG $MODULES $PROFILE -B"
mvn $BUILD_FLAG $MODULES $PROFILE -B
@@ -467,14 +466,14 @@ jobs:
java -version
- name: Build
env:
- MODULES: "-pl ${{env.EXCLUDE_SUBMITTER_K8S}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLOUD}},${{env.EXCLUDE_DIST}}"
+ MODULES: "-pl ${{env.EXCLUDE_SUBMITTER_K8S}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_DIST}}"
PROFILE: "-Phadoop-${{ matrix.hadoop-version }}"
run: |
echo ">>> mvn $BUILD_FLAG $MODULES $PROFILE -B"
mvn $BUILD_FLAG $MODULES $PROFILE -B
- name: Test
env:
- TEST_MODULES: -pl ${{env.EXCLUDE_SUBMITTER_K8S}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_CLOUD}},${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_SPARK_SECURTITY}}
+ TEST_MODULES: -pl ${{env.EXCLUDE_SUBMITTER_K8S}},${{env.EXCLUDE_WORKBENCH}},${{env.EXCLUDE_COMMONS}},${{env.EXCLUDE_DIST}},${{env.EXCLUDE_TEST}},${{env.EXCLUDE_ALL}},${{env.EXCLUDE_SERVER}},${{env.EXCLUDE_SPARK_SECURTITY}}
PROFILE: "-Phadoop-${{ matrix.hadoop-version }}"
run: |
echo ">>> mvn $TEST_FLAG $TEST_MODULES $PROFILE -B"
diff --git a/dev-support/k8s/deploy-notebook-controller.sh b/dev-support/k8s/deploy-notebook-controller.sh
deleted file mode 100755
index 3ce674d..0000000
--- a/dev-support/k8s/deploy-notebook-controller.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-set -euo pipefail
-
-readonly NOTEBOOK_CONTROLLER_IMAGE="apache/submarine:notebook-controller-v1.1.0-g253890cb"
-
-if [ -L "${BASH_SOURCE-$0}" ]; then
- PWD=$(dirname "$(readlink "${BASH_SOURCE-$0}")")
-else
- PWD=$(dirname "${BASH_SOURCE-$0}")
-fi
-CURRENT_PATH=$(cd "${PWD}">/dev/null; pwd)
-export CURRENT_PATH
-export SUBMARINE_HOME=${CURRENT_PATH}/../..
-# lib.sh use the ROOT variable
-export ROOT="${SUBMARINE_HOME}/submarine-cloud/"
-export KUBECONFIG="${HOME}/.kube/kind-config-${clusterName:-kind}"
-
-# shellcheck source=./../../submarine-cloud/hack/lib.sh
-source "${SUBMARINE_HOME}/submarine-cloud/hack/lib.sh"
-
-###########################################
-# Load local docker image into registry
-# Globals:
-# KIND_BIN
-# Arguments:
-# image
-###########################################
-function load_image_to_registry() {
- if [[ ! $(docker inspect "$1" > /dev/null) ]] ; then
- docker pull "$1"
- fi
- ${KIND_BIN} load docker-image "$1"
-}
-
-
-function main() {
-
- hack::ensure_kubectl
-
- load_image_to_registry "${NOTEBOOK_CONTROLLER_IMAGE}"
- ${KUBECTL_BIN} apply -k "${CURRENT_PATH}/notebook-controller"
-
-}
-
-main "$@"
diff --git a/dev-support/k8s/deploy-traefik.sh b/dev-support/k8s/deploy-traefik.sh
deleted file mode 100755
index 3fb8400..0000000
--- a/dev-support/k8s/deploy-traefik.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-set -euo pipefail
-
-readonly TRAEFIK_IMAGE="traefik:v2.2"
-
-if [ -L "${BASH_SOURCE-$0}" ]; then
- PWD=$(dirname "$(readlink "${BASH_SOURCE-$0}")")
-else
- PWD=$(dirname "${BASH_SOURCE-$0}")
-fi
-CURRENT_PATH=$(cd "${PWD}">/dev/null; pwd)
-export CURRENT_PATH
-export SUBMARINE_HOME=${CURRENT_PATH}/../..
-# lib.sh use the ROOT variable
-export ROOT="${SUBMARINE_HOME}/submarine-cloud/"
-export KUBECONFIG="${HOME}/.kube/kind-config-${clusterName:-kind}"
-
-# shellcheck source=./../../submarine-cloud/hack/lib.sh
-source "${SUBMARINE_HOME}/submarine-cloud/hack/lib.sh"
-
-###########################################
-# Load local docker image into registry
-# Globals:
-# KIND_BIN
-# Arguments:
-# image
-###########################################
-function load_image_to_registry() {
- if [[ ! $(docker inspect "$1" > /dev/null) ]] ; then
- docker pull "$1"
- fi
- ${KIND_BIN} load docker-image "$1"
-}
-
-function main() {
- hack::ensure_kubectl
- echo "Setting up ingress on a kind cluster."
- load_image_to_registry "${TRAEFIK_IMAGE}"
- ${KUBECTL_BIN} apply -k "${CURRENT_PATH}/traefik"
-}
-
-main "@"
diff --git a/dev-support/style-check/lint-java.sh b/dev-support/style-check/lint-java.sh
index 6b1dea6..71d7787 100755
--- a/dev-support/style-check/lint-java.sh
+++ b/dev-support/style-check/lint-java.sh
@@ -18,7 +18,7 @@
#
export MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=512m -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN"
-mvn --no-transfer-progress install -DskipTests -pl "!org.apache.submarine:submarine-cloud"
+mvn --no-transfer-progress install -DskipTests
ERRORS=$(mvn checkstyle:check | grep ERROR)
diff --git a/pom.xml b/pom.xml
index dfe33d4..f5943ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,6 @@
<modules>
<module>submarine-commons</module>
<module>submarine-client</module>
- <module>submarine-cloud</module>
<module>submarine-server</module>
<module>submarine-all</module>
<module>submarine-workbench</module>
diff --git a/submarine-dist/src/assembly/distribution.xml b/submarine-dist/src/assembly/distribution.xml
index fedda9b..ce215fe 100644
--- a/submarine-dist/src/assembly/distribution.xml
+++ b/submarine-dist/src/assembly/distribution.xml
@@ -74,19 +74,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>../submarine-cloud/manifests</directory>
- <outputDirectory>/submarine-cloud/manifests</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../submarine-cloud/hack</directory>
- <outputDirectory>/submarine-cloud/hack</outputDirectory>
- <excludes>
- <exclude>*.go.txt</exclude>
- <exclude>update-codegen.sh</exclude>
- <exclude>verify-codegen.sh</exclude>
- </excludes>
- </fileSet>
- <fileSet>
<directory>../dev-support/database</directory>
<outputDirectory>/dev-support/database</outputDirectory>
</fileSet>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@submarine.apache.org
For additional commands, e-mail: dev-help@submarine.apache.org