issue JPPF-589 first working version of jppf cluster helm chart

JPPF/bin/docker/fetch-logs.sh

@@ -1,5 +1,6 @@
 #! /bin/bash
 
+d=0
 n=0
 list=$(docker ps -a | grep jppf | awk '{printf "%s ",$NF} END {print ""}')
 echo "list = $list"
@@ -8,9 +9,11 @@ do
   echo "i = $i"
   name=$i
   if [[ $i = *driver* ]]; then
-    docker exec -ti $name cat jppf-driver.log > jppf-driver.log
-  else
+    d=$(( d + 1 ))
+    #docker exec -ti $name cat jppf-driver.log > jppf-driver.log
+    $(docker exec -ti $name cat jppf-driver.log > jppf-driver-$d.log)
+  elif [[ $i = *node* ]]; then
     n=$(( n + 1 ))
     $(docker exec -ti $name cat jppf-node.log > jppf-node-$n.log)
   fi
-done
+done

JPPF/bin/docker/fetch-stdouts.sh

@@ -1,15 +1,17 @@
 #! /bin/bash
 
+d=0
 n=0
 list=$(docker ps -a | grep jppf | awk '{printf "%s ",$NF} END {print ""}')
 for i in ${list}
 do
   echo "i = $i"
   name=$i
   if [[ $i = *driver* ]]; then
-    docker logs --details $name > jppf-driver.out.log
-  else
+    d=$(( d + 1 ))
+    docker logs --details $name > jppf-driver-$d.out.log
+  elif [[ $i = *node* ]]; then
     n=$(( n + 1 ))
     docker logs --details $name > jppf-node-$n.out.log
   fi
-done
+done

JPPF/bin/docker/k8s/jppf-driver/Chart.yaml → JPPF/bin/docker/k8s/jppf/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 
-name: jppf-driver
+name: jppf
 home: https://www.jppf.org
 
 version: 6.2-alpha

JPPF/bin/docker/k8s/jppf-driver/templates/_helpers.tpl → JPPF/bin/docker/k8s/jppf/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "jppf-driver.name" -}}
+{{- define "jppf.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "jppf-driver.fullname" -}}
+{{- define "jppf.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "jppf-driver.chart" -}}
+{{- define "jppf.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Common labels
 */}}
-{{- define "jppf-driver.labels" -}}
-app.kubernetes.io/name: {{ include "jppf-driver.name" . }}
-helm.sh/chart: {{ include "jppf-driver.chart" . }}
+{{- define "jppf.labels" -}}
+app.kubernetes.io/name: {{ include "jppf.name" . }}
+helm.sh/chart: {{ include "jppf.chart" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}

JPPF/bin/docker/k8s/jppf-driver/templates/deployment.yaml → JPPF/bin/docker/k8s/jppf/templates/driver-deployment.yaml

@@ -1,34 +1,36 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "jppf-driver.fullname" . }}
+  #name: {{ include "jppf.fullname" . }}-driver
+  name: {{ .Chart.Name }}-driver
   labels:
-{{ include "jppf-driver.labels" . | indent 4 }}
+{{ include "jppf.labels" . | indent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ .Values.driver.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "jppf-driver.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ include "jppf.name" . }}-driver
+      app.kubernetes.io/instance: {{ .Release.Name }}-driver
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "jppf-driver.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/name: {{ include "jppf.name" . }}-driver
+        app.kubernetes.io/instance: {{ .Release.Name }}-driver
     spec:
+      hostname: {{ .Values.driver.hostname }}
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "jppf/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.registryName }}/{{ .Values.driver.imageRepository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: JPPF_SUBNET
               value: {{ .Values.jppf.subnet }}
             - name: JPPF_DRIVER_JVM_OPTIONS
-              value: {{ .Values.jppf.driverJvmOptions }}
+              value: {{ .Values.driver.jvmOptions }}
             - name: JPPF_VERSION
               value: {{ .Values.jppf.version }}
           ports:

JPPF/bin/docker/k8s/jppf/templates/driver-service.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+
+metadata:
+  name: jppf-driver-service
+
+spec:
+  ports:
+  - port: 11111
+    targetPort: jppf
+    protocol: TCP
+
+  selector:
+      app.kubernetes.io/name: {{ include "jppf.name" . }}-driver
+      app.kubernetes.io/instance: {{ .Release.Name }}-driver
+
+  type: NodePort

JPPF/bin/docker/k8s/jppf/templates/node-deployment.yaml

@@ -0,0 +1,51 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  #name: {{ include "jppf.fullname" . }}-node
+  name: {{ .Chart.Name }}-node
+  labels:
+{{ include "jppf.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.node.replicaCount }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "jppf.name" . }}-node
+      app.kubernetes.io/instance: {{ .Release.Name }}-node
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "jppf.name" . }}-node
+        app.kubernetes.io/instance: {{ .Release.Name }}-node
+    spec:
+    {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.registryName }}/{{ .Values.node.imageRepository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: JPPF_SUBNET
+              value: {{ .Values.jppf.subnet }}
+            - name: JPPF_NODE_JVM_OPTIONS
+              value: {{ .Values.node.jvmOptions }}
+            - name: JPPF_VERSION
+              value: {{ .Values.jppf.version }}
+            - name: JPPF_SERVER_HOST
+              value: {{ .Values.driver.hostname }}-service
+              #value: {{ .Values.driver.hostname }}.{{ .Release.Namespace }}.svc.cluster.local
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}

JPPF/bin/docker/k8s/jppf/values.yaml

@@ -0,0 +1,25 @@
+# Default values for jppf-driver.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+
+driver:
+  imageRepository: jppf-driver
+  jvmOptions: "-Xmx256m -Xms64m"
+  replicaCount: 1
+  hostname: jppf-driver
+
+node:
+  imageRepository: jppf-node
+  jvmOptions: "-Xmx128m -Xms32m"
+  replicaCount: 2
+
+image:
+  registryName: jppf
+  tag: 6.2-alpha
+  pullPolicy: IfNotPresent
+
+jppf:
+  subnet: "172.16.238.0/24"
+  version: "6.2-alpha"
+