Skip to content

Commit 834f907

Browse files
author
Andreas Mautsch
committed
Merge branch 'refs/heads/refactoring'
2 parents 49517fd + b85ece1 commit 834f907

File tree

116 files changed

+733
-1441
lines changed

Some content is hidden

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

116 files changed

+733
-1441
lines changed

doc/release-notes.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# 1.3.2
2+
- cleanup of event folder
3+
- network policies added
4+
- basic auth to core service added
5+
- kiali connection to tempo tracing added, spring application name now contains the Namespace
6+
- upgrade to apisix chart 2.8.0
7+
- upgrade to kind kubernetes 1.3.0
8+
- upgrade to kubernetes dashboard 6.0.8 (7.x has a lot of breaking changes)
9+
- Namespaces are now created ahead of time during initial install
10+
- moved dashboard to dashboard namespace
11+
- moved everything grafana to grafana namespace
12+
- added redis cluster to invoice
13+
114
# 1.3.1
215
- switchable kafka and rabbitmq broker added
316

doc/todo.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
# div
22
- kong oidc
3-
- kiali + grafana + tempo
43

54
## security
6-
- network policies
75
- secrets via vault
86
- volume encryption
9-
- RBAC
10-
- CSP Headers for Ingress that satisfy Owasp Zap (seems to need restat after every scan)
7+
- rbac k
118

129
# info
1310
- 10 best practices: https://www.youtube.com/watch?app=desktop&v=oBf5lrmquYI&pp=ygUSI211dGlyYW9rdWJlcm5ldGVz

helm/core/catalog/application/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ description: catalog-application
44

55
type: application
66

7-
version: 1.3.1
7+
version: 1.3.2
88

99
appVersion: "3.3.0"

helm/core/catalog/application/templates/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ data:
2929
springdoc.api-docs.path: "//"
3030

3131
#zipkin/jaeger
32-
spring.application.name: "{{ include "application.fullname" . }}"
33-
management.otlp.tracing.endpoint: "http://tempo.monitoring:4318/v1/traces"
32+
spring.application.name: "{{ include "application.fullname" . }}.{{ .Release.Namespace }}"
33+
management.otlp.tracing.endpoint: "http://tempo.grafana:4318/v1/traces"
3434
management.tracing.sampling.probability: "1.0"
3535

3636
#persistence

helm/core/catalog/application/templates/configlog.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ metadata:
66
{{- include "application.labels" . | nindent 4 }}
77
data:
88
#log levels
9+
logging.pattern.level: "%5p tenantId=%X{tenantId:-}"
10+
911
logging.level.root: "WARN"
1012
logging.level.org.goafabric: "INFO"
1113

helm/core/catalog/batch/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ description: catalog-batch
44

55
type: application
66

7-
version: 1.3.1
7+
version: 1.3.2
88

99
appVersion: "3.3.0"

helm/core/catalog/batch/templates/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ data:
2626
springdoc.api-docs.path: "//"
2727

2828
#zipkin/jaeger
29-
spring.application.name: "{{ include "application.fullname" . }}"
30-
management.zipkin.tracing.endpoint: "http://zipkin.monitoring:9411/api/v2/spans"
29+
spring.application.name: "{{ include "application.fullname" . }}.{{ .Release.Namespace }}"
30+
management.zipkin.tracing.endpoint: "http://zipkin.grafana:9411/api/v2/spans"
3131
management.tracing.sampling.probability: "1.0"
3232
management.tracing.enabled: "true"
3333
logging.level.zipkin2.reporter: "ERROR"

helm/core/core/application/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: core-application
44

55
type: application
66

7-
version: 1.3.1
7+
version: 1.3.2
88

99
appVersion: "3.3.0"
1010

helm/core/core/application/stack

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ function up() {
1111
--set image.arch=$IMAGE_ARCH $INGRESS_AUTHENTICATION \
1212
--set ingress.hosts=`kubectl get configmaps cluster-config -o jsonpath='{.data.hostname}' -n default` \
1313
--set database.password=postgres \
14+
--set service.password=secret \
1415
--set s3.password=minioadmin \
1516
--set oidc.session.secret=secretsecretsecret \
1617
--namespace `pwd | rev | cut -d '/' -f3 | rev` \

helm/core/core/application/templates/config.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ data:
2424
springdoc.api-docs.path: "//"
2525

2626
#zipkin/jaeger
27-
spring.application.name: "{{ include "application.fullname" . }}"
28-
management.otlp.tracing.endpoint: "http://tempo.monitoring:4318/v1/traces"
27+
spring.application.name: "{{ include "application.fullname" . }}.{{ .Release.Namespace }}"
28+
management.otlp.tracing.endpoint: "http://tempo.grafana:4318/v1/traces"
2929
management.tracing.sampling.probability: "1.0"
3030

3131
#persistence
@@ -43,14 +43,8 @@ data:
4343
#frontend
4444
frontend.catalog-service.uri: "http://catalog-application:8080"
4545

46-
#monitoring view
47-
monitoring.view.enabled: "true"
48-
monitoring.view.tracing.url: "/jaeger"
49-
monitoring.view.loki.url: "/grafana/explore"
50-
monitoring.view.s3.url: "/s3"
51-
5246
#
5347
spring.cloud.aws.s3.endpoint: "http://s3-minio:9000"
54-
spring.cloud.aws.s3.enabled: "false"
48+
spring.cloud.aws.s3.enabled: "true"
5549

5650
event.dispatcher.uri: "http://event-dispatcher-service-application.event:8080/events/dispatch"

0 commit comments

Comments
 (0)