Skip to content

Commit

Permalink
chore: updated from master (#103)
Browse files Browse the repository at this point in the history
feat: add common.topologySpread (#101)

Co-authored-by: Kalin Krustev <kalin.krustev@gmail.com>
  • Loading branch information
geka-evk and kalinkrustev authored Nov 27, 2024
1 parent dd205c1 commit 0b3c959
Show file tree
Hide file tree
Showing 24 changed files with 47 additions and 32 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ executors:
default-docker-helm:
working_directory: /home/circleci/project
docker:
- image: alpine/helm:3.5.0
- image: alpine/helm:3.12.1

default-machine:
machine:
image: ubuntu-2004:202010-01
image: ubuntu-2004:current

##
# Jobs
Expand Down Expand Up @@ -323,15 +323,15 @@ workflows:
only: /.*/
- install-and-test-v1-20:
context: org-global
requires:
requires:
- build-and-test
- install-and-test-v1-21:
context: org-global
requires:
requires:
- build-and-test
- install-and-test-v1-22:
context: org-global
requires:
requires:
- build-and-test
- deploy:
context: org-global
Expand Down
6 changes: 3 additions & 3 deletions mojaloop/account-lookup-service/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ sources:
maintainers:
- name: Miguel de Barros
email: miguel.debarros@modusbox.com
- name: Tom Daly
email: tdaly61@gmail.com
- name: Tom Daly
email: tdaly61@gmail.com
dependencies:
- name: common
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
- name: account-lookup-service
version: 13.0.0
repository: "file://../chart-service"
Expand Down
2 changes: 1 addition & 1 deletion mojaloop/admin-api-svc/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/bof/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies:
tags:
- mojaloop
- common
version: 3.0.0
version: 3.1.0
- name: security-role-perm-operator-svc
condition: security-role-perm-operator-svc.enabled
repository: "file://../security-role-perm-operator-svc"
Expand Down
4 changes: 2 additions & 2 deletions mojaloop/chart-admin/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: account-lookup-service-admin
version: 13.0.0
appVersion: "11.8.0"
maintainers:
- name: Tom Daly
- name: Tom Daly
email: tdaly61@gmail.com
- name: Miguel de Barros
email: miguel.debarros@modusbox.com
Expand All @@ -13,4 +13,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
4 changes: 2 additions & 2 deletions mojaloop/chart-service/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: account-lookup-service
version: 13.0.0
appVersion: "11.8.0"
maintainers:
- name: Tom Daly
- name: Tom Daly
email: tdaly61@gmail.com
- name: Miguel de Barros
email: miguel.debarros@modusbox.com
Expand All @@ -13,4 +13,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
4 changes: 2 additions & 2 deletions mojaloop/common/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ annotations:
category: Infrastructure
apiVersion: v2
# Please make sure that version and appVersion are always the same.
appVersion: 3.0.0
appVersion: 3.1.0
description: A Library Helm Chart for grouping common logic between bitnami charts. This chart is not deployable by itself.
home: https://github.com/mojaloop/charts/tree/master/mojaloop/common
icon: https://bitnami.com/downloads/logos/bitnami-mark.png
Expand All @@ -20,4 +20,4 @@ sources:
- https://github.com/mojaloop/charts
- http://www.bitnami.com/
type: library
version: 3.0.0
version: 3.1.0
15 changes: 15 additions & 0 deletions mojaloop/common/templates/_topology.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{{- define "common.topologySpread" -}}
topologySpreadConstraints:
- maxSkew: 1
topologyKey: kubernetes.io/hostname
whenUnsatisfiable: ScheduleAnyway
labelSelector:
matchLabels:
app.kubernetes.io/name: {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
- maxSkew: 1
topologyKey: topology.kubernetes.io/zone
whenUnsatisfiable: ScheduleAnyway
labelSelector:
matchLabels:
app.kubernetes.io/name: {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end -}}
2 changes: 1 addition & 1 deletion mojaloop/finance-portal/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies:
tags:
- mojaloop
- common
version: 3.0.0
version: 3.1.0
- name: role-assignment-service
condition: role-assignment-service.enabled
repository: "file://../role-assignment-service"
Expand Down
2 changes: 1 addition & 1 deletion mojaloop/fspiop-transfer-api-svc/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/mojaloop/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies:
tags:
- mojaloop
- common
version: 3.0.0
version: 3.1.0
- name: fspiop-transfer-api-svc
repository: "file://../fspiop-transfer-api-svc"
tags:
Expand Down
2 changes: 1 addition & 1 deletion mojaloop/reporting-events-processor-svc/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/reporting-hub-bop-api-svc/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/reporting-hub-bop-experience-api-svc/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/reporting-hub-bop-positions-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/reporting-hub-bop-role-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/reporting-hub-bop-settlements-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/reporting-hub-bop-shell/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/reporting-hub-bop-trx-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/reporting-legacy-api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
- name: reporting-k8s-templates
alias: reporting-k8s-templates
condition: install-templates
Expand Down
2 changes: 1 addition & 1 deletion mojaloop/role-assignment-service/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/security-hub-bop-kratos-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion mojaloop/security-role-perm-operator-svc/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
2 changes: 1 addition & 1 deletion template/CHART_NAME/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
repository: "file://../common"
tags:
- moja-common
version: 3.0.0
version: 3.1.0
- condition: SUBCHART_NAME.enabled
name: SUBCHART_NAME
repository: https://charts.bitnami.com/bitnami
Expand Down

0 comments on commit 0b3c959

Please sign in to comment.