Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[charts/portal]Removing the redundant javaoptions for portal-data pod and adding customprobes to RMQ to ramup the boot time #276

Open
wants to merge 15 commits into
base: develop/portal
Choose a base branch
from
Open

[charts/portal]Removing the redundant javaoptions for portal-data pod and adding customprobes to RMQ to ramup the boot time #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e875d34
Removing the redundant javaoptions for portal-data pod and adding cus…
Nov 19, 2023
1b8c89f
Changing the k8s version in validation
Nov 19, 2023
e4ed48b
k8s verison change
Nov 19, 2023
4fceeb7
Removing the braces
Nov 19, 2023
f72c57b
setting the k8s version back
Nov 19, 2023
649f030
Adding quotes
Nov 19, 2023
7a47727
Adding quotes
Nov 19, 2023
975bb54
Adding quotes
Nov 19, 2023
465bc6b
Adding yaml block
Nov 19, 2023
8c81236
Changing the helm version
Nov 20, 2023
5f088e0
Removing the redundant quotes
Nov 21, 2023
039539b
Spaces
Nov 21, 2023
b02f724
Spaces
Nov 21, 2023
85961fb
Resetting the liveness and readinedd spaces
Nov 26, 2023
284125b
Merge branch 'develop/portal' of https://github.com/CAAPIM/apim-chart…
Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Helm
uses: azure/setup-helm@v1
with:
version: v3.4.0
version: v3.10.0
- uses: actions/setup-python@v2
with:
python-version: 3.7
Expand Down
3 changes: 1 addition & 2 deletions charts/portal/templates/portal-data/portal-data-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ data:
DATABASE_REQUIRE_SSL: {{ .Values.global.databaseRequireSSL | quote }}
FILE_REPOSITORY_DATABASE_NAME: {{ include "portal-db-name" . | quote }}
HELP_BASE_URL: {{ include "portal.help.page" . | quote }}
JAVA_OPTIONS: {{ .Values.portalData.javaOptions | default "-Xms2g -Xmx2g" | quote }}
JAVA_OPTIONS: {{ .Values.portalData.javaOptions | default "-Xms2048m -Xmx2048m" | quote }}
# TODO: Find out why this is hardcoded, can it be ommitted??
HOST_NAME_ID: MTAuMTc1LjI0Ny4yNDQgMTcyLjE4LjAuMSAxNzIuMTcuMC4xIAo=
JAVA_OPTIONS: -Xms2048m -Xmx2048m
NSS_SDB_USE_CACHE: "no"
PAPI_PUBLIC_HOST: {{ include "tssg-public-host" . | quote }}
PORTAL_SUBDOMAIN: {{ required "Please fill in domain in values.yaml" .Values.portal.domain | quote }}
Expand Down
14 changes: 13 additions & 1 deletion charts/portal/values-production.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ dispatcher:
portalData:
forceRedeploy: false
replicaCount: 2
javaOptions: -Xms2g -Xmx2g
javaOptions: -Xms2048m -Xmx2048m
image:
pullPolicy: IfNotPresent
pdb:
Expand Down Expand Up @@ -925,6 +925,18 @@ rabbitmq:
requests:
cpu: 1000m
memory: 2Gi
customLivenessProbe:
exec:
command:
- sh
- -ec
- curl -f --user "{{ .Values.auth.username }}":$RABBITMQ_PASSWORD 127.0.0.1:"{{ .Values.containerPorts.manager }}"/api/health/checks/virtual-hosts
customReadinessProbe:
exec:
command:
- sh
- -ec
- curl -f --user "{{ .Values.auth.username }}":$RABBITMQ_PASSWORD 127.0.0.1:"{{ .Values.containerPorts.manager }}"/api/health/checks/local-alarms

# Settings for Nginx-Ingress - https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx
ingress-nginx:
Expand Down
15 changes: 13 additions & 2 deletions charts/portal/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ dispatcher:
portalData:
forceRedeploy: false
replicaCount: 1
javaOptions: -Xms2g -Xmx2g
javaOptions: -Xms2048m -Xmx2048m
image:
pullPolicy: IfNotPresent
pdb:
Expand Down Expand Up @@ -771,7 +771,18 @@ rabbitmq:
requests: {}
# cpu: 1000m
# memory: 2Gi

customLivenessProbe:
exec:
command:
- sh
- -ec
- curl -f --user {{ .Values.auth.username }}:$RABBITMQ_PASSWORD 127.0.0.1:{{ .Values.containerPorts.manager }}/api/health/checks/virtual-hosts
customReadinessProbe:
exec:
command:
- sh
- -ec
- curl -f --user {{ .Values.auth.username }}:$RABBITMQ_PASSWORD 127.0.0.1:{{ .Values.containerPorts.manager }}/api/health/checks/local-alarms

# Settings for Nginx-Ingress - https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx
ingress-nginx:
Expand Down
Loading