Skip to content

Commit

Permalink
Merge pull request #61 from KesavanMasilamani/v6.1.34
Browse files Browse the repository at this point in the history
v6.1.34 documentation and manifest file changes
  • Loading branch information
Sankaralingam1667 authored Apr 30, 2024
2 parents 4c23b1a + 3c169ae commit 0caa176
Show file tree
Hide file tree
Showing 44 changed files with 3,082 additions and 104 deletions.
7 changes: 7 additions & 0 deletions deploy/Log4Net.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<appender-ref ref="ConsoleAppender" />
<appender-ref ref="FILE_DEBUG_APPENDER" />
<appender-ref ref="FILE_ERROR_APPENDER" />
<appender-ref ref="aiAppender"/>
</root>

<!-- === File Appender for NON-ERROR messages file === -->
Expand Down Expand Up @@ -52,6 +53,12 @@
<conversionPattern type="log4net.Util.PatternString" value="%newline%%-5level %property{loggername} %env{HOSTNAME} %%date [%%thread] %%message%newline" />
</layout>
</appender>
<!-- === Appender for ApplicationInsights logs === -->
<appender name="aiAppender" type="Microsoft.ApplicationInsights.Log4NetAppender.ApplicationInsightsAppender, Microsoft.ApplicationInsights.Log4NetAppender">
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%message%newline" />
</layout>
</appender>

</log4net>
</configuration>
128 changes: 120 additions & 8 deletions deploy/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: id-web-container
image: gcr.io/boldreports/bold-identity:5.4.30
image: us-docker.pkg.dev/boldreports/v6-1-34/bold-identity:6.1.34
ports:
- containerPort: 80
resources:
Expand Down Expand Up @@ -63,9 +63,17 @@ spec:
labels:
app: id-api
spec:
initContainers:
- name: id-web-initialization
image: busybox:1.28
command: ["/bin/sh","-c"]
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
volumeMounts:
- mountPath: /application/app_data
name: id-api-volume
containers:
- name: id-api-container
image: gcr.io/boldreports/bold-idp-api:5.4.30
image: us-docker.pkg.dev/boldreports/v6-1-34/bold-idp-api:6.1.34
ports:
- containerPort: 80
resources:
Expand Down Expand Up @@ -108,9 +116,17 @@ spec:
labels:
app: id-ums
spec:
initContainers:
- name: id-web-initialization
image: busybox:1.28
command: ["/bin/sh","-c"]
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
volumeMounts:
- mountPath: /application/app_data
name: id-ums-volume
containers:
- name: id-ums-container
image: gcr.io/boldreports/bold-ums:5.4.30
image: us-docker.pkg.dev/boldreports/v6-1-34/bold-ums:6.1.34
ports:
- containerPort: 80
resources:
Expand Down Expand Up @@ -153,9 +169,17 @@ spec:
labels:
app: reports-web
spec:
initContainers:
- name: id-web-initialization
image: busybox:1.28
command: ["/bin/sh","-c"]
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
volumeMounts:
- mountPath: /application/app_data
name: reports-web-volume
containers:
- name: reports-web-container
image: gcr.io/boldreports/boldreports-server:5.4.30
image: us-docker.pkg.dev/boldreports/v6-1-34/boldreports-server:6.1.34
ports:
- containerPort: 80
resources:
Expand Down Expand Up @@ -197,9 +221,17 @@ spec:
labels:
app: reports-api
spec:
initContainers:
- name: id-web-initialization
image: busybox:1.28
command: ["/bin/sh","-c"]
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
volumeMounts:
- mountPath: /application/app_data
name: reports-api-volume
containers:
- name: reports-api-container
image: gcr.io/boldreports/boldreports-server-api:5.4.30
image: us-docker.pkg.dev/boldreports/v6-1-34/boldreports-server-api:6.1.34
ports:
- containerPort: 80
resources:
Expand Down Expand Up @@ -241,9 +273,17 @@ spec:
labels:
app: reports-jobs
spec:
initContainers:
- name: id-web-initialization
image: busybox:1.28
command: ["/bin/sh","-c"]
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
volumeMounts:
- mountPath: /application/app_data
name: reports-jobs-volume
containers:
- name: reports-jobs-container
image: gcr.io/boldreports/boldreports-server-jobs:5.4.30
image: us-docker.pkg.dev/boldreports/v6-1-34/boldreports-server-jobs:6.1.34
ports:
- containerPort: 80
resources:
Expand Down Expand Up @@ -285,9 +325,17 @@ spec:
labels:
app: reports-reportservice
spec:
initContainers:
- name: id-web-initialization
image: busybox:1.28
command: ["/bin/sh","-c"]
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
volumeMounts:
- mountPath: /application/app_data
name: reports-reportservice-volume
containers:
- name: reports-reportservice-container
image: gcr.io/boldreports/boldreports-designer:5.4.30
image: us-docker.pkg.dev/boldreports/v6-1-34/boldreports-designer:6.1.34
ports:
- containerPort: 80
resources:
Expand Down Expand Up @@ -329,9 +377,17 @@ spec:
labels:
app: reports-viewer
spec:
initContainers:
- name: id-web-initialization
image: busybox:1.28
command: ["/bin/sh","-c"]
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
volumeMounts:
- mountPath: /application/app_data
name: reports-viewer-volume
containers:
- name: reports-viewer-container
image: gcr.io/boldreports/boldreports-viewer:5.4.30
image: us-docker.pkg.dev/boldreports/v6-1-34/boldreports-viewer:6.1.34
ports:
- containerPort: 80
resources:
Expand All @@ -354,6 +410,62 @@ spec:
persistentVolumeClaim:
claimName: bold-services-fileserver-claim
readOnly: false
- name: log4net-config-volume
configMap:
name: log4net-config
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: bold-etl-deployment
namespace: bold-services
spec:
selector:
matchLabels:
app: bold-etl
replicas: 1
template:
metadata:
labels:
app: bold-etl
spec:
initContainers:
- name: id-web-initialization
image: busybox:1.28
command: ["/bin/sh","-c"]
args: ["if [ ! -f /application/app_data/configuration/config.xml ]; then echo waiting for id-web; sleep 5; else echo config.xml file exist; fi"]
volumeMounts:
- mountPath: /application/app_data
name: bold-etl-volume
containers:
- name: bold-etl-container
image: us-docker.pkg.dev/boldreports/v6-1-34/bold-etl:6.1.34
ports:
- containerPort: 80
env:
- name: BOLD_SERVICES_HOSTING_ENVIRONMENT
value: k8s
resources:
requests:
cpu: 250m
memory: 750Mi
readinessProbe:
httpGet:
path: /health-check
port: 80
initialDelaySeconds: 20
periodSeconds: 15
timeoutSeconds: 5
volumeMounts:
- mountPath: /application/app_data
name: bold-etl-volume
- mountPath: /application/etl/etlservice/logs/k8s
name: log4net-config-volume
volumes:
- name: bold-etl-volume
persistentVolumeClaim:
claimName: bold-services-fileserver-claim
readOnly: false
- name: log4net-config-volume
configMap:
name: log4net-config
14 changes: 14 additions & 0 deletions deploy/destination_rule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,18 @@ spec:
consistentHash:
httpCookie:
name: boldreports.k8s.reports.viewer.pod.id
ttl: 600s
---
apiVersion: networking.istio.io/v1alpha3
kind: DestinationRule
metadata:
namespace: bold-services
name: bold-etl-rule
spec:
host: bold-etl-service.bold-services.svc.cluster.local
trafficPolicy:
loadBalancer:
consistentHash:
httpCookie:
name: bold.k8s.bold.etl.pod.id
ttl: 600s
36 changes: 36 additions & 0 deletions deploy/hpa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,42 @@ spec:
minReplicas: 1
maxReplicas: 20
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: 80
- type: Resource
resource:
name: memory
target:
type: Utilization
averageUtilization: 80
behavior:
scaleDown:
stabilizationWindowSeconds: 60
policies:
- type: Pods
value: 1
periodSeconds: 60
- type: Percent
value: 10
periodSeconds: 60
---
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
name: bold-etl-hpa
namespace: bold-services
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: bold-etl-deployment
minReplicas: 1
maxReplicas: 20
metrics:
- type: Resource
resource:
name: cpu
Expand Down
26 changes: 26 additions & 0 deletions deploy/hpa_gke.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,32 @@ spec:
minReplicas: 1
maxReplicas: 20
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: 80
- type: Resource
resource:
name: memory
target:
type: Utilization
averageUtilization: 80
---
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
name: bold-etl-hpa
namespace: bold-services
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: bold-etl-deployment
minReplicas: 1
maxReplicas: 20
metrics:
- type: Resource
resource:
name: cpu
Expand Down
Loading

0 comments on commit 0caa176

Please sign in to comment.