Skip to content

Commit 91fdc3b

Browse files
eiximeniseiximenis
committed
helm charts mostly finished
1 parent c29aa65 commit 91fdc3b

110 files changed

Lines changed: 1080 additions & 770 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎k8s/helm/apigwmm/templates/NOTES.txt‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,2 @@
1-
1. Get the application URL by running these commands:
2-
{{- if .Values.ingress.enabled }}
3-
{{- range .Values.ingress.hosts }}
4-
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
5-
{{- end }}
6-
{{- else if contains "NodePort" .Values.service.type }}
7-
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "apigwmm.fullname" . }})
8-
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
9-
echo http://$NODE_IP:$NODE_PORT
10-
{{- else if contains "LoadBalancer" .Values.service.type }}
11-
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
12-
You can watch the status of by running 'kubectl get svc -w {{ template "apigwmm.fullname" . }}'
13-
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "apigwmm.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
14-
echo http://$SERVICE_IP:{{ .Values.service.port }}
15-
{{- else if contains "ClusterIP" .Values.service.type }}
16-
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "apigwmm.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
17-
echo "Visit http://127.0.0.1:8080 to use your application"
18-
kubectl port-forward $POD_NAME 8080:80
19-
{{- end }}
1+
eShop API Gateway for Mobile Marketing services installed
2+
----------------------------------------------------------

‎k8s/helm/apigwmm/templates/deployment.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ spec:
3434
configMap:
3535
name: {{ $ocelotcfgname }}
3636
items:
37-
- key: mm
37+
- key: configuration-mobile-marketing.json
3838
path: configuration.json
3939
containers:
4040
- name: {{ .Chart.Name }}
4141
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
4242
imagePullPolicy: {{ .Values.image.pullPolicy }}
43-
volumeMounts:
44-
- name: config
45-
mountPath: /app/configuration
43+
volumeMounts:
44+
- name: config
45+
mountPath: /app/configuration
4646
env:
4747
- name: PATH_BASE
4848
value: {{ include "pathBase" (list .Values.app.ingress.entries.mobilemarketingapigw .) }}

‎k8s/helm/apigwmm/templates/ingress.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{{- if .Values.ingress.enabled -}}
2-
{{- $fullName := include "apigwmm.fullname" . -}}
32
{{- $ingressPath := include "pathBase" (list .Values.app.ingress.entries.mobilemarketingapigw .) -}}
43
apiVersion: extensions/v1beta1
54
kind: Ingress
65
metadata:
7-
name: {{ $fullName }}
6+
name: {{ template "apigwmm.fullname" . }}
87
labels:
98
app: {{ template "apigwmm.name" . }}
109
chart: {{ template "apigwmm.chart" . }}
@@ -29,6 +28,6 @@ spec:
2928
paths:
3029
- path: {{ $ingressPath }}
3130
backend:
32-
serviceName: {{ $fullName }}
31+
serviceName: {{ .Values.app.svc.mobilemarketingapigw }}
3332
servicePort: http
3433
{{- end }}

‎k8s/helm/apigwmm/templates/ocelot-cm.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ metadata:
1010
release: {{ .Release.Name }}
1111
heritage: {{ .Release.Service }}
1212
data:
13-
mm: |-
14-
{{ (.Files.Glob "configuration-mobile-marketing.json").AsConfig }}
13+
{{ (.Files.Glob "configuration-mobile-marketing.json").AsConfig | indent 2 }}
1514

‎k8s/helm/apigwmm/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ service:
1212
port: 80
1313

1414
ingress:
15-
enabled: false
15+
enabled: true
1616
annotations: {}
1717
tls: []
1818

‎k8s/helm/apigwms/templates/NOTES.txt‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,2 @@
1-
1. Get the application URL by running these commands:
2-
{{- if .Values.ingress.enabled }}
3-
{{- range .Values.ingress.hosts }}
4-
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
5-
{{- end }}
6-
{{- else if contains "NodePort" .Values.service.type }}
7-
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "apigwms.fullname" . }})
8-
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
9-
echo http://$NODE_IP:$NODE_PORT
10-
{{- else if contains "LoadBalancer" .Values.service.type }}
11-
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
12-
You can watch the status of by running 'kubectl get svc -w {{ template "apigwms.fullname" . }}'
13-
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "apigwms.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
14-
echo http://$SERVICE_IP:{{ .Values.service.port }}
15-
{{- else if contains "ClusterIP" .Values.service.type }}
16-
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "apigwms.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
17-
echo "Visit http://127.0.0.1:8080 to use your application"
18-
kubectl port-forward $POD_NAME 8080:80
19-
{{- end }}
1+
eShop API Gateway for Mobile Shopping services installed
2+
--------------------------------------------------------

‎k8s/helm/apigwms/templates/deployment.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ spec:
3434
configMap:
3535
name: {{ $ocelotcfgname }}
3636
items:
37-
- key: ms
37+
- key: configuration-mobile-shopping.json
3838
path: configuration.json
3939
containers:
4040
- name: {{ .Chart.Name }}
4141
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
4242
imagePullPolicy: {{ .Values.image.pullPolicy }}
43-
volumeMounts:
44-
- name: config
45-
mountPath: /app/configuration
43+
volumeMounts:
44+
- name: config
45+
mountPath: /app/configuration
4646
env:
4747
- name: PATH_BASE
4848
value: {{ include "pathBase" (list .Values.app.ingress.entries.mobileshoppingapigw .) }}

‎k8s/helm/apigwms/templates/ingress.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{{- if .Values.ingress.enabled -}}
2-
{{- $fullName := include "apigwms.fullname" . -}}
32
{{- $ingressPath := include "pathBase" (list .Values.app.ingress.entries.mobileshoppingapigw .) -}}
43
apiVersion: extensions/v1beta1
54
kind: Ingress
65
metadata:
7-
name: {{ $fullName }}
6+
name: {{ template "apigwms.fullname" . }}
87
labels:
98
app: {{ template "apigwms.name" . }}
109
chart: {{ template "apigwms.chart" . }}
@@ -29,6 +28,6 @@ spec:
2928
paths:
3029
- path: {{ $ingressPath }}
3130
backend:
32-
serviceName: {{ $fullName }}
31+
serviceName: {{ .Values.app.svc.mobileshoppingapigw }}
3332
servicePort: http
3433
{{- end }}

‎k8s/helm/apigwms/templates/ocelot-cm.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ metadata:
1010
release: {{ .Release.Name }}
1111
heritage: {{ .Release.Service }}
1212
data:
13-
ms: |-
14-
{{ (.Files.Glob "configuration-mobile-shopping.json").AsConfig }}
13+
{{ (.Files.Glob "configuration-mobile-shopping.json").AsConfig | indent 2 }}
1514

‎k8s/helm/apigwms/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ service:
1212
port: 80
1313

1414
ingress:
15-
enabled: false
15+
enabled: true
1616
annotations: {}
1717
tls: []
1818

0 commit comments

Comments
 (0)