Skip to content
Snippets Groups Projects
Commit 22b28601 authored by Dimitrios Giannopoulos's avatar Dimitrios Giannopoulos
Browse files

fix: added per component values properties and storage values

parent 5620d4d3
No related branches found
No related tags found
3 merge requests!34Merging develop (merged from 2024Q2_RC) into main creating for 2024Q2 Release,!33Merging 2024Q2_RC into main creating for 2024Q2 Release,!32Merging 2024Q2_RC into develop
Pipeline #6965 passed
...@@ -39,7 +39,7 @@ spec: ...@@ -39,7 +39,7 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}", "logging.level.org.springframework" : "{{ .Values.cridge.spring.logLevel | default "INFO" }}",
"logging.level.org.etsi.osl.cridge" : "{{ .Values.cridge.logLevel | default "INFO" }}" "logging.level.org.etsi.osl.cridge" : "{{ .Values.cridge.logLevel | default "INFO" }}"
} }
resources: resources:
......
...@@ -35,7 +35,7 @@ spec: ...@@ -35,7 +35,7 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}" "logging.level.org.springframework" : "{{ .Values.manoclient.spring.logLevel | default "INFO" }}"
} }
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
......
...@@ -14,7 +14,7 @@ spec: ...@@ -14,7 +14,7 @@ spec:
- ReadWriteOnce - ReadWriteOnce
resources: resources:
requests: requests:
storage: "1Gi" storage: "100Mi"
--- ---
{{- if or (not .Values.storageClass) (eq .Values.storageClass "manual") }} {{- if or (not .Values.storageClass) (eq .Values.storageClass "manual") }}
apiVersion: v1 apiVersion: v1
...@@ -31,7 +31,7 @@ metadata: ...@@ -31,7 +31,7 @@ metadata:
spec: spec:
storageClassName: "oasapi-pv-manual" storageClassName: "oasapi-pv-manual"
capacity: capacity:
storage: "1Gi" storage: "100Mi"
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
hostPath: hostPath:
......
...@@ -55,7 +55,7 @@ spec: ...@@ -55,7 +55,7 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}" "logging.level.org.springframework" : "{{ .Values.oasapi.spring.logLevel | default "INFO" }}"
} }
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
......
...@@ -14,7 +14,7 @@ spec: ...@@ -14,7 +14,7 @@ spec:
- ReadWriteOnce - ReadWriteOnce
resources: resources:
requests: requests:
storage: "100Mi" storage: "1Gi"
--- ---
{{- if or (not .Values.storageClass) (eq .Values.storageClass "manual") }} {{- if or (not .Values.storageClass) (eq .Values.storageClass "manual") }}
apiVersion: v1 apiVersion: v1
...@@ -31,7 +31,7 @@ metadata: ...@@ -31,7 +31,7 @@ metadata:
spec: spec:
storageClassName: "osom-pv-manual" storageClassName: "osom-pv-manual"
capacity: capacity:
storage: "100Mi" storage: "1Gi"
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
hostPath: hostPath:
......
...@@ -32,11 +32,11 @@ spec: ...@@ -32,11 +32,11 @@ spec:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
value: >- value: >-
{ {
"spring.datasource.url" : "{{ .Values.spring.datasource.url | default "jdbc:h2:~/tempdb;DB_CLOSE_DELAY=-1" }}", "spring.datasource.url" : "{{ .Values.osom.spring.datasource.url | default "jdbc:h2:~/tempdb;DB_CLOSE_DELAY=-1" }}",
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}" "logging.level.org.springframework" : "{{ .Values.osom.spring.logLevel | default "INFO" }}"
} }
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
......
...@@ -14,7 +14,7 @@ spec: ...@@ -14,7 +14,7 @@ spec:
- ReadWriteOnce - ReadWriteOnce
resources: resources:
requests: requests:
storage: "100Mi" storage: "1Gi"
--- ---
{{- if or (not .Values.storageClass) (eq .Values.storageClass "osportalapi-pv-volume") }} {{- if or (not .Values.storageClass) (eq .Values.storageClass "osportalapi-pv-volume") }}
apiVersion: v1 apiVersion: v1
...@@ -31,7 +31,7 @@ metadata: ...@@ -31,7 +31,7 @@ metadata:
spec: spec:
storageClassName: "osportalapi-pv-volume" storageClassName: "osportalapi-pv-volume"
capacity: capacity:
storage: "100Mi" storage: "1Gi"
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
hostPath: hostPath:
......
...@@ -56,7 +56,7 @@ spec: ...@@ -56,7 +56,7 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}", "logging.level.org.springframework" : "{{ .Values.portalapi.spring.logLevel | default "INFO" }}",
"logging.level.org.etsi.osl.portal.api": "{{ .Values.portalapi.logLevel | default "INFO" }}" "logging.level.org.etsi.osl.portal.api": "{{ .Values.portalapi.logLevel | default "INFO" }}"
} }
resources: resources:
......
...@@ -56,7 +56,7 @@ spec: ...@@ -56,7 +56,7 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework": "{{ .Values.spring.logLevel | default "INFO" }}", "logging.level.org.springframework": "{{ .Values.osscapi.spring.logLevel | default "INFO" }}",
"kroki.serverurl":"{{ .Values.rooturl }}/kroki" "kroki.serverurl":"{{ .Values.rooturl }}/kroki"
} }
resources: resources:
......
...@@ -14,7 +14,7 @@ image: ...@@ -14,7 +14,7 @@ image:
repository: yuzutech/kroki-blockdiag repository: yuzutech/kroki-blockdiag
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "0.18.0" tag: "latest"
bugzilla: bugzilla:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
pullPolicy: Always pullPolicy: Always
...@@ -34,7 +34,7 @@ image: ...@@ -34,7 +34,7 @@ image:
repository: yuzutech/kroki repository: yuzutech/kroki
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "0.18.0" tag: "latest"
manoclient: manoclient:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
pullPolicy: Always pullPolicy: Always
...@@ -50,7 +50,6 @@ image: ...@@ -50,7 +50,6 @@ image:
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "develop" tag: "develop"
logLevel: INFO
osscapi: osscapi:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
pullPolicy: Always pullPolicy: Always
...@@ -81,7 +80,6 @@ image: ...@@ -81,7 +80,6 @@ image:
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "develop" tag: "develop"
logLevel: INFO
bugzillaurl: example.com:443/bugzilla bugzillaurl: example.com:443/bugzilla
bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
...@@ -117,7 +115,32 @@ mysql: ...@@ -117,7 +115,32 @@ mysql:
storage: 10Gi storage: 10Gi
cridge: cridge:
mode: "INFO" logLevel: INFO
spring:
loglevel: INFO
portalapi:
logLevel: INFO
spring:
loglevel: INFO
manoclient:
spring:
loglevel: INFO
oasapi:
spring:
loglevel: INFO
osom:
spring:
loglevel: INFO
datasource:
url: "jdbc:h2:~/tempdb;DB_CLOSE_DELAY=-1"
osscapi:
spring:
loglevel: INFO
# Storage class to be used for provisioning. Default is manual # Storage class to be used for provisioning. Default is manual
# storageClass: ~ # storageClass: ~
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment