Skip to content

Commit

Permalink
Add more configmap files
Browse files Browse the repository at this point in the history
  • Loading branch information
xwang2713 committed Sep 23, 2019
1 parent 98d681a commit 1fb6ddf
Show file tree
Hide file tree
Showing 25 changed files with 178 additions and 20 deletions.
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# HPCC-Kubernetes
## Reliable, Scaleble HPCC on Kubernetes
# Kubernetes Playground for HPCC Systems Products

This repo has several HPCC Systems Cluster examples on Kubernetes


## Prerequisites

Install kubectl https://kubernetes.io/docs/tasks/tools/install-kubectl/
For general kubectl installation reference https://kubernetes.io/docs/tasks/tools/install-kubectl/

We currently tested two cloud environments: [AWS/EKS](./aws/EKS/README.md) and [Local](./local/README.md)


## Bootstrap
Expand Down Expand Up @@ -52,6 +52,8 @@ Reference [README.md](istio/demo/README.md)

Helm Charts for HPCC Systems Cluster (Experimental)

Under construction

## local
Local Kubernetes setup instruction

Expand All @@ -64,4 +66,7 @@ AWS related settings
## elastic
Filebeat, Metricbeat, etc example on local Kubernetes environment.
Still in progress ...

## performance
To do
.
36 changes: 36 additions & 0 deletions aws/configmap/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# ConfigMap for HPCC Systems Cluster Configuration

Users can provide customerized settings for environment.xml generation through Kubernetes Configmap.

ConfigMap is created with bin/bootstrap-xxx.sh or bin/bootstrap.bat
The files are available on hpcc-admin container under /etc/hpcc-config-map/

Following configuration are availble now
Under hpcc directory:

### topology.properties
This file defines how topology in environment.xml can be constructed

### category.properties
Add/modify Software/Category directories as "-o" option in envgen/envgen2

### override.envgen2
Override all component properties with the give xpath for the given buildset with the value provided. This is "-override" option in envgen/envgen2


### xpath_attributes.envgen2
Sets or add the xpath attribue and value. This is "-set-xpath-attrib-value" of envgen/envgen2

### [component].envgen2
Add/modify component settings with envgen2 syntax
<HPCC Systems Platform Install Dir>/sbin/envgen2 [-help-update-1 ! -help-update-2] will show some examples

### contents/*.xml
These xml files will be inserted to environment.xml to xpath provided in <!-- XPATH: --> in the file
These files will be sorted first so users can use file names to control the execution order.






8 changes: 8 additions & 0 deletions aws/configmap/hpcc/category.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Software Category settings

# Examples:
# log=/var/log/[NAME]/INST]
# this will be created in environent.xml as <Category dir="/var/log/[NAME]/INST]" name="log"/>

# data=/var/lib/[NAME]/hpcc-data/[COMPONENT]
# mirror=/var/lib/[NAME]/hpcc-mirror/[COMPONENT]
8 changes: 8 additions & 0 deletions aws/configmap/hpcc/contents/machine.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#<!--XPATH: Hardware -->

<ComputerType computerType="PowerEdge"
manufacturer="Dell"
name="dell-server-1"
nicSpeed="1000"
opSys="linux"/>

4 changes: 4 additions & 0 deletions aws/configmap/hpcc/ldap.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#Modify environment with envgen2 syntax.
#There are override.envgen2 and xpath_attributes.envgen2 for use "-override" and "-set-xpath-attrib-value" respectly

-add sw:ldap#myldap@esp=myesp^adminGroupName=HPCCAdmins160^cacheTimeout=5^filesBasedn=\\\"ou[equal]files,ou[equal]ecl,ou[equal]hpcc\\\"^groupsBasedn=\\\"ou[equal]groups,ou[equal]hpcc\\\"
10 changes: 10 additions & 0 deletions aws/configmap/hpcc/override.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Override attribute values like in envgen
# -override "espsmc,@enableSystemUseRewrite,ture"
# Give a setting per line:

#espsmc,@enableSystemUseRewrite,ture
roxie,@copyResources,true
roxie,@roxieMulticastEnabled,false
thor,@replicateOutputs,true
esp,@method,htpasswd

2 changes: 2 additions & 0 deletions aws/configmap/hpcc/roxie.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Modify environment with envgen2 syntax.
#There are override.envgen2 and xpath_attributes.envgen2 for use "-override" and "-set-xpath-attrib-value" respectly
3 changes: 0 additions & 3 deletions aws/configmap/hpcc/roxie.properties

This file was deleted.

2 changes: 2 additions & 0 deletions aws/configmap/hpcc/support.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Modify environment with envgen2 syntax.
#There are override.envgen2 and xpath_attributes.envgen2 for use "-override" and "-set-xpath-attrib-value" respectly
4 changes: 4 additions & 0 deletions aws/configmap/hpcc/thor.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#Modify environment with envgen2 syntax.
#There are override.envgen2 and xpath_attributes.envgen2 for use "-override" and "-set-xpath-attrib-value" respectly

#-mod thor@slavesPerNode=8^globalMemorySize=8192
7 changes: 7 additions & 0 deletions aws/configmap/hpcc/xpath_attributes.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Set attribute values with Xpath like in envgen
# Give one setting per line with commas as column seperator in chance column value has space:

#Software/Topology/Cluster[@name=\\\"thor\\\"]/ThorCluster,@process,thor123
Software/RoxieCluster/",roxieMulticastEnabled,false


2 changes: 1 addition & 1 deletion bin/bootstrap-local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

WORK_DIR=$(dirname $0)
. ${WORK_DIR}/common
${KUBECTL} create configmap hpcc-config --from-file=${WORK_DIR}/../local/configmap/hpcc/
${KUBECTL} create configmap hpcc-config --from-file=${WORK_DIR}/../local/configmap/hpcc/ --from-file=${WORK_DIR}/../local/configmap/hpcc/contents/
${KUBECTL} apply -f ${WORK_DIR}/../security/cluster_role.yaml
6 changes: 6 additions & 0 deletions istio/demo/security/rbac/eclwatch-bind.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ metadata:
spec:
subjects:
- user: "*"
# Instead of user host can be used
#- properties:
#source.ip: 0.0.0.0/0 # every host
# This works . The host is in 172.17.0.x
#source.ip: 172.17.0.0/24

roleRef:
kind: ServiceRole
name: "eclwatch"
Expand Down
36 changes: 36 additions & 0 deletions local/configmap/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# ConfigMap for HPCC Systems Cluster Configuration

Users can provide customerized settings for environment.xml generation through Kubernetes Configmap.

ConfigMap is created with bin/bootstrap-xxx.sh or bin/bootstrap.bat
The files are available on hpcc-admin container under /etc/hpcc-config-map/

Following configuration are availble now
Under hpcc directory:

### topology.properties
This file defines how topology in environment.xml can be constructed

### category.properties
Add/modify Software/Category directories as "-o" option in envgen/envgen2

### override.envgen2
Override all component properties with the give xpath for the given buildset with the value provided. This is "-override" option in envgen/envgen2


### xpath_attributes.envgen2
Sets or add the xpath attribue and value. This is "-set-xpath-attrib-value" of envgen/envgen2

### [component].envgen2
Add/modify component settings with envgen2 syntax
<HPCC Systems Platform Install Dir>/sbin/envgen2 [-help-update-1 ! -help-update-2] will show some examples

### contents/*.xml
These xml files will be inserted to environment.xml to xpath provided in <!-- XPATH: --> in the file
These files will be sorted first so users can use file names to control the execution order.






7 changes: 0 additions & 7 deletions local/configmap/examples/game.properties

This file was deleted.

4 changes: 0 additions & 4 deletions local/configmap/examples/ui.properties

This file was deleted.

8 changes: 8 additions & 0 deletions local/configmap/hpcc/category.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Software Category settings

# Examples:
# log=/var/log/[NAME]/INST]
# this will be created in environent.xml as <Category dir="/var/log/[NAME]/INST]" name="log"/>

# data=/var/lib/[NAME]/hpcc-data/[COMPONENT]
# mirror=/var/lib/[NAME]/hpcc-mirror/[COMPONENT]
8 changes: 8 additions & 0 deletions local/configmap/hpcc/contents/machine.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#<!--XPATH: Hardware -->

<ComputerType computerType="PowerEdge"
manufacturer="Dell"
name="dell-server-1"
nicSpeed="1000"
opSys="linux"/>

4 changes: 4 additions & 0 deletions local/configmap/hpcc/ldap.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#Modify environment with envgen2 syntax.
#There are override.envgen2 and xpath_attributes.envgen2 for use "-override" and "-set-xpath-attrib-value" respectly

-add sw:ldap#myldap@esp=myesp^adminGroupName=HPCCAdmins160^cacheTimeout=5^filesBasedn=\\\"ou[equal]files,ou[equal]ecl,ou[equal]hpcc\\\"^groupsBasedn=\\\"ou[equal]groups,ou[equal]hpcc\\\"
11 changes: 11 additions & 0 deletions local/configmap/hpcc/override.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Override attribute values like in envgen
# -override "espsmc,@enableSystemUseRewrite,ture"
# Give a setting per line:

#espsmc,@enableSystemUseRewrite,ture
#roxie,@roxieMulticastEnabled,false
#esp,@method,htpasswd

roxie,@copyResources,true
thor,@replicateOutputs,true

2 changes: 2 additions & 0 deletions local/configmap/hpcc/roxie.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Modify environment with envgen2 syntax.
#There are override.envgen2 and xpath_attributes.envgen2 for use "-override" and "-set-xpath-attrib-value" respectly
2 changes: 2 additions & 0 deletions local/configmap/hpcc/support.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Modify environment with envgen2 syntax.
#There are override.envgen2 and xpath_attributes.envgen2 for use "-override" and "-set-xpath-attrib-value" respectly
4 changes: 4 additions & 0 deletions local/configmap/hpcc/thor.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#Modify environment with envgen2 syntax.
#There are override.envgen2 and xpath_attributes.envgen2 for use "-override" and "-set-xpath-attrib-value" respectly

#-mod thor@slavesPerNode=8^globalMemorySize=8192
7 changes: 7 additions & 0 deletions local/configmap/hpcc/xpath_attributes.envgen2
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Set attribute values with Xpath like in envgen
# Give one setting per line with commas as column seperator in chance column value has space:

#Software/Topology/Cluster[@name=\\\"thor\\\"]/ThorCluster,@process,thor123
#Software/RoxieCluster/",roxieMulticastEnabled,false


2 changes: 0 additions & 2 deletions local/configmap/readme

This file was deleted.

0 comments on commit 1fb6ddf

Please sign in to comment.