Skip to content

Commit

Permalink
Remove whitspace at ends
Browse files Browse the repository at this point in the history
  • Loading branch information
xwang2713 committed Sep 23, 2019
1 parent 1fb6ddf commit 56c8498
Show file tree
Hide file tree
Showing 79 changed files with 171 additions and 439 deletions.
4 changes: 2 additions & 2 deletions Deployment/dp-1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This is a simple stateless deployment scenario. It can be used to both local and real cloud, such as AWS.

## Prerequisities
- Bootstrap
- Bootstrap
AWS:
```console
bin/bootstrap-aws.sh
Expand Down Expand Up @@ -107,4 +107,4 @@ bin/cluster-run status
## Delete Cluster ###
```console
./stop
```
```
2 changes: 1 addition & 1 deletion Deployment/dp-1/admin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec: # specification of the pod’s contents
volumeMounts:
- mountPath: /etc/hpcc_config_map
name: env-config
command: ["/opt/hpcc-tools/run"]
command: ["/opt/hpcc-tools/run"]
args: ["-e", "kube"]
#args: ["-D"]
volumes:
Expand Down
4 changes: 2 additions & 2 deletions Deployment/dp-1/esp-e1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ spec: # specification of the pod’s contents
app: esp-esp1
spec:
containers:
- name: esp-esp1
- name: esp-esp1
image: "hpccsystems/platform"
ports:
- name: eclwatch
containerPort: 8010
containerPort: 8010
- name: eclwatch-https
containerPort: 18010
- name: wsecl
Expand Down
2 changes: 1 addition & 1 deletion Deployment/ebs/ebs-1/admin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec: # specification of the pod’s contents
volumeMounts:
- mountPath: /etc/hpcc_config_map
name: env-config
command: ["/opt/hpcc-tools/run"]
command: ["/opt/hpcc-tools/run"]
args: ["-e", "kube"]
#args: ["-D"]
volumes:
Expand Down
4 changes: 2 additions & 2 deletions Deployment/ebs/ebs-1/esp-e1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ spec: # specification of the pod’s contents
app: esp-esp1
spec:
containers:
- name: esp-esp1
- name: esp-esp1
image: "hpccsystems/platform"
ports:
- name: eclwatch
containerPort: 8010
containerPort: 8010
- name: eclwatch-https
containerPort: 18010
- name: wsecl
Expand Down
Empty file modified Deployment/ebs/ebs-1/start
100644 → 100755
Empty file.
Empty file modified Deployment/ebs/ebs-1/stop
100644 → 100755
Empty file.
4 changes: 1 addition & 3 deletions Deployment/efs/efs-1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Current deployment has Sasha/DropZone in support Pod.
Even EFS performance may not be good as EBS but EFS it is very convenient such as:
- Don't need worry about cross AZz
- Easy to share and re-use data
- Don't need to worry to delete volume after deleting Pod.
- Don't need to worry to delete volume after deleting Pod.

EFS is little expensive than EBS.

Expand Down Expand Up @@ -170,5 +170,3 @@ bin/cluster-run status
./stop
```
This does not delete volumes. Either use AWS Client or go to EC2 console to delete them.


2 changes: 1 addition & 1 deletion Deployment/efs/efs-1/admin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec: # specification of the pod’s contents
volumeMounts:
- mountPath: /etc/hpcc_config_map
name: env-config
command: ["/opt/hpcc-tools/run"]
command: ["/opt/hpcc-tools/run"]
args: ["-e", "kube"]
#args: ["-D"]
volumes:
Expand Down
1 change: 0 additions & 1 deletion Deployment/efs/efs-1/dali.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ spec: # specification of the pod’s contents
- name: dali-data
persistentVolumeClaim:
claimName: efs

16 changes: 8 additions & 8 deletions Deployment/efs/efs-1/esp-e1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@ spec: # specification of the pod’s contents
app: esp-esp1
spec:
containers:
- name: esp-esp1
- name: esp-esp1
image: "hpccsystems/platform"
ports:
- name: eclwatch
containerPort: 8010
containerPort: 8010
- name: eclwatch-https
containerPort: 18010
containerPort: 18010
- name: wsecl
containerPort: 8010
containerPort: 8010
- name: wsecl-https
containerPort: 18010
containerPort: 18010
- name: wssql
containerPort: 8510
containerPort: 8510
- name: wsssql-https
containerPort: 18510
containerPort: 18510
- name: confmgr
containerPort: 8015
containerPort: 8015
3 changes: 1 addition & 2 deletions Deployment/efs/efs-1/roxie-r1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ spec: # specification of the pod’s contents
- name: roxie-secure
containerPort: 19876
volumeMounts:
- name: roxie1-efs-pvc
- name: roxie1-efs-pvc
mountPath: "/var/lib/HPCCSystems/hpcc-data"
volumes:
- name: roxie1-efs-pvc
persistentVolumeClaim:
claimName: efs

5 changes: 2 additions & 3 deletions Deployment/efs/efs-1/roxie-r2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Deployment
metadata:
name: roxie-roxie2
spec: # specification of the pod’s contents
replicas: 1
replicas: 1
selector:
matchLabels:
app: roxie-roxie2
Expand All @@ -21,10 +21,9 @@ spec: # specification of the pod’s contents
- name: roxie-secure
containerPort: 19876
volumeMounts:
- name: roxie2-efs-pvc
- name: roxie2-efs-pvc
mountPath: "/var/lib/HPCCSystems/hpcc-data"
volumes:
- name: roxie2-efs-pvc
persistentVolumeClaim:
claimName: efs

20 changes: 10 additions & 10 deletions Pod/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ kubectl create -f hpcc.yaml
For single node deployment HPCC is not started. you can start it as:
```sh
kubectl exec hpcc -- /etc/init.d/hpcc-init start
Starting mydafilesrv ... [ OK ]
Starting mydali ... [ OK ]
Starting mydfuserver ... [ OK ]
Starting myeclagent ... [ OK ]
Starting myeclccserver ... [ OK ]
Starting myeclscheduler ... [ OK ]
Starting myesp ... [ OK ]
Starting myroxie ... [ OK ]
Starting mysasha ... [ OK ]
Starting mythor ... [ OK ]
Starting mydafilesrv ... [ OK ]
Starting mydali ... [ OK ]
Starting mydfuserver ... [ OK ]
Starting myeclagent ... [ OK ]
Starting myeclccserver ... [ OK ]
Starting myeclscheduler ... [ OK ]
Starting myesp ... [ OK ]
Starting myroxie ... [ OK ]
Starting mysasha ... [ OK ]
Starting mythor ... [ OK ]
```
You also can access the contain to run commands:
```sh
Expand Down
4 changes: 2 additions & 2 deletions Pod/hpcc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ spec: # specification of the pod’s contents
ports:
- name: eclwatch
containerPort: 8010
- name: eclwatch-https
containerPort: 18010
- name: eclwatch-https
containerPort: 18010
- name: wsecl
containerPort: 8002
- name: wsecl-https
Expand Down
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ We currently tested two cloud environments: [AWS/EKS](./aws/EKS/README.md) and [
## Bootstrap
Bootstrap will grant access permission for Kubernetes APIs as well create configmap for environmet.xml configuration
Depands on the Kubernetes environment configmap files may be different. Currently there is aws/configmap/hpcc for AWS environment and the other one is local/configmap/hpcc for local deployment.
In bin directory
In bin directory
```sh
# AWS
bin/bootstrap-aws.sh
Expand All @@ -23,22 +23,22 @@ bin/bootstrap-local.sh
or on Windows
bootstrap.bat
```
User can modify security/cluster_role.yaml and files under configmap/hpcc
User can modify security/cluster_role.yaml and files under configmap/hpcc

## Pod
Deploy HPCC Systems Platform on single node
Reference [README.md](Pod/README.md)

## Deployment
Deploy HPCC Systems cluster with Deployment Pod definition.
Deploy HPCC Systems cluster with Deployment Pod definition.
Reference [README.md](Deployment/dp-1/README.md)

## RelicationController
Deploy HPCC Systems cluster with RelicationController Pod definition.
Deploy HPCC Systems cluster with RelicationController Pod definition.
It is recommended to use "Deployment" instead

## [StatefulSet](StatefulSet/README.md)
Deploy HPCC Systems cluster with StatefulSet Pod definition.
Deploy HPCC Systems cluster with StatefulSet Pod definition.
It includs ebs and nfs examples
Reference
. [EBS README.md](StatefulSet/ebs/ebs-1/README.md)
Expand All @@ -64,9 +64,8 @@ RBAC settings for Kubernetes environment
AWS related settings

## elastic
Filebeat, Metricbeat, etc example on local Kubernetes environment.
Filebeat, Metricbeat, etc example on local Kubernetes environment.
Still in progress ...

## performance
To do
.
24 changes: 12 additions & 12 deletions ReplicationController/rc-1/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Deploy Cluster with ReplicationController
"Deployment" is prefered

## Start a Cluster
```console
./start
```

## Stop a Cluster
```console
./stop
```
# Deploy Cluster with ReplicationController
"Deployment" is prefered

## Start a Cluster
```console
./start
```

## Stop a Cluster
```console
./stop
```
2 changes: 1 addition & 1 deletion ReplicationController/rc-1/admin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec: # specification of the pod’s contents
volumeMounts:
- mountPath: /etc/hpcc_config_map
name: env-config
command: ["/opt/hpcc-tools/run"]
command: ["/opt/hpcc-tools/run"]
args: ["-e", "kube"]
#args: ["-D"]
volumes:
Expand Down
4 changes: 2 additions & 2 deletions ReplicationController/rc-1/esp-e1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ spec: # specification of the pod’s contents
app: esp-esp1
spec:
containers:
- name: esp-esp1
- name: esp-esp1
image: "hpccsystems/platform"
ports:
- name: eclwatch
containerPort: 8010
containerPort: 8010
- name: eclwatch-https
containerPort: 18010
- name: wsecl
Expand Down
16 changes: 8 additions & 8 deletions StatefulSet/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Deploy HPCC Systems cluster with StatefulSet

## Deployment Types

- [EBS](ebs/ebs-1/README.md)
- [EFS](efs/efs-1/README.md)

## Performance Comparison
# Deploy HPCC Systems cluster with StatefulSet

## Deployment Types

- [EBS](ebs/ebs-1/README.md)
- [EFS](efs/efs-1/README.md)

## Performance Comparison
2 changes: 0 additions & 2 deletions StatefulSet/ebs/ebs-1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,5 +145,3 @@ bin/cluster-run status
./stop
```
This does not delete volumes. Either use AWS Client or go to EC2 console to delete them.


2 changes: 1 addition & 1 deletion StatefulSet/ebs/ebs-1/admin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec: # specification of the pod’s contents
volumeMounts:
- mountPath: /etc/hpcc_config_map
name: env-config
command: ["/opt/hpcc-tools/run"]
command: ["/opt/hpcc-tools/run"]
args: ["-e", "kube"]
#args: ["-D"]
volumes:
Expand Down
14 changes: 7 additions & 7 deletions StatefulSet/ebs/ebs-1/esp-e1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ spec: # specification of the pod’s contents
app: esp-esp1
spec:
containers:
- name: esp-esp1
- name: esp-esp1
image: "hpccsystems/platform"
ports:
- name: eclwatch
containerPort: 8010
containerPort: 8010
- name: eclwatch-https
containerPort: 18010
containerPort: 18010
- name: wsecl
containerPort: 8002
containerPort: 8002
- name: wsecl-https
containerPort: 18002
containerPort: 18002
- name: wssql
containerPort: 8510
containerPort: 8510
- name: wssql-https
containerPort: 18510
containerPort: 18510
2 changes: 1 addition & 1 deletion StatefulSet/ebs/ebs-1/roxie-r1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: svc-roxie-roxie1
# namespace: default
labels:
app: roxie-roxie1
app: roxie-roxie1
spec:
selector:
app: svc-roxie-roxie1
Expand Down
2 changes: 1 addition & 1 deletion StatefulSet/ebs/ebs-1/roxie-r2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec: # specification of the pod’s contents
image: "hpccsystems/platform"
volumeMounts:
- mountPath: "/var/lib/HPCCSystems"
name: ebs
name: ebs
volumeClaimTemplates:
- metadata:
name: ebs
Expand Down
Binary file removed StatefulSet/efs/efs-1/.support.yaml.swp
Binary file not shown.
4 changes: 2 additions & 2 deletions StatefulSet/efs/efs-1/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Deploy Dali/Sasha/DropZone/Roxie/Thor Pods as StatefulSet/EFS

Current deployment has Sasha/DropZone in support Pod.
Current deployment has Sasha/DropZone in support Pod.
Attach ReadWriteMany EFS to Pods doesn't need StatefulSet. See Deployment/efs/efs-1/README.md. But for ReadWriteOnce EFS StatefulSet is required which is this setup about.


Expand Down Expand Up @@ -69,7 +69,7 @@ To check clustr status:
```console
bin/cluster_run.sh status
```
## Access EclWatch
## Access EclWatch
Get esp public ip:
```console
kubectl get services
Expand Down
2 changes: 1 addition & 1 deletion StatefulSet/efs/efs-1/admin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec: # specification of the pod’s contents
volumeMounts:
- mountPath: /etc/hpcc_config_map
name: env-config
command: ["/opt/hpcc-tools/run"]
command: ["/opt/hpcc-tools/run"]
args: ["-e", "kube"]
#args: ["-D"]
volumes:
Expand Down
1 change: 0 additions & 1 deletion StatefulSet/efs/efs-1/dali.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ spec: # specification of the pod’s contents
- name: dali-data
persistentVolumeClaim:
claimName: efs

Loading

0 comments on commit 56c8498

Please sign in to comment.