Skip to content

Commit 0caa176

Browse files
author
Sankaralingam1667
authored
Merge pull request #61 from KesavanMasilamani/v6.1.34
v6.1.34 documentation and manifest file changes
2 parents 4c23b1a + 3c169ae commit 0caa176

Some content is hidden

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

44 files changed

+3082
-104
lines changed

‎deploy/Log4Net.config

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<appender-ref ref="ConsoleAppender" />
77
<appender-ref ref="FILE_DEBUG_APPENDER" />
88
<appender-ref ref="FILE_ERROR_APPENDER" />
9+
<appender-ref ref="aiAppender"/>
910
</root>
1011

1112
<!-- === File Appender for NON-ERROR messages file === -->
@@ -52,6 +53,12 @@
5253
<conversionPattern type="log4net.Util.PatternString" value="%newline%%-5level %property{loggername} %env{HOSTNAME} %%date [%%thread] %%message%newline" />
5354
</layout>
5455
</appender>
56+
<!-- === Appender for ApplicationInsights logs === -->
57+
<appender name="aiAppender" type="Microsoft.ApplicationInsights.Log4NetAppender.ApplicationInsightsAppender, Microsoft.ApplicationInsights.Log4NetAppender">
58+
<layout type="log4net.Layout.PatternLayout">
59+
<conversionPattern value="%message%newline" />
60+
</layout>
61+
</appender>
5562

5663
</log4net>
5764
</configuration>

‎deploy/deployment.yaml

Lines changed: 120 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: id-web-container
18-
image: gcr.io/boldreports/bold-identity:5.4.30
18+
image: us-docker.pkg.dev/boldreports/v6-1-34/bold-identity:6.1.34
1919
ports:
2020
- containerPort: 80
2121
resources:
@@ -63,9 +63,17 @@ spec:
6363
labels:
6464
app: id-api
6565
spec:
66+
initContainers:
67+
- name: id-web-initialization
68+
image: busybox:1.28
69+
command: ["/bin/sh","-c"]
70+
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
71+
volumeMounts:
72+
- mountPath: /application/app_data
73+
name: id-api-volume
6674
containers:
6775
- name: id-api-container
68-
image: gcr.io/boldreports/bold-idp-api:5.4.30
76+
image: us-docker.pkg.dev/boldreports/v6-1-34/bold-idp-api:6.1.34
6977
ports:
7078
- containerPort: 80
7179
resources:
@@ -108,9 +116,17 @@ spec:
108116
labels:
109117
app: id-ums
110118
spec:
119+
initContainers:
120+
- name: id-web-initialization
121+
image: busybox:1.28
122+
command: ["/bin/sh","-c"]
123+
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
124+
volumeMounts:
125+
- mountPath: /application/app_data
126+
name: id-ums-volume
111127
containers:
112128
- name: id-ums-container
113-
image: gcr.io/boldreports/bold-ums:5.4.30
129+
image: us-docker.pkg.dev/boldreports/v6-1-34/bold-ums:6.1.34
114130
ports:
115131
- containerPort: 80
116132
resources:
@@ -153,9 +169,17 @@ spec:
153169
labels:
154170
app: reports-web
155171
spec:
172+
initContainers:
173+
- name: id-web-initialization
174+
image: busybox:1.28
175+
command: ["/bin/sh","-c"]
176+
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
177+
volumeMounts:
178+
- mountPath: /application/app_data
179+
name: reports-web-volume
156180
containers:
157181
- name: reports-web-container
158-
image: gcr.io/boldreports/boldreports-server:5.4.30
182+
image: us-docker.pkg.dev/boldreports/v6-1-34/boldreports-server:6.1.34
159183
ports:
160184
- containerPort: 80
161185
resources:
@@ -197,9 +221,17 @@ spec:
197221
labels:
198222
app: reports-api
199223
spec:
224+
initContainers:
225+
- name: id-web-initialization
226+
image: busybox:1.28
227+
command: ["/bin/sh","-c"]
228+
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
229+
volumeMounts:
230+
- mountPath: /application/app_data
231+
name: reports-api-volume
200232
containers:
201233
- name: reports-api-container
202-
image: gcr.io/boldreports/boldreports-server-api:5.4.30
234+
image: us-docker.pkg.dev/boldreports/v6-1-34/boldreports-server-api:6.1.34
203235
ports:
204236
- containerPort: 80
205237
resources:
@@ -241,9 +273,17 @@ spec:
241273
labels:
242274
app: reports-jobs
243275
spec:
276+
initContainers:
277+
- name: id-web-initialization
278+
image: busybox:1.28
279+
command: ["/bin/sh","-c"]
280+
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
281+
volumeMounts:
282+
- mountPath: /application/app_data
283+
name: reports-jobs-volume
244284
containers:
245285
- name: reports-jobs-container
246-
image: gcr.io/boldreports/boldreports-server-jobs:5.4.30
286+
image: us-docker.pkg.dev/boldreports/v6-1-34/boldreports-server-jobs:6.1.34
247287
ports:
248288
- containerPort: 80
249289
resources:
@@ -285,9 +325,17 @@ spec:
285325
labels:
286326
app: reports-reportservice
287327
spec:
328+
initContainers:
329+
- name: id-web-initialization
330+
image: busybox:1.28
331+
command: ["/bin/sh","-c"]
332+
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
333+
volumeMounts:
334+
- mountPath: /application/app_data
335+
name: reports-reportservice-volume
288336
containers:
289337
- name: reports-reportservice-container
290-
image: gcr.io/boldreports/boldreports-designer:5.4.30
338+
image: us-docker.pkg.dev/boldreports/v6-1-34/boldreports-designer:6.1.34
291339
ports:
292340
- containerPort: 80
293341
resources:
@@ -329,9 +377,17 @@ spec:
329377
labels:
330378
app: reports-viewer
331379
spec:
380+
initContainers:
381+
- name: id-web-initialization
382+
image: busybox:1.28
383+
command: ["/bin/sh","-c"]
384+
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
385+
volumeMounts:
386+
- mountPath: /application/app_data
387+
name: reports-viewer-volume
332388
containers:
333389
- name: reports-viewer-container
334-
image: gcr.io/boldreports/boldreports-viewer:5.4.30
390+
image: us-docker.pkg.dev/boldreports/v6-1-34/boldreports-viewer:6.1.34
335391
ports:
336392
- containerPort: 80
337393
resources:
@@ -354,6 +410,62 @@ spec:
354410
persistentVolumeClaim:
355411
claimName: bold-services-fileserver-claim
356412
readOnly: false
413+
- name: log4net-config-volume
414+
configMap:
415+
name: log4net-config
416+
---
417+
apiVersion: apps/v1
418+
kind: Deployment
419+
metadata:
420+
name: bold-etl-deployment
421+
namespace: bold-services
422+
spec:
423+
selector:
424+
matchLabels:
425+
app: bold-etl
426+
replicas: 1
427+
template:
428+
metadata:
429+
labels:
430+
app: bold-etl
431+
spec:
432+
initContainers:
433+
- name: id-web-initialization
434+
image: busybox:1.28
435+
command: ["/bin/sh","-c"]
436+
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
437+
volumeMounts:
438+
- mountPath: /application/app_data
439+
name: bold-etl-volume
440+
containers:
441+
- name: bold-etl-container
442+
image: us-docker.pkg.dev/boldreports/v6-1-34/bold-etl:6.1.34
443+
ports:
444+
- containerPort: 80
445+
env:
446+
- name: BOLD_SERVICES_HOSTING_ENVIRONMENT
447+
value: k8s
448+
resources:
449+
requests:
450+
cpu: 250m
451+
memory: 750Mi
452+
readinessProbe:
453+
httpGet:
454+
path: /health-check
455+
port: 80
456+
initialDelaySeconds: 20
457+
periodSeconds: 15
458+
timeoutSeconds: 5
459+
volumeMounts:
460+
- mountPath: /application/app_data
461+
name: bold-etl-volume
462+
- mountPath: /application/etl/etlservice/logs/k8s
463+
name: log4net-config-volume
464+
volumes:
465+
- name: bold-etl-volume
466+
persistentVolumeClaim:
467+
claimName: bold-services-fileserver-claim
468+
readOnly: false
357469
- name: log4net-config-volume
358470
configMap:
359471
name: log4net-config

‎deploy/destination_rule.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,18 @@ spec:
108108
consistentHash:
109109
httpCookie:
110110
name: boldreports.k8s.reports.viewer.pod.id
111+
ttl: 600s
112+
---
113+
apiVersion: networking.istio.io/v1alpha3
114+
kind: DestinationRule
115+
metadata:
116+
namespace: bold-services
117+
name: bold-etl-rule
118+
spec:
119+
host: bold-etl-service.bold-services.svc.cluster.local
120+
trafficPolicy:
121+
loadBalancer:
122+
consistentHash:
123+
httpCookie:
124+
name: bold.k8s.bold.etl.pod.id
111125
ttl: 600s

‎deploy/hpa.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,42 @@ spec:
263263
minReplicas: 1
264264
maxReplicas: 20
265265
metrics:
266+
- type: Resource
267+
resource:
268+
name: cpu
269+
target:
270+
type: Utilization
271+
averageUtilization: 80
272+
- type: Resource
273+
resource:
274+
name: memory
275+
target:
276+
type: Utilization
277+
averageUtilization: 80
278+
behavior:
279+
scaleDown:
280+
stabilizationWindowSeconds: 60
281+
policies:
282+
- type: Pods
283+
value: 1
284+
periodSeconds: 60
285+
- type: Percent
286+
value: 10
287+
periodSeconds: 60
288+
---
289+
apiVersion: autoscaling/v2
290+
kind: HorizontalPodAutoscaler
291+
metadata:
292+
name: bold-etl-hpa
293+
namespace: bold-services
294+
spec:
295+
scaleTargetRef:
296+
apiVersion: apps/v1
297+
kind: Deployment
298+
name: bold-etl-deployment
299+
minReplicas: 1
300+
maxReplicas: 20
301+
metrics:
266302
- type: Resource
267303
resource:
268304
name: cpu

‎deploy/hpa_gke.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,32 @@ spec:
193193
minReplicas: 1
194194
maxReplicas: 20
195195
metrics:
196+
- type: Resource
197+
resource:
198+
name: cpu
199+
target:
200+
type: Utilization
201+
averageUtilization: 80
202+
- type: Resource
203+
resource:
204+
name: memory
205+
target:
206+
type: Utilization
207+
averageUtilization: 80
208+
---
209+
apiVersion: autoscaling/v2
210+
kind: HorizontalPodAutoscaler
211+
metadata:
212+
name: bold-etl-hpa
213+
namespace: bold-services
214+
spec:
215+
scaleTargetRef:
216+
apiVersion: apps/v1
217+
kind: Deployment
218+
name: bold-etl-deployment
219+
minReplicas: 1
220+
maxReplicas: 20
221+
metrics:
196222
- type: Resource
197223
resource:
198224
name: cpu

0 commit comments

Comments
 (0)