From 22b286018b54e5aeb865fb4299cd7574d24e69b8 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Mon, 1 Jul 2024 12:58:36 +0000
Subject: [PATCH] fix: added per component values properties and storage values
---
.../helm/openslice/templates/cridge.yaml | 2 +-
.../helm/openslice/templates/manoclient.yaml | 2 +-
.../openslice/templates/oasapi-pv-pvc.yaml | 4 +--
.../helm/openslice/templates/oasapi.yaml | 2 +-
.../helm/openslice/templates/osom-pv-pvc.yaml | 4 +--
kubernetes/helm/openslice/templates/osom.yaml | 4 +--
.../templates/osportalapi-pv-pvc.yaml | 4 +--
.../helm/openslice/templates/osportalapi.yaml | 2 +-
.../helm/openslice/templates/osscapi.yaml | 2 +-
kubernetes/helm/openslice/values.yaml | 35 +++++++++++++++----
10 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/kubernetes/helm/openslice/templates/cridge.yaml b/kubernetes/helm/openslice/templates/cridge.yaml
index f65c1ad..5e55846 100644
--- a/kubernetes/helm/openslice/templates/cridge.yaml
+++ b/kubernetes/helm/openslice/templates/cridge.yaml
@@ -39,7 +39,7 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"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" }}"
}
resources:
diff --git a/kubernetes/helm/openslice/templates/manoclient.yaml b/kubernetes/helm/openslice/templates/manoclient.yaml
index 88fd713..064c0c1 100644
--- a/kubernetes/helm/openslice/templates/manoclient.yaml
+++ b/kubernetes/helm/openslice/templates/manoclient.yaml
@@ -35,7 +35,7 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"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:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/oasapi-pv-pvc.yaml b/kubernetes/helm/openslice/templates/oasapi-pv-pvc.yaml
index 2e652f9..7b14641 100644
--- a/kubernetes/helm/openslice/templates/oasapi-pv-pvc.yaml
+++ b/kubernetes/helm/openslice/templates/oasapi-pv-pvc.yaml
@@ -14,7 +14,7 @@ spec:
- ReadWriteOnce
resources:
requests:
- storage: "1Gi"
+ storage: "100Mi"
---
{{- if or (not .Values.storageClass) (eq .Values.storageClass "manual") }}
apiVersion: v1
@@ -31,7 +31,7 @@ metadata:
spec:
storageClassName: "oasapi-pv-manual"
capacity:
- storage: "1Gi"
+ storage: "100Mi"
accessModes:
- ReadWriteOnce
hostPath:
diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml
index c73b3df..32e1d13 100644
--- a/kubernetes/helm/openslice/templates/oasapi.yaml
+++ b/kubernetes/helm/openslice/templates/oasapi.yaml
@@ -55,7 +55,7 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"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:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/osom-pv-pvc.yaml b/kubernetes/helm/openslice/templates/osom-pv-pvc.yaml
index 9c2c786..97e8061 100644
--- a/kubernetes/helm/openslice/templates/osom-pv-pvc.yaml
+++ b/kubernetes/helm/openslice/templates/osom-pv-pvc.yaml
@@ -14,7 +14,7 @@ spec:
- ReadWriteOnce
resources:
requests:
- storage: "100Mi"
+ storage: "1Gi"
---
{{- if or (not .Values.storageClass) (eq .Values.storageClass "manual") }}
apiVersion: v1
@@ -31,7 +31,7 @@ metadata:
spec:
storageClassName: "osom-pv-manual"
capacity:
- storage: "100Mi"
+ storage: "1Gi"
accessModes:
- ReadWriteOnce
hostPath:
diff --git a/kubernetes/helm/openslice/templates/osom.yaml b/kubernetes/helm/openslice/templates/osom.yaml
index eb4f70b..a5d3ab3 100644
--- a/kubernetes/helm/openslice/templates/osom.yaml
+++ b/kubernetes/helm/openslice/templates/osom.yaml
@@ -32,11 +32,11 @@ spec:
- name: SPRING_APPLICATION_JSON
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.user": "{{ .Values.oscreds.activemq.user }}",
"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:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml b/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml
index 3679ef5..cb3bc42 100644
--- a/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml
@@ -14,7 +14,7 @@ spec:
- ReadWriteOnce
resources:
requests:
- storage: "100Mi"
+ storage: "1Gi"
---
{{- if or (not .Values.storageClass) (eq .Values.storageClass "osportalapi-pv-volume") }}
apiVersion: v1
@@ -31,7 +31,7 @@ metadata:
spec:
storageClassName: "osportalapi-pv-volume"
capacity:
- storage: "100Mi"
+ storage: "1Gi"
accessModes:
- ReadWriteOnce
hostPath:
diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml
index ac99f4c..8c2927c 100644
--- a/kubernetes/helm/openslice/templates/osportalapi.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi.yaml
@@ -56,7 +56,7 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"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" }}"
}
resources:
diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml
index e52a6b3..cf96f7d 100644
--- a/kubernetes/helm/openslice/templates/osscapi.yaml
+++ b/kubernetes/helm/openslice/templates/osscapi.yaml
@@ -56,7 +56,7 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"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"
}
resources:
diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml
index 520ce49..5b07340 100644
--- a/kubernetes/helm/openslice/values.yaml
+++ b/kubernetes/helm/openslice/values.yaml
@@ -14,7 +14,7 @@ image:
repository: yuzutech/kroki-blockdiag
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
- tag: "0.18.0"
+ tag: "latest"
bugzilla:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
pullPolicy: Always
@@ -34,7 +34,7 @@ image:
repository: yuzutech/kroki
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
- tag: "0.18.0"
+ tag: "latest"
manoclient:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
pullPolicy: Always
@@ -50,7 +50,6 @@ image:
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
- logLevel: INFO
osscapi:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
pullPolicy: Always
@@ -81,7 +80,6 @@ image:
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
- logLevel: INFO
bugzillaurl: example.com:443/bugzilla
bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
@@ -117,8 +115,33 @@ mysql:
storage: 10Gi
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
# storageClass: ~
--
GitLab