diff --git a/Deployment/ebs/ebs-1/README.md b/Deployment/ebs/ebs-1/README.md new file mode 100644 index 0000000..b1bdabd --- /dev/null +++ b/Deployment/ebs/ebs-1/README.md @@ -0,0 +1,3 @@ +# Deployment with EBS +Only one PersistentVolumeClaim created per Deployment yaml file + diff --git a/Deployment/ebs/ebs-1/admin.yaml b/Deployment/ebs/ebs-1/admin.yaml new file mode 100644 index 0000000..4100977 --- /dev/null +++ b/Deployment/ebs/ebs-1/admin.yaml @@ -0,0 +1,21 @@ +apiVersion: v1 +kind: Pod +metadata: + name: hpcc-admin +spec: # specification of the pod’s contents + restartPolicy: Never + containers: + - name: hpcc-admin + image: "hpccsystems/hpcc-admin" + ports: + - containerPort: 8010 + volumeMounts: + - mountPath: /etc/hpcc_config_map + name: env-config + command: ["/opt/hpcc-tools/run"] + args: ["-e", "kube"] + #args: ["-D"] + volumes: + - name: env-config + configMap: + name: hpcc-config diff --git a/Deployment/ebs/ebs-1/dali.yaml b/Deployment/ebs/ebs-1/dali.yaml new file mode 100644 index 0000000..4bc3e2f --- /dev/null +++ b/Deployment/ebs/ebs-1/dali.yaml @@ -0,0 +1,28 @@ +apiVersion: v1 +kind: Pod +metadata: + name: dali +spec: # specification of the pod’s contents + restartPolicy: Never + containers: + - name: dali + image: "hpccsystems/platform" + volumeMounts: + - mountPath: "/var/lib/HPCCSystems" + name: dali-data + volumes: + - name: dali-data + persistentVolumeClaim: + claimName: ebs-dali +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: ebs-dali +spec: + accessModes: + - ReadWriteOnce + storageClassName: gp2 + resources: + requests: + storage: 40Gi diff --git a/Deployment/ebs/ebs-1/esp-e1-hpa.yaml b/Deployment/ebs/ebs-1/esp-e1-hpa.yaml new file mode 100644 index 0000000..dc86269 --- /dev/null +++ b/Deployment/ebs/ebs-1/esp-e1-hpa.yaml @@ -0,0 +1,14 @@ +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: esp-e1 + #namespace: default +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: esp-e1 + minReplicas: 1 + maxReplicas: 4 + targetCPUUtilizationPercentage: 50 + #targetCPUUtilizationPercentage: 5 # for easy to test diff --git a/Deployment/ebs/ebs-1/esp-e1.yaml b/Deployment/ebs/ebs-1/esp-e1.yaml new file mode 100644 index 0000000..5001eb1 --- /dev/null +++ b/Deployment/ebs/ebs-1/esp-e1.yaml @@ -0,0 +1,51 @@ +apiVersion: v1 +kind: Service +metadata: + name: ew-esp1 +# namespace: default +spec: + selector: + app: esp-esp1 + ports: + - protocol: TCP + port: 8010 + targetPort: 8010 + #nodePort: 31000 #local + type: + LoadBalancer + #NodePort #local +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: esp-esp1 + labels: + app: esp-esp1 +spec: # specification of the pod’s contents + replicas: 1 + selector: + matchLabels: + app: esp-esp1 + cluster: esp1 + template: + metadata: + labels: + cluster: esp1 + app: esp-esp1 + spec: + containers: + - name: esp-esp1 + image: "hpccsystems/platform" + ports: + - name: eclwatch + containerPort: 8010 + - name: eclwatch-https + containerPort: 18010 + - name: wsecl + containerPort: 8002 + - name: wsecl-https + containerPort: 18002 + - name: wssql + containerPort: 8510 + - name: wssql-https + containerPort: 18510 diff --git a/Deployment/ebs/ebs-1/roxie-r1.yaml b/Deployment/ebs/ebs-1/roxie-r1.yaml new file mode 100644 index 0000000..39b632f --- /dev/null +++ b/Deployment/ebs/ebs-1/roxie-r1.yaml @@ -0,0 +1,45 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: roxie-roxie1 + labels: + app: roxie-roxie1 +spec: # specification of the pod’s contents + replicas: 1 + selector: + matchLabels: + app: roxie-roxie1 + cluster: roxie1 + template: + metadata: + labels: + app: roxie-roxie1 + cluster: roxie1 + spec: + containers: + - name: roxie-roxie1 + image: "hpccsystems/platform" + ports: + - name: roxie + containerPort: 9876 + - name: roxie-secure + containerPort: 19876 + volumeMounts: + - mountPath: "/var/lib/HPCCSystems" + name: roxie1-data + volumes: + - name: roxie1-data + persistentVolumeClaim: + claimName: ebs-roxie1 + +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: ebs-roxie1 +spec: + accessModes: [ "ReadWriteOnce" ] + storageClassName: gp2 + resources: + requests: + storage: 40Gi diff --git a/Deployment/ebs/ebs-1/start b/Deployment/ebs/ebs-1/start new file mode 100644 index 0000000..6e9b08e --- /dev/null +++ b/Deployment/ebs/ebs-1/start @@ -0,0 +1,9 @@ +#!/bin/bash +WORK_DIR=$(dirname $0) +. ${WORK_DIR}/../../../bin/common + +${KUBECTL} create -f admin.yaml +${KUBECTL} create -f dali.yaml +${KUBECTL} create -f support.yaml +${KUBECTL} create -f esp-e1.yaml +${KUBECTL} create -f roxie-r1.yaml diff --git a/Deployment/ebs/ebs-1/stop b/Deployment/ebs/ebs-1/stop new file mode 100644 index 0000000..6ecc0c4 --- /dev/null +++ b/Deployment/ebs/ebs-1/stop @@ -0,0 +1,14 @@ +#!/bin/bash +WORK_DIR=$(dirname $0) +. ${WORK_DIR}/../../../bin/common + + +${KUBECTL} delete -f admin.yaml +${KUBECTL} delete -f support.yaml +${KUBECTL} delete -f esp-e1.yaml +${KUBECTL} delete -f roxie-r1.yaml + +kubectl get pvc | grep "^ebs-"| cut -d' ' -f1 | while read name +do + ${KUBECTL} delete pvc $name +done diff --git a/Deployment/ebs/ebs-1/support.yaml b/Deployment/ebs/ebs-1/support.yaml new file mode 100644 index 0000000..3dddf1e --- /dev/null +++ b/Deployment/ebs/ebs-1/support.yaml @@ -0,0 +1,39 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: support + labels: + app: support +spec: # specification of the pod’s contents + replicas: 1 + selector: + matchLabels: + app: support + cluster: support + template: + metadata: + labels: + app: support + cluster: support + spec: + containers: + - name: support + image: "hpccsystems/platform" + volumeMounts: + - mountPath: "/var/lib/HPCCSystems" + name: support-data + volumes: + - name: support-data + persistentVolumeClaim: + claimName: ebs-support +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: ebs-support +spec: + accessModes: [ "ReadWriteOnce" ] + storageClassName: gp2 + resources: + requests: + storage: 40Gi diff --git a/aws/configmap/hpcc/topology.properties b/aws/configmap/hpcc/topology.properties index 47df382..5f8fee5 100644 --- a/aws/configmap/hpcc/topology.properties +++ b/aws/configmap/hpcc/topology.properties @@ -8,12 +8,12 @@ #.eclccserver= # default is myeclccserver #.eclscheduler= # default is myeclscheduler #... -t1.name=t1 -t1.eclagent=myeclagent -t1.eclccserver=myeclccserver -t1.eclscheduler=myeclscheduler +thor1.name=t1 +thor1.eclagent=myeclagent +thor1.eclccserver=myeclccserver +thor1.eclscheduler=myeclscheduler -r1.name=r1 +roxie1.name=r1 #Will use default values for the rest -r2.name=r2 +roxie2.name=r2 diff --git a/charts/README.md b/charts/README.md new file mode 100644 index 0000000..d78c5c3 --- /dev/null +++ b/charts/README.md @@ -0,0 +1,3 @@ +helm install --name hpcc-cluster ./hpcc-dp +helm list +helm delete hpcc-cluster diff --git a/charts/hpcc-dp/.helmignore b/charts/hpcc-dp/.helmignore new file mode 100644 index 0000000..50af031 --- /dev/null +++ b/charts/hpcc-dp/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/hpcc-dp/Chart.yaml b/charts/hpcc-dp/Chart.yaml new file mode 100644 index 0000000..fb679af --- /dev/null +++ b/charts/hpcc-dp/Chart.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +name: hpccsystems +version: 1.0.0 +appVersion: 7.4.14 +description: End-to-end big data in a massively scalable supercomputing platform. +home: http://hpccsystems.com +icon: https://hpccsystems.com/sites/default/files/header-logo_0.png +sources: + - https://github.com/hpcc-systems/HPCC-Platform +maintainers: + - name: Wang,Xiaoming + email: xiaoming.wang@lexisnexis.com \ No newline at end of file diff --git a/charts/hpcc-dp/templates/NOTES.txt b/charts/hpcc-dp/templates/NOTES.txt new file mode 100644 index 0000000..e69de29 diff --git a/charts/hpcc-dp/templates/_helpers.tpl b/charts/hpcc-dp/templates/_helpers.tpl new file mode 100644 index 0000000..2bddaed --- /dev/null +++ b/charts/hpcc-dp/templates/_helpers.tpl @@ -0,0 +1,33 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "chart-name" -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} + {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create fully qualified names. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +*/}} +{{- define "hpccsystems-fullname" -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "hpccsystems-chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "hpccsystems-name" -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- printf "%s-%s" .Release.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} diff --git a/charts/hpcc-dp/templates/admin.yaml b/charts/hpcc-dp/templates/admin.yaml new file mode 100644 index 0000000..4100977 --- /dev/null +++ b/charts/hpcc-dp/templates/admin.yaml @@ -0,0 +1,21 @@ +apiVersion: v1 +kind: Pod +metadata: + name: hpcc-admin +spec: # specification of the pod’s contents + restartPolicy: Never + containers: + - name: hpcc-admin + image: "hpccsystems/hpcc-admin" + ports: + - containerPort: 8010 + volumeMounts: + - mountPath: /etc/hpcc_config_map + name: env-config + command: ["/opt/hpcc-tools/run"] + args: ["-e", "kube"] + #args: ["-D"] + volumes: + - name: env-config + configMap: + name: hpcc-config diff --git a/charts/hpcc-dp/templates/cluster-roles.yaml b/charts/hpcc-dp/templates/cluster-roles.yaml new file mode 100644 index 0000000..d04511d --- /dev/null +++ b/charts/hpcc-dp/templates/cluster-roles.yaml @@ -0,0 +1,37 @@ +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: hpcc-rbac +rules: +- apiGroups: [""] + resources: ["persistentvolumes"] + verbs: ["get", "list", "watch", "create", "delete"] +- apiGroups: [""] + resources: ["persistentvolumeclaims"] + verbs: ["get", "list", "watch", "update"] +- apiGroups: ["storage.k8s.io"] + resources: ["storageclasses"] + verbs: ["get", "list", "watch"] +- apiGroups: [""] + resources: ["events"] + verbs: ["list", "watch", "create", "update", "patch"] +- apiGroups: [""] + resources: ["endpoints"] + verbs: ["get", "list", "watch", "create", "update", "patch"] +- apiGroups: [""] + resources: ["pods"] + #verbs: ["get", "watch", "list"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: hpcc-rbac +subjects: +- kind: ServiceAccount + name: default + namespace: default +roleRef: + kind: ClusterRole + name: pods-list + apiGroup: rbac.authorization.k8s.io diff --git a/charts/hpcc-dp/templates/configmap.yaml b/charts/hpcc-dp/templates/configmap.yaml new file mode 100644 index 0000000..1c5b78c --- /dev/null +++ b/charts/hpcc-dp/templates/configmap.yaml @@ -0,0 +1,25 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "hpccsystems-fullname" . }} + labels: + app: {{ include "hpccsystems-name" . }} + chart: {{ include "hpccsystems-chart" . }} + release: {{ .Release.Name }} +data: + topology.properties: | + thor1.name=t1 + thor1.eclagent=myeclagent + thor1.eclccserver=myeclccserver + thor1.eclscheduler=myeclscheduler + + roxie1.name=r1 + #Will use default values for the rest + # + #roxie2.name=r2 + + {{- if (eq "aws" .Values.cloud.type) }} + roxie.properties: | + default.roxieMulticastEnabled=false + {{- end }} + diff --git a/charts/hpcc-dp/templates/esp-e1-autoscale.yaml b/charts/hpcc-dp/templates/esp-e1-autoscale.yaml new file mode 100644 index 0000000..dc86269 --- /dev/null +++ b/charts/hpcc-dp/templates/esp-e1-autoscale.yaml @@ -0,0 +1,14 @@ +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: esp-e1 + #namespace: default +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: esp-e1 + minReplicas: 1 + maxReplicas: 4 + targetCPUUtilizationPercentage: 50 + #targetCPUUtilizationPercentage: 5 # for easy to test diff --git a/charts/hpcc-dp/templates/esp-e1.yaml b/charts/hpcc-dp/templates/esp-e1.yaml new file mode 100644 index 0000000..5001eb1 --- /dev/null +++ b/charts/hpcc-dp/templates/esp-e1.yaml @@ -0,0 +1,51 @@ +apiVersion: v1 +kind: Service +metadata: + name: ew-esp1 +# namespace: default +spec: + selector: + app: esp-esp1 + ports: + - protocol: TCP + port: 8010 + targetPort: 8010 + #nodePort: 31000 #local + type: + LoadBalancer + #NodePort #local +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: esp-esp1 + labels: + app: esp-esp1 +spec: # specification of the pod’s contents + replicas: 1 + selector: + matchLabels: + app: esp-esp1 + cluster: esp1 + template: + metadata: + labels: + cluster: esp1 + app: esp-esp1 + spec: + containers: + - name: esp-esp1 + image: "hpccsystems/platform" + ports: + - name: eclwatch + containerPort: 8010 + - name: eclwatch-https + containerPort: 18010 + - name: wsecl + containerPort: 8002 + - name: wsecl-https + containerPort: 18002 + - name: wssql + containerPort: 8510 + - name: wssql-https + containerPort: 18510 diff --git a/charts/hpcc-dp/templates/roxie-r1.yaml b/charts/hpcc-dp/templates/roxie-r1.yaml new file mode 100644 index 0000000..33d8177 --- /dev/null +++ b/charts/hpcc-dp/templates/roxie-r1.yaml @@ -0,0 +1,26 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: roxie-roxie1 + labels: + app: roxie-roxie1 +spec: # specification of the pod’s contents + replicas: 1 + selector: + matchLabels: + app: roxie-roxie1 + cluster: roxie1 + template: + metadata: + labels: + app: roxie-roxie1 + cluster: roxie1 + spec: + containers: + - name: roxie-roxie1 + image: "hpccsystems/platform" + ports: + - name: roxie + containerPort: 9876 + - name: roxie-secure + containerPort: 19876 diff --git a/charts/hpcc-dp/templates/support.yaml b/charts/hpcc-dp/templates/support.yaml new file mode 100644 index 0000000..4d4d6c7 --- /dev/null +++ b/charts/hpcc-dp/templates/support.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: support + labels: + app: support +spec: # specification of the pod’s contents + replicas: 1 + selector: + matchLabels: + app: support + cluster: support + template: + metadata: + labels: + app: support + cluster: support + spec: + containers: + - name: support + image: "hpccsystems/platform" diff --git a/charts/hpcc-dp/templates/thor-t1.yaml b/charts/hpcc-dp/templates/thor-t1.yaml new file mode 100644 index 0000000..c0c2988 --- /dev/null +++ b/charts/hpcc-dp/templates/thor-t1.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: thor-thor1 + labels: + app: thor-thor1 +spec: # specification of the pod’s contents + replicas: 1 + selector: + matchLabels: + app: thor-thor1 + cluster: thor1 + template: + metadata: + labels: + app: thor-thor1 + cluster: thor1 + spec: + containers: + - name: thor-thor1 + image: "hpccsystems/platform" diff --git a/charts/hpcc-dp/templates/thormaster-t1.yaml b/charts/hpcc-dp/templates/thormaster-t1.yaml new file mode 100644 index 0000000..e2ae660 --- /dev/null +++ b/charts/hpcc-dp/templates/thormaster-t1.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Pod +metadata: + name: thormaster-thor1 +spec: # specification of the pod’s contents + restartPolicy: Never + containers: + - name: thormaster-thor1 + image: "hpccsystems/platform" diff --git a/charts/hpcc-dp/values.yaml b/charts/hpcc-dp/values.yaml new file mode 100644 index 0000000..e29f004 --- /dev/null +++ b/charts/hpcc-dp/values.yaml @@ -0,0 +1,5 @@ +# Default values for hpcc-dp. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. +cloud: + type: aws diff --git a/charts/tiller-rbac.sh b/charts/tiller-rbac.sh new file mode 100644 index 0000000..ff1fef7 --- /dev/null +++ b/charts/tiller-rbac.sh @@ -0,0 +1,3 @@ +kubectl create serviceaccount --namespace kube-system tiller +kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller +kubectl patch deploy --namespace kube-system tiller-deploy -p '{"spec":{"template":{"spec":{"serviceAccount":"tiller"}}}}' diff --git a/elastic/elastic-1/roxie-r1.yaml b/elastic/elastic-1/roxie-r1.yaml index fe2e9b3..f2f8ae5 100644 --- a/elastic/elastic-1/roxie-r1.yaml +++ b/elastic/elastic-1/roxie-r1.yaml @@ -1,21 +1,21 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: roxie-r1 + name: roxie-roxie1 labels: - app: roxie-r1 + app: roxie-roxie1 spec: # specification of the pod’s contents replicas: 1 selector: matchLabels: - app: roxie-r1 - cluster: r1 + app: roxie-roxie1 + cluster: roxie1 template: metadata: labels: - app: roxie-r1 - cluster: r1 + app: roxie-roxie1 + cluster: roxie1 spec: containers: - - name: roxie-r1 + - name: roxie-roxie1 image: "hpccsystems/hpcc-elastic" diff --git a/istio/demo/roxie-r1.yaml b/istio/demo/roxie-r1.yaml index 1f7f2b5..94bc7f4 100644 --- a/istio/demo/roxie-r1.yaml +++ b/istio/demo/roxie-r1.yaml @@ -1,34 +1,34 @@ apiVersion: v1 kind: Service metadata: - name: roxie-r1 + name: roxie-roxie1 # namespace: default labels: - app: roxie-r1 - service: roxie-r1 + app: roxie-roxie1 + service: roxie-roxie1 spec: selector: - app: roxie-r1 + app: roxie-roxie1 clusterIP: None --- apiVersion: apps/v1 kind: Deployment metadata: - name: roxie-r1 + name: roxie-roxie1 labels: - app: roxie-r1 + app: roxie-roxie1 spec: # specification of the pod’s contents replicas: 1 selector: matchLabels: - app: roxie-r1 - cluster: r1 + app: roxie-roxie1 + cluster: roxie1 template: metadata: labels: - app: roxie-r1 - cluster: r1 + app: roxie-roxie1 + cluster: roxie1 spec: containers: - - name: roxie-r1 + - name: roxie-roxie1 image: "hpccsystems/platform" diff --git a/istio/demo/thor-t1.yaml b/istio/demo/thor-t1.yaml index d0ce25b..78ded6a 100644 --- a/istio/demo/thor-t1.yaml +++ b/istio/demo/thor-t1.yaml @@ -1,31 +1,31 @@ apiVersion: v1 kind: Service metadata: - name: svc-thor-t1 + name: svc-thor-thor1 # namespace: default spec: selector: - app: thor-t1 + app: thor-thor1 clusterIP: None --- apiVersion: apps/v1 kind: Deployment metadata: - name: thor-t1 + name: thor-thor1 labels: - app: thor-t1 + app: thor-thor1 spec: # specification of the pod’s contents replicas: 1 selector: matchLabels: - app: thor-t1 - cluster: t1 + app: thor-thor1 + cluster: thor1 template: metadata: labels: - app: thor-t1 - cluster: t1 + app: thor-thor1 + cluster: thor1 spec: containers: - - name: thor-t1 + - name: thor-thor1 image: "hpccsystems/platform" diff --git a/istio/demo/thormaster-t1.yaml b/istio/demo/thormaster-t1.yaml index e155783..e2ae660 100644 --- a/istio/demo/thormaster-t1.yaml +++ b/istio/demo/thormaster-t1.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Pod metadata: - name: thormaster-t1 + name: thormaster-thor1 spec: # specification of the pod’s contents restartPolicy: Never containers: - - name: thormaster-t1 + - name: thormaster-thor1 image: "hpccsystems/platform" diff --git a/local/configmap/hpcc/topology.properties b/local/configmap/hpcc/topology.properties index 47df382..5f8fee5 100644 --- a/local/configmap/hpcc/topology.properties +++ b/local/configmap/hpcc/topology.properties @@ -8,12 +8,12 @@ #.eclccserver= # default is myeclccserver #.eclscheduler= # default is myeclscheduler #... -t1.name=t1 -t1.eclagent=myeclagent -t1.eclccserver=myeclccserver -t1.eclscheduler=myeclscheduler +thor1.name=t1 +thor1.eclagent=myeclagent +thor1.eclccserver=myeclccserver +thor1.eclscheduler=myeclscheduler -r1.name=r1 +roxie1.name=r1 #Will use default values for the rest -r2.name=r2 +roxie2.name=r2 diff --git a/local/hpcc_dns/roxie-r1.yaml b/local/hpcc_dns/roxie-r1.yaml index bb1adc9..5abf076 100644 --- a/local/hpcc_dns/roxie-r1.yaml +++ b/local/hpcc_dns/roxie-r1.yaml @@ -1,16 +1,16 @@ apiVersion: v1 kind: ReplicationController metadata: - name: roxie-r1 + name: roxie-roxie1 spec: # specification of the pod’s contents replicas: 1 selector: - cluster: r1 + cluster: roxie1 template: metadata: labels: - cluster: r1 + cluster: roxie1 spec: containers: - - name: roxie-r1 + - name: roxie-roxie1 image: "hpccsystems/hpcc:7.2.20-1" diff --git a/local/hpcc_dns/thor-t1.yaml b/local/hpcc_dns/thor-t1.yaml index ecca69b..1c0caec 100644 --- a/local/hpcc_dns/thor-t1.yaml +++ b/local/hpcc_dns/thor-t1.yaml @@ -1,16 +1,16 @@ apiVersion: v1 kind: ReplicationController metadata: - name: thor-t1 + name: thor-thor1 spec: # specification of the pod’s contents replicas: 1 selector: - cluster: t1 + cluster: thor1 template: metadata: labels: - cluster: t1 + cluster: thor1 spec: containers: - - name: thor-t1 + - name: thor-thor1 image: "hpccsystems/hpcc:7.2.20-1" diff --git a/local/hpcc_dns/thormaster-t1.yaml b/local/hpcc_dns/thormaster-t1.yaml index 5ff8e20..9bc9406 100644 --- a/local/hpcc_dns/thormaster-t1.yaml +++ b/local/hpcc_dns/thormaster-t1.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Pod metadata: - name: thormaster-t1 + name: thormaster-thor1 spec: # specification of the pod’s contents restartPolicy: Never containers: - - name: thormaster-t1 + - name: thormaster-thor1 image: "hpccsystems/hpcc:7.2.20-1"