From 38070796ff5e5ec167e55fce2509c6e71735a7aa Mon Sep 17 00:00:00 2001 From: Sandy Gao Date: Mon, 31 Aug 2020 11:18:47 -0400 Subject: [PATCH] Add license files and update some hetu occurrences to openlookeng --- docker/Dockerfile | 4 +- docker/bin/run-hetu | 13 ++++ docker/bin/shutdown-hetu | 13 ++++ docker/build-local.sh | 17 ++++- docker/container-test.sh | 13 ++++ docker/default/etc/catalog/jmx.properties | 13 ++++ docker/default/etc/catalog/memory.properties | 13 ++++ docker/default/etc/catalog/tpcds.properties | 13 ++++ docker/default/etc/catalog/tpch.properties | 13 ++++ docker/default/etc/config.properties | 13 ++++ docker/default/etc/log.properties | 13 ++++ docker/default/etc/node.properties | 13 ++++ hetu-samples/docker-swarm/README.md | 28 ++++---- hetu-samples/docker-swarm/deployment.yaml | 51 ++++++++------ hetu-samples/kubernetes/README.md | 27 +++++--- hetu-samples/kubernetes/deployment.yaml | 73 ++++++++++++-------- 16 files changed, 250 insertions(+), 80 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3cfa5f7e1..7d800674d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -# +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. # Licensed 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 @@ -10,7 +10,7 @@ # 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. -# + ARG BASE_IMAGE=centos:centos7 FROM $BASE_IMAGE LABEL maintainer="OpenLooKeng Community" diff --git a/docker/bin/run-hetu b/docker/bin/run-hetu index 3430fe20b..07babf12f 100755 --- a/docker/bin/run-hetu +++ b/docker/bin/run-hetu @@ -1,5 +1,18 @@ #!/bin/bash +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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 -xeuo pipefail CONFIG_PATH='/usr/lib/hetu/etc' diff --git a/docker/bin/shutdown-hetu b/docker/bin/shutdown-hetu index 3a8d4dd60..0260750ce 100755 --- a/docker/bin/shutdown-hetu +++ b/docker/bin/shutdown-hetu @@ -1,5 +1,18 @@ #!/bin/bash +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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. + # Read Hetu port number from config file. Default to 8080. HETU_PORT= CONFIG_FILE='/usr/lib/hetu/etc/config.properties' diff --git a/docker/build-local.sh b/docker/build-local.sh index b6109ee3f..54814654a 100755 --- a/docker/build-local.sh +++ b/docker/build-local.sh @@ -1,4 +1,18 @@ #!/usr/bin/env bash + +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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. + CUSTOM_TAG= BASE_IMAGE="centos:centos7" TAG=$(date +%s) @@ -33,6 +47,7 @@ if [[ $IS_GIT_FOLDER = true ]] && [[ -z "$CUSTOM_TAG" ]]; then echo "Changes not committed, couldn't retrive a unique HASH for tagging" exit else + # By default, tag the image using the latest git commit hash, e.g. openlookeng:23555bf9 TAG=$(git rev-parse HEAD | cut -c 1-8) fi fi @@ -60,8 +75,6 @@ cp -R bin default ${WORK_DIR}/hetu-server-${HETU_VERSION} cp ../presto-cli/target/hetu-cli-${HETU_VERSION}-executable.jar ${WORK_DIR} -# tag the image using both the Hetu version and the latest git commit hash -# i.e.) hetu:316-23555bf9 docker build ${WORK_DIR} -f Dockerfile --build-arg "OPENLK_VERSION=${HETU_VERSION}" --build-arg "BASE_IMAGE=${BASE_IMAGE}" -t "openlookeng:${TAG}" rm -r ${WORK_DIR} diff --git a/docker/container-test.sh b/docker/container-test.sh index 3b88a9741..05372c656 100755 --- a/docker/container-test.sh +++ b/docker/container-test.sh @@ -1,5 +1,18 @@ #!/usr/bin/env bash +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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 -euxo pipefail CONTAINER_ID= diff --git a/docker/default/etc/catalog/jmx.properties b/docker/default/etc/catalog/jmx.properties index b6e0372bb..e83998cac 100644 --- a/docker/default/etc/catalog/jmx.properties +++ b/docker/default/etc/catalog/jmx.properties @@ -1 +1,14 @@ +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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. + connector.name=jmx diff --git a/docker/default/etc/catalog/memory.properties b/docker/default/etc/catalog/memory.properties index 833abd3fb..f6b1351ca 100644 --- a/docker/default/etc/catalog/memory.properties +++ b/docker/default/etc/catalog/memory.properties @@ -1 +1,14 @@ +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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. + connector.name=memory diff --git a/docker/default/etc/catalog/tpcds.properties b/docker/default/etc/catalog/tpcds.properties index 366f0a59e..25c9e80b2 100644 --- a/docker/default/etc/catalog/tpcds.properties +++ b/docker/default/etc/catalog/tpcds.properties @@ -1,2 +1,15 @@ +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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. + connector.name=tpcds tpcds.splits-per-node=4 diff --git a/docker/default/etc/catalog/tpch.properties b/docker/default/etc/catalog/tpch.properties index 599f5ec6e..72bc1c1e8 100644 --- a/docker/default/etc/catalog/tpch.properties +++ b/docker/default/etc/catalog/tpch.properties @@ -1,2 +1,15 @@ +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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. + connector.name=tpch tpch.splits-per-node=4 diff --git a/docker/default/etc/config.properties b/docker/default/etc/config.properties index 2fbc094db..aa4af4f2b 100644 --- a/docker/default/etc/config.properties +++ b/docker/default/etc/config.properties @@ -1,3 +1,16 @@ +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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. + #single node install config coordinator=true node-scheduler.include-coordinator=true diff --git a/docker/default/etc/log.properties b/docker/default/etc/log.properties index 277714c3b..91bcbf5b9 100644 --- a/docker/default/etc/log.properties +++ b/docker/default/etc/log.properties @@ -1,2 +1,15 @@ +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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. + # Enable verbose logging from Hetu #io.hetu.core=DEBUG diff --git a/docker/default/etc/node.properties b/docker/default/etc/node.properties index ef8576c72..b5d0bbd71 100644 --- a/docker/default/etc/node.properties +++ b/docker/default/etc/node.properties @@ -1,3 +1,16 @@ +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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. + node.environment=default node.id= node.data-dir=/var/lib/hetu/data diff --git a/hetu-samples/docker-swarm/README.md b/hetu-samples/docker-swarm/README.md index e268b5aa0..592249b39 100644 --- a/hetu-samples/docker-swarm/README.md +++ b/hetu-samples/docker-swarm/README.md @@ -1,40 +1,38 @@ -Assuming a Hetu docker image already exists, e.g. one built by `/hetu-core/docker/build-local.sh`. +Assuming an openLooKeng docker image already exists, e.g. one built by `/hetu-core/docker/build-local.sh`. -Update the [deployment.yaml](./deployment.yaml) file and replace _all_ occurrences of `{{ imageTag }}` with the tag of Hetu docker image. +Update the [deployment.yaml](./deployment.yaml) file and replace _all_ occurrences of `{{ imageTag }}` with the tag of the docker image. -### Deploy a Hetu cluster +### Deploy an openLooKeng cluster ``` docker stack deploy -f deployment.yaml ``` -The cluster consists of 1 coordinator and 2 worker containers in the "hetu1" network. +The cluster consists of 1 coordinator and 2 worker containers in the "openlk1" network. -### Delete the Hetu cluster +### Delete the openLooKeng cluster ``` docker stack rm ``` ### Additional configurations -- Need a "File manager" that helps docker swarm host the new configuration files among the swarm environment, -since docker swarm doesn't have that service built-in -- New configuration files must be accessible as soon as a container starts (need to make sure files are mounted as if -one is using docker swarm `config`) +- Need a "File manager" that helps docker swarm host the new configuration files among the swarm environment, since docker swarm doesn't have that service built-in +- New configuration files must be accessible as soon as a container starts (need to make sure files are mounted as if one is using docker swarm `config`) -To supply additional configuration files to be used by Hetu (e.g. `config.properties` or `log.properties`): +To supply additional configuration files to be used (e.g. `config.properties` or `log.properties`): -- Store these filed in a folder (this folder should only contain these configuration files) +- Store these files in a folder (this folder should only contain these configuration files) - Mount the folder of new configuration files to each container (do it in the way required by your "File Manager") -- Inform Hetu containers where to look for the mounted folder using flag `-configDir` in the `command` list -- Delete and redeploy Hetu cluster (the cluster must be deleted first for configuration changes to take place) +- Inform openLooKeng containers where to look for the mounted folder using flag `-configDir` in the `command` list +- Delete and redeploy openLooKeng cluster (the cluster must be deleted first for configuration changes to take place) ### Additional catalogs To connect to data sources through additional catalog files: - Place these files inside a `catalog` folder under the configuration file folder above -- Inform Hetu containers where to look for the mounted folder using flag `-configDir` in the `command` list -- Delete and redeploy Hetu cluster +- Inform openLooKeng containers where to look for the mounted folder using flag `-configDir` in the `command` list +- Delete and redeploy openLooKeng cluster If there are other files that are needed by the new catalogs: - Store them in a different folder (e.g. `etc`) under the above configuration folder (that is, parallel to `catalog`) diff --git a/hetu-samples/docker-swarm/deployment.yaml b/hetu-samples/docker-swarm/deployment.yaml index e2472235b..f8c021c26 100644 --- a/hetu-samples/docker-swarm/deployment.yaml +++ b/hetu-samples/docker-swarm/deployment.yaml @@ -1,16 +1,29 @@ +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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. + # Assuming this machine has a local copy of the following in the same directory as the docker-compose.yml # - A hdfs_configs directory containing default Hive connector configuration files version: "3.7" services: - # Hetu Engine - coordinator node + # openLooKeng Engine - coordinator node coordinator: - image: hetu:{{ imageTag }} + image: openlookeng:{{ imageTag }} ports: - "8080:8080" # mount config files for hive connector networks: - - hetu1 + - openlk1 # configs: # - source: hive_prop # target: /usr/lib/hetu/etc/catalog/hive.properties @@ -18,15 +31,15 @@ services: # target: /opt/hdfs_configs/core-site.xml # - source: hive_hdfs_site # target: /opt/hdfs_configs/hdfs-site.xml - command: ["-t","coordinator","-nodeEnv","hetu1","-includeCoordinator","false"] + command: ["-t","coordinator","-nodeEnv","openlk1","-includeCoordinator","false"] # coordinator1: -# image: hetu:{{ imageTag }} +# image: openlookeng:{{ imageTag }} # ports: # - "8081:8080" # # mount config files for hive connector # networks: -# - hetu2 +# - openlk2 ## configs: ## - source: hive_prop ## target: /usr/lib/hetu/etc/catalog/hive.properties @@ -34,16 +47,16 @@ services: ## target: /opt/hdfs_configs/core-site.xml ## - source: hive_hdfs_site ## target: /opt/hdfs_configs/hdfs-site.xml -# command: ["-t","coordinator","-nodeEnv","hetu2","-includeCoordinator","false"] +# command: ["-t","coordinator","-nodeEnv","openlk2","-includeCoordinator","false"] - # Hetu Engine - worker node + # openLooKeng Engine - worker node worker: - image: hetu:{{ imageTag }} + image: openlookeng:{{ imageTag }} depends_on: - coordinator # mount config files for hive connector networks: - - hetu1 + - openlk1 # configs: # - source: hive_prop # target: /usr/lib/hetu/etc/catalog/hive.properties @@ -54,15 +67,15 @@ services: deploy: replicas: 2 # -discoveryURI need to be full path; hostname must align with the coordinator service node - command: ["-t", "worker","-nodeEnv","hetu1","-discoveryURI","http://coordinator:8080"] + command: ["-t", "worker","-nodeEnv","openlk1","-discoveryURI","http://coordinator:8080"] # worker1: -# image: hetu:{{ imageTag }} +# image: openlookeng:{{ imageTag }} # depends_on: # - coordinator1 # # mount config files for hive connector # networks: -# - hetu2 +# - openlk2 ## configs: ## - source: hive_prop ## target: /usr/lib/hetu/etc/catalog/hive.properties @@ -73,8 +86,7 @@ services: # deploy: # replicas: 2 # # -discoveryURI need to be full path; hostname must align with the coordinator service node -# command: ["-t", "worker","-nodeEnv","hetu2","-discoveryURI","http://coordinator1:8080"] - +# command: ["-t", "worker","-nodeEnv","openlk2","-discoveryURI","http://coordinator1:8080"] # # Hive # # must be named as hadoop-master @@ -84,9 +96,8 @@ services: # ports: # - "9083:9083" # networks: -# - hetu1 -# - hetu2 - +# - openlk1 +# - openlk2 #configs: # hive_prop: @@ -97,9 +108,9 @@ services: # file: ${PWD}/hdfs_configs/hdfs-site.xml networks: - hetu1: + openlk1: driver: overlay attachable: true -# hetu2: +# openlk2: # driver: overlay # attachable: true diff --git a/hetu-samples/kubernetes/README.md b/hetu-samples/kubernetes/README.md index c116aed7c..090ba6a59 100644 --- a/hetu-samples/kubernetes/README.md +++ b/hetu-samples/kubernetes/README.md @@ -1,16 +1,16 @@ -Assuming a Hetu docker image already exists, e.g. one built by `/hetu-core/docker/build-local.sh`. +Assuming an openLooKeng docker image already exists, e.g. one built by `/hetu-core/docker/build-local.sh`. -Update the [deployment.yaml](./deployment.yaml) file and replace _both_ occurrences of `{{ imageTag }}` with the tag of Hetu docker image. +Update the [deployment.yaml](./deployment.yaml) file and replace _all_ occurrences of `{{ imageTag }}` with the tag of the docker image. -### Deploy a Hetu cluster +### Deploy an openLooKeng cluster ``` kubectl create -f deployment.yaml ``` -The cluster consists of 1 coordinator and 2 worker pods in the "hetu" namespace. +The cluster consists of 1 coordinator and 2 worker pods in the "openlk" namespace. -### Delete the Hetu cluster +### Delete the openLooKeng cluster ``` kubectl delete -f deployment.yaml @@ -18,18 +18,23 @@ kubectl delete -f deployment.yaml ### Additional configurations -To supply additional configuration files to be used by Hetu (e.g. `config.properties` or `log.properties`): -- Store these filed in a folder (this folder should only contain these configuration files) +To supply additional configuration files to be used (e.g. `config.properties` or `log.properties`): + +- Store these files in a folder (this folder should only contain these configuration files) - Locate comments that read `TODO: update to point to additional configuration and catalog folder` - Update the `path` value to poin to the above folder -- Delete and redeploy Hetu cluster (the cluster must be deleted first for configuration changes to take place) +- Delete and redeploy openLooKeng cluster (the cluster must be deleted first for configuration changes to take place) + +Notes: +- The above uses `hostPath` to supply configuration files from a mounted local drive. This only works when deploying to a _local_ Kubernetes cluster. To deploy to a remote Kubernetes cluster, configuration files may need to be supplied as Kubernetes `configMaps`. +- Ensure configuration files and subfolders have appropriate permissions to allow non-root users to read. ### Additional catalogs To connect to data sources through additional catalog files: - Place these files inside a `catalog` folder under the configuration file folder above - Ensure `path` points to the configuration folder -- Delete and redeploy Hetu cluster +- Delete and redeploy openLooKeng cluster If there are other files that are needed by the new catalogs: - Store them in a different folder (e.g. `etc`) under the above configuration folder (that is, parallel to `catalog`) @@ -37,7 +42,7 @@ If there are other files that are needed by the new catalogs: ### Enable graceful shutdown -When a Hetu pod is shutdown, by default it's terminated immediately. To enable graceful shutdown, where the pod waits for all its active work to finish first: +When an openLooKeng pod is shutdown, by default it's terminated immediately. To enable graceful shutdown, where the pod waits for all its active work to finish first: - Locate comments that read `# TODO: enable if graceful shutdown is needed` - Uncomment lines following the above comment - Redeploy with @@ -46,7 +51,7 @@ When a Hetu pod is shutdown, by default it's terminated immediately. To enable g kubectl apply -f deployment.yaml ``` -With this change, it'll take at least a few minutes to kill any Hetu pod, because the graceful shutdown process needs to ensure no work is affected by shutting down the node. To shorten the wait period, the following line can be added to `config.properties`. See steps above about how to use custom configuration files. +With this change, it'll take at least a few minutes to kill any openLooKeng pod, because the graceful shutdown process needs to ensure no work is affected by shutting down the node. To shorten the wait period, the following line can be added to `config.properties`. See steps above about how to use custom configuration files. ``` shutdown.grace-period=10s diff --git a/hetu-samples/kubernetes/deployment.yaml b/hetu-samples/kubernetes/deployment.yaml index 9d701cb47..c70353b20 100644 --- a/hetu-samples/kubernetes/deployment.yaml +++ b/hetu-samples/kubernetes/deployment.yaml @@ -1,17 +1,30 @@ -#### Hetu namespace #### +# Copyright (C) 2020. Huawei Technologies Co., Ltd. All rights reserved. +# Licensed 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. + +#### openlk namespace #### --- apiVersion: v1 kind: Namespace metadata: - name: hetu + name: openlk -#### Hetu service #### +#### openLooKeng service #### --- apiVersion: v1 kind: Service metadata: - name: hetu - namespace: hetu + name: openlk + namespace: openlk spec: type: NodePort ports: @@ -19,20 +32,20 @@ spec: targetPort: 8080 nodePort: 30321 selector: - app: hetu-coordinator + app: openlk-coordinator #### coordinator #### --- apiVersion: apps/v1 kind: Deployment metadata: - name: hetu-coordinator - namespace: hetu + name: openlk-coordinator + namespace: openlk spec: replicas: 1 selector: matchLabels: - app: hetu-coordinator + app: openlk-coordinator strategy: type: RollingUpdate rollingUpdate: @@ -41,16 +54,16 @@ spec: template: metadata: labels: - app: hetu-coordinator + app: openlk-coordinator spec: # TODO: enable if graceful shutdown is needed # terminationGracePeriodSeconds: 3600 containers: - - name: hetu-coordinator - image: hetu:{{ imageTag }} + - name: openlk-coordinator + image: openlookeng:{{ imageTag }} imagePullPolicy: IfNotPresent - # Update "jvmXmx" value according to memory allocation below. Suggest 75~80% of total memory limit. - args: ["-t", "coordinator", "-configDir", "/custom-configs", "-jvmXmx", "1500M"] + # Update "jvmXmx" value according to memory allocation below. Suggest 60~70% of total memory limit. + args: ["-t", "coordinator", "-configDir", "/custom-configs", "-jvmXmx", "1300M"] resources: requests: cpu: 1 @@ -71,20 +84,20 @@ spec: - name: custom-configs-volume hostPath: # TODO: update to point to additional configuration and catalog folder - path: /hetu/hetu-core/hetu-samples/kubernetes/config-coordinator + path: /hetu-core/hetu-samples/kubernetes/config-coordinator #### worker #### --- apiVersion: apps/v1 kind: Deployment metadata: - name: hetu-worker - namespace: hetu + name: openlk-worker + namespace: openlk spec: replicas: 2 selector: matchLabels: - app: hetu-worker + app: openlk-worker strategy: type: RollingUpdate rollingUpdate: @@ -93,16 +106,16 @@ spec: template: metadata: labels: - app: hetu-worker + app: openlk-worker spec: # TODO: enable if graceful shutdown is needed # terminationGracePeriodSeconds: 600 containers: - - name: hetu-worker - image: hetu:{{ imageTag }} + - name: openlk-worker + image: openlookeng:{{ imageTag }} imagePullPolicy: IfNotPresent - # Update "jvmXmx" value according to memory allocation below. Suggest 75~80% of total memory limit. - args: ["-t", "worker", "-discoveryURI", "http://hetu:8080", "-configDir", "/custom-configs", "-jvmXmx", "1500M"] + # Update "jvmXmx" value according to memory allocation below. Suggest 60~70% of total memory limit. + args: ["-t", "worker", "-discoveryURI", "http://openlk:8080", "-configDir", "/custom-configs", "-jvmXmx", "1300M"] resources: requests: cpu: 1 @@ -123,7 +136,7 @@ spec: - name: custom-configs-volume hostPath: # TODO: update to point to additional configuration and catalog folder - path: /hetu/hetu-core/hetu-samples/kubernetes/config-worker + path: /hetu-core/hetu-samples/kubernetes/config-worker # TODO: enable for coordinator auto-scaling #### HPA for coordinator #### @@ -131,13 +144,13 @@ spec: # apiVersion: autoscaling/v2beta2 # kind: HorizontalPodAutoscaler # metadata: -# name: hetu-coordinator-scaler -# namespace: hetu +# name: openlk-coordinator-scaler +# namespace: openlk # spec: # scaleTargetRef: # apiVersion: apps/v1 # kind: Deployment -# name: hetu-coordinator +# name: openlk-coordinator # minReplicas: 1 # maxReplicas: 2 # metrics: @@ -158,13 +171,13 @@ spec: # apiVersion: autoscaling/v2beta2 # kind: HorizontalPodAutoscaler # metadata: -# name: hetu-worker-scaler -# namespace: hetu +# name: openlk-worker-scaler +# namespace: openlk # spec: # scaleTargetRef: # apiVersion: apps/v1 # kind: Deployment -# name: hetu-worker +# name: openlk-worker # minReplicas: 1 # maxReplicas: 5 # metrics: