Skip to content
This repository was archived by the owner on Feb 18, 2025. It is now read-only.

Commit

Permalink
fix: wishlist restarting issue (#70)
Browse files Browse the repository at this point in the history
Co-authored-by: MrPhotato <chenzianhhh@gmail.com>
Co-authored-by: amber <>
Co-authored-by: nshm <nshm@u.nus.edu>
Co-authored-by: MrPhotato <137085785+MrPhotato@users.noreply.github.com>
  • Loading branch information
4 people authored Nov 10, 2024
1 parent 1c9087a commit ef320d6
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 33 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/gitops.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ jobs:
- 'services/transaction/**'
notification:
- 'services/notification/**'
transaction:
- 'services/transaction/**'
rabbitmq:
- 'services/rabbitmq/**'
Expand Down
2 changes: 1 addition & 1 deletion argocd/argo-locust-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
project: default
source:
repoURL: 'https://github.com/SE-Row-1/nus-secondhand-market.git'
targetRevision: NSHM-134-Add-logs-to-wishlist
targetRevision: main
path: locust
destination:
server: 'https://kubernetes.default.svc'
Expand Down
2 changes: 1 addition & 1 deletion argocd/argo-nshm-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
project: default
source:
repoURL: 'https://github.com/SE-Row-1/nus-secondhand-market.git'
targetRevision: NSHM-134-Add-logs-to-wishlist
targetRevision: main
path: helm/nshm
destination:
server: 'https://kubernetes.default.svc'
Expand Down
3 changes: 1 addition & 2 deletions envs/account-postgres.env.gpg
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
� aXO򐔶!�ҋ�=u��'u�S�C2���& g
���L)�g���R�Jh�;5M���v���}E�h�<�4�TSC�NX��3t]��闗�oq���#����ez�%�;��]Q'g4����%hD����zҔ��[��$�Vg�E�s[�
� ao )�{k�ҋ� �ş���k�2��%y���'��Gh�Y�xD��/����P?"#G���dZ���6��3�H�6�-�v�O���#��8]NU�+2R��!�<�:Uѯ�<���%�?T��#FmI ����W:��Ҵ��_u�-K
Expand Down
Binary file modified envs/account.env.gpg
Binary file not shown.
3 changes: 1 addition & 2 deletions envs/currency.env.gpg
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
� S�^k����j�"���A�9���_{��'�[s��UTú��Q�!r�1kW7���Wm�� 'G�������00DN �.
�� z�Հnbz�P�%`���!Sܞ�y��
� K_�n��,��j>�Ml�%T�$�OL�,�d�t�Y��"ȼ��-�R�O��c@k �L�حL.�h>|��=��Kq9c0�A��s&�v�S�`�*��;5;bu��N+l�(��E
Expand Down
3 changes: 1 addition & 2 deletions envs/ec2.env.gpg
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
� ��h9C������笇���KKX��Y�{\*�*j�t�T�|I� z} ���El�\���X� ��Xu�͋��
�-�a��k��a�{���A���3Fj�Z�a������߇7��j2sPno=�`1oj�"Ɉ��� � �E^ו>���"/��'��v�<A�+�K/9�&fq�4]�Hd��!�e/�� u�M�sr�G�jqieP���t�{��h�'ve�g�P�=����B��f%��"�ֶ�n.�U�e�g�j����m��3��x1t&t��\�����|��.���h!��z3i%��b�<x��*�`���20IM�ANu�p�p�Q�-)�P�� �
� ���vF)������5���z�~�_��EX�6�4�J:�H�w��|�2�=v*I�X��J.�c���v�l/&�",�J�))`\��t�|X�<��+�Eu��@�x�q�wj�)�c���/�u��kvX�N�9�{{В��`/�� �M���/膹9LcA �l�-�+�96qt�o+��ݗ�ƅ����ܾ{��k!:����D^|�' _�L���s5��h)�=����8�e�Ȓ}���R���v��v��s�G�(6� F�J�w�-����M��W[����xĞL��'-�x�*�0o������3� �.�q�ļk��lL��8��Z���
Expand Down
3 changes: 1 addition & 2 deletions envs/item-mongo.env.gpg
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
� Β��C9D-�ҡ?-�7�?�nTK&�����IDk����f0���n�M������@��ݷ`*�� ����7��sU�� ��>��+;��ӟ�m
�>\Z~! ]AЧP"z���s�B��ʩ�Q_�m�b����ͯ�9��n�������[�J��=�Ea
� ��I�b?~�ҡ�!�͜���F�\����)�t���_��Ց���ɨC\Ƴ2�6�c߮kdt�J���ʥ��Y��c&47B,SRr�H�P�f�j��Aj��ك�X3[T�B� 5?>����㗧}���:��;��H)U��Vk���sM�I������(ɤ�3sQ�C
Expand Down
Binary file modified envs/item.env.gpg
Binary file not shown.
4 changes: 3 additions & 1 deletion envs/notification.env.gpg
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
� 3y�ۊ�<K�ұ��ҽ�4׬DEx�����t"���a�KCg��*L��H���'b2Q|je݅%F���<�������/wٱ�tض�����Ht�U��=��.�dn��y��sI���}w�F����z�cs��P�=i� ��!Du)ѓ��R�y��G�O���ڄ= �D� ��.O���PZ
� �)�����2�Ұ���~G.Azug��^�j�>�#vl��ݑ#:eJ}:g��z8�����er`�G���~�OW���LO+0I��N8�
�� G���yk �K�>Z��™���Ph���/�խ�3%
_5>��7?x3�H��s ]�Q�� �~��@��Q���#� ܝJw��)]ޑ��@�gL
Expand Down
3 changes: 1 addition & 2 deletions envs/rabbitmq.env.gpg
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
� ⍃��5���bo�/s2�c�y_I�$P�U�/�4��9���]l�\E�
�a\��sś&��B����g��b�'��i|xE�.�K*9�=]�fA7���]�¾T:�]
� bQ��qXo���b^o���h��q40�c��y��x����z�Uow��8���mA�s���� pl�vp ���M�X���_i@��=@?�����^�)J=��G�,�။
Expand Down
Binary file modified envs/web.env.gpg
Binary file not shown.
4 changes: 2 additions & 2 deletions envs/wishlist-mongo.env.gpg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
� �c�!���v�Ҧ� ����3=7W|\��]���NzgsIm��Bp��(@8
���ą��6a{�]�\`�C�3f�R�z��0il ^-~s����qulq�����'�6�ˆ�V��-���������0��k�SM�E;�@WX�3۾��õ佶���L���?P ��j�}�;�_
� �Ԇ:y���ҥ�NvY�@�h��]�xj�YW��PV��R��F��0<A_��nA��v/� �x�
d����愖��7R�5 �Ux1U��Zj���'����b$9�F��~*���t���+�/�w�b�Fŵ����9g�Ɖ$���M�uKLź=R�\����Qy�"��#
Expand Down
Binary file modified envs/wishlist.env.gpg
Binary file not shown.
2 changes: 1 addition & 1 deletion helm/nshm/templates/item-mongo/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
- "sh"
- "-c"
- |
git clone --branch NSHM-134-Add-logs-to-wishlist https://github.com/SE-Row-1/nus-secondhand-market.git /scripts
git clone --branch main https://github.com/SE-Row-1/nus-secondhand-market.git /scripts
volumeMounts:
- name: init-script
mountPath: /scripts
Expand Down
3 changes: 2 additions & 1 deletion helm/nshm/templates/transaction/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ spec:
args:
- |
export PGPASSWORD=$POSTGRES_PASSWORD && \
psql -h $DB_ENDPOINT -U $POSTGRES_USERNAME -d $DB_NAME -f /scripts/services/transaction/database/init.sql
psql -h $DB_ENDPOINT -U $POSTGRES_USERNAME -d postgres -c "CREATE DATABASE \"nshm-account\""
psql -h $DB_ENDPOINT -U $POSTGRES_USERNAME -d "nshm-account" -f /scripts/services/transaction/database/production/init.sql
volumeMounts:
- name: init-script
mountPath: /scripts
Expand Down
28 changes: 14 additions & 14 deletions helm/nshm/templates/wishlist/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ spec:
envFrom:
- secretRef:
name: wishlist-secret
livenessProbe:
httpGet:
path: /actuator/health/liveness
port: 8083
initialDelaySeconds: 30
periodSeconds: 30
failureThreshold: 3
#livenessProbe:
# httpGet:
# path: /actuator/health/liveness
# port: 8083
# initialDelaySeconds: 30
# periodSeconds: 30
# failureThreshold: 3

readinessProbe:
httpGet:
path: /actuator/health/readiness
port: 8083
initialDelaySeconds: 30
periodSeconds: 30
failureThreshold: 3
#readinessProbe:
# httpGet:
# path: /actuator/health/readiness
# port: 8083
# initialDelaySeconds: 30
# periodSeconds: 30
# failureThreshold: 3
7 changes: 5 additions & 2 deletions helm/nshm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ item:
wishlist:
image:
repository: z1yoon/nshm-wishlist
tag: f617eba726b60b6351b305e5b5b92b8633e85682
tag: b08938b837bc2fb554f3f07bf1e3493f15ff20c8
replicas: 1
resources:
limits:
Expand Down Expand Up @@ -72,12 +72,15 @@ notification:
transaction:
image:
repository: z1yoon/nshm-transaction
tag: latest
tag: 32458c0dfc2c3059ec22d610d55482611530183a
replicas: 1
resources:
limits:
cpu: 500m
memory: 512Mi
requests:
cpu: 250m
memory: 256Mi

# Rabbitmq service values
rabbitmq:
Expand Down

0 comments on commit ef320d6

Please sign in to comment.