Skip to content

Commit 0aef51c

Browse files
lgrateaulgrateau
committed
Fix TCPIP Port in the MiniKube deployment descriptor and close #34 
1 parent d0b2560 commit 0aef51c

15 files changed

+111
-56
lines changed

‎MiniKube/odm-standard-minikube.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,12 @@ spec:
9393
run: odm-decisionserverconsole
9494
type: NodePort
9595
ports:
96-
- protocol: TCP
96+
- name: http
97+
protocol: TCP
9798
port: 9080
99+
- name: notification
100+
protocol: TCP
101+
port: 1883
98102
---
99103
apiVersion: extensions/v1beta1 # for versions before 1.6.0 use extensions/v1beta1
100104
kind: Deployment

‎helm/stable/odmcharts/templates/NOTES.txt‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ For more informations about this template you can take a look in this github htt
55
ODM Informations
66
-----------------
77

8-
Username/Password :
8+
Username/Password :
99
- For Business Console : rtsAdmin/rtsAdmin
1010
- For RES : resAdmin/resAdmin
1111
- For Decision Runner: resDeployer/resDeployer
@@ -15,63 +15,60 @@ Username/Password :
1515
{{- if contains "NodePort" .Values.service.type }}
1616

1717
-- Decision Center / Business Console
18-
export NODE_PORT_DC=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services odm-decisioncenter)
18+
* Decision Center / Business Console
19+
export NODE_PORT_DC=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "odm.decisioncenter.fullname" . }})
1920
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
20-
* Decision Center / Business Console
2121
echo http://$NODE_IP:$NODE_PORT_DC/decisioncenter
2222

23-
* Team Server
23+
* Team Server
2424
echo http://$NODE_IP:$NODE_PORT_DC/teamserver
2525

26-
-- Testing and Simulation
27-
export NODE_PORT_DR=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services odm-decisionrunner)
26+
-- Testing and Simulation
27+
export NODE_PORT_DR=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "odm.decisionrunner.fullname" . }} )
2828
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
2929
* Decision Runner
3030
echo http://$NODE_IP:$NODE_PORT_DR/DecisionRunner
3131

3232

3333
-- Decision Service Console (RES Console)
34-
export NODE_PORT_DSC=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services odm-decisionserverconsole)
34+
export NODE_PORT_DSC=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "odm.decisionserverconsole.fullname" . }})
3535
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
3636
* Decision Service Console (RES Console)
3737
echo http://$NODE_IP:$NODE_PORT_DSC/res
3838

3939

4040
-- Decision Service Runtime (Htds)
41-
export NODE_PORT_DSC=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services odm-decisionserverruntime)
41+
export NODE_PORT_DSC=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "odm.decisionserverruntime.fullname" . }})
4242
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
4343
* Decision Service Runtime
4444
echo http://$NODE_IP:$NODE_PORT_DSC/DecisionService
4545

4646

4747
{{- else if contains "LoadBalancer" .Values.service.type }}
4848
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
49-
49+
5050
-- Decision Center / Business Console
51-
export SERVICE_IP_DC=$(kubectl get svc --namespace {{ .Release.Namespace }} odm-decisioncenter -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
51+
export SERVICE_IP_DC=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "odm.decisioncenter.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
5252
* Decision Center / Business Console
5353
echo http://$SERVICE_IP_DC:{{ .Values.service.externalPort }}/decisioncenter
5454

55-
* Team Server
55+
* Team Server
5656
echo http://$SERVICE_IP_DC:{{ .Values.service.externalPort }}/teamserver
5757

58-
-- Testing and Simulation
59-
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} odm-decisionrunner -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
58+
-- Testing and Simulation
59+
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "odm.decisionrunner.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
6060
echo http://$SERVICE_IP:{{ .Values.service.externalPort }}/DecisionRunner
6161

6262
-- Decision Service Console (RES Console)
63-
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} odm-decisionserverconsole -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
63+
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "odm.decisionserverconsole.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
6464
echo http://$SERVICE_IP:{{ .Values.service.externalPort }}/res
6565

6666
-- Decision Service Runtime (Htds)
67-
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} odm-decisionserverruntime -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
67+
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "odm.decisionserverruntime.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
6868
echo http://$SERVICE_IP:{{ .Values.service.externalPort }}/DecisionServicde
6969

7070
{{- else if contains "ClusterIP" .Values.service.type }}
71-
72-
-- Testing and Simulation
73-
TODO.
74-
71+
dddd
7572
{{- end }}
7673

7774

@@ -81,4 +78,4 @@ Your release is named {{ .Release.Name }}.
8178
To learn more about the release, try:
8279

8380
$ helm status {{ .Release.Name }}
84-
$ helm get {{ .Release.Name }}
81+
$ helm get {{ .Release.Name }}

‎helm/stable/odmcharts/templates/_helpers.tpl‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
###############################################################################
22
# Licensed Materials - Property of IBM.
33
# Copyright IBM Corporation 2017. All Rights Reserved.
4-
# U.S. Government Users Restricted Rights - Use, duplication or disclosure
4+
# U.S. Government Users Restricted Rights - Use, duplication or disclosure
55
# restricted by GSA ADP Schedule Contract with IBM Corp.
66
#
77
# Contributors:
@@ -12,7 +12,7 @@
1212
Expand the name of the chart.
1313
*/}}
1414
{{- define "name" -}}
15-
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
15+
{{- default .Chart.Name .Values.nameOverride | trunc 55 | trimSuffix "-" -}}
1616
{{- end -}}
1717

1818
{{/*
@@ -21,5 +21,36 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
2121
*/}}
2222
{{- define "fullname" -}}
2323
{{- $name := default .Chart.Name .Values.nameOverride -}}
24+
{{- printf "%s-%s" .Release.Name $name | trunc 55 | trimSuffix "-" -}}
25+
{{- end -}}
26+
27+
28+
{{- define "odm.dbserver.fullname" -}}
29+
{{- $name := default "dbserver" .Values.nameOverride -}}
30+
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
31+
{{- end -}}
32+
33+
{{- define "odm.decisionserverconsole.fullname" -}}
34+
{{- $name := default "odm-decisionserverconsole" .Values.nameOverride -}}
35+
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
36+
{{- end -}}
37+
38+
{{- define "odm.decisionserverruntime.fullname" -}}
39+
{{- $name := default "odm-decisionserverruntime" .Values.nameOverride -}}
40+
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
41+
{{- end -}}
42+
43+
{{- define "odm.decisioncenter.fullname" -}}
44+
{{- $name := default "odm-decisioncenter" .Values.nameOverride -}}
45+
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
46+
{{- end -}}
47+
48+
{{- define "odm.decisionrunner.fullname" -}}
49+
{{- $name := default "odm-decisionrunner" .Values.nameOverride -}}
50+
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
51+
{{- end -}}
52+
53+
{{- define "odm.persistenceclaim.fullname" -}}
54+
{{- $name := default "odm-pvclaim" .Values.nameOverride -}}
2455
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
2556
{{- end -}}

‎helm/stable/odmcharts/templates/dbserver-deployment.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
apiVersion: extensions/v1beta1
1111
kind: Deployment
1212
metadata:
13-
name: dbserver
13+
name: {{ template "odm.dbserver.fullname" . }}
1414
labels:
1515
app: {{ template "fullname" . }}
1616
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -21,23 +21,23 @@ spec:
2121
template:
2222
metadata:
2323
labels:
24-
run: dbserver
24+
run: {{ template "odm.dbserver.fullname" . }}
2525
app: {{ template "name" . }}
2626
release: {{ .Release.Name }}
2727
spec:
2828
{{- if .Values.persistence.enabled }}
2929
volumes:
3030
- name: {{ template "fullname" . }}-volume
3131
persistentVolumeClaim:
32-
claimName: {{ template "fullname" . }}-claim
32+
claimName: {{ template "odm.persistenceclaim.fullname" . }}
3333
{{- end }}
3434
containers:
35-
- name: dbserver
35+
- name: {{ template "odm.dbserver.fullname" . }}
3636
image: {{ .Values.image.repository }}/dbserver:{{ .Values.image.tag }}
3737
imagePullPolicy: {{ .Values.image.pullPolicy }}
3838
env:
3939
- name: SAMPLE
40-
value: "true"
40+
value: "{{ .Values.persistence.populateDataSample }}"
4141
ports:
4242
- containerPort: 1527
4343
{{- if .Values.persistence.enabled }}

‎helm/stable/odmcharts/templates/dbserver-pvclaim.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
kind: PersistentVolumeClaim
1111
apiVersion: v1
1212
metadata:
13-
name: {{ template "fullname" . }}-claim
13+
name: {{ template "odm.persistenceclaim.fullname" . }}
1414
spec:
1515
accessModes:
1616
- ReadWriteOnce

‎helm/stable/odmcharts/templates/dbserver-service.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
apiVersion: v1
1111
kind: Service
1212
metadata:
13-
name: dbserver
13+
name: {{ template "odm.dbserver.fullname" . }}
1414
labels:
1515
app: {{ template "name" . }}
1616
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
1717
release: {{ .Release.Name }}
1818
heritage: {{ .Release.Service }}
1919
spec:
2020
selector:
21-
run: dbserver
21+
run: {{ template "odm.dbserver.fullname" . }}
2222
app: {{ template "name" . }}
2323
release: {{ .Release.Name }}
2424
type: {{ .Values.service.type }}

‎helm/stable/odmcharts/templates/dc-deployment.yaml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
apiVersion: extensions/v1beta1
1111
kind: Deployment
1212
metadata:
13-
name: odm-decisioncenter
13+
name: {{ template "odm.decisioncenter.fullname" . }}
1414
labels:
1515
app: {{ template "fullname" . }}
1616
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -21,17 +21,24 @@ spec:
2121
template:
2222
metadata:
2323
labels:
24-
run: odm-decisioncenter
24+
run: {{ template "odm.decisioncenter.fullname" . }}
2525
app: {{ template "name" . }}
2626
release: {{ .Release.Name }}
2727
spec:
2828
containers:
29-
- name: odm-decisioncenter
29+
- name: {{ template "odm.decisioncenter.fullname" . }}
3030
image: {{ .Values.image.repository}}/{{ .Values.image.prefix }}-decisioncenter:{{ .Values.image.tag }}
3131
imagePullPolicy: {{ .Values.image.pullPolicy }}
3232
ports:
3333
- containerPort: 9060
34-
{{- if (not (empty .Values.image.pullSecrets )) }}
34+
env:
35+
- name: "DBSERVER_NAME"
36+
value: {{ template "odm.dbserver.fullname" . }}
37+
- name: "DECISIONRUNNER_NAME"
38+
value: {{ template "odm.decisionrunner.fullname" . }}
39+
- name: "DECISIONSERVERCONSOLE_NAME"
40+
value: {{ template "odm.decisionserverconsole.fullname" . }}
41+
{{- if (not (empty .Values.image.pullSecrets )) }}
3542
imagePullSecrets:
3643
- name: {{ .Values.image.pullSecrets }}
37-
{{- end }}
44+
{{- end }}

‎helm/stable/odmcharts/templates/dc-service.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
apiVersion: v1
1111
kind: Service
1212
metadata:
13-
name: odm-decisioncenter
13+
name: {{ template "odm.decisioncenter.fullname" . }}
1414
labels:
1515
app: {{ template "name" . }}
1616
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
1717
release: {{ .Release.Name }}
1818
heritage: {{ .Release.Service }}
1919
spec:
2020
selector:
21-
run: odm-decisioncenter
21+
run: {{ template "odm.decisioncenter.fullname" . }}
2222
app: {{ template "name" . }}
2323
release: {{ .Release.Name }}
2424
type: {{ .Values.service.type }}

‎helm/stable/odmcharts/templates/dr-deployment.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
apiVersion: extensions/v1beta1
1111
kind: Deployment
1212
metadata:
13-
name: odm-decisionrunner
13+
name: {{ template "odm.decisionrunner.fullname" . }}
1414
labels:
1515
app: {{ template "fullname" . }}
1616
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -21,14 +21,17 @@ spec:
2121
template:
2222
metadata:
2323
labels:
24-
run: odm-decisionrunner
24+
run: {{ template "odm.decisionrunner.fullname" . }}
2525
app: {{ template "name" . }}
2626
release: {{ .Release.Name }}
2727
spec:
2828
containers:
29-
- name: odm-decisionrunner
29+
- name: {{ template "odm.decisionrunner.fullname" . }}
3030
image: {{ .Values.image.repository}}/{{ .Values.image.prefix }}-decisionrunner:{{ .Values.image.tag }}
3131
imagePullPolicy: {{ .Values.image.pullPolicy }}
32+
env:
33+
- name: "DBSERVER_NAME"
34+
value: {{ template "odm.dbserver.fullname" . }}
3235
ports:
3336
- containerPort: 9070
3437
{{- if (not (empty .Values.imagePullSecrets )) }}

‎helm/stable/odmcharts/templates/dr-service.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
apiVersion: v1
1111
kind: Service
1212
metadata:
13-
name: odm-decisionrunner
13+
name: {{ template "odm.decisionrunner.fullname" . }}
1414
labels:
1515
app: {{ template "name" . }}
1616
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
1717
release: {{ .Release.Name }}
1818
heritage: {{ .Release.Service }}
1919
spec:
2020
selector:
21-
run: odm-decisionrunner
21+
run: {{ template "odm.decisionrunner.fullname" . }}
2222
app: {{ template "name" . }}
2323
release: {{ .Release.Name }}
2424
type: {{ .Values.service.type }}

0 commit comments

Comments
 (0)