Skip to content
Snippets Groups Projects
Commit 858122e7 authored by dgiannopoulos's avatar dgiannopoulos
Browse files

feat: cleanup of files and properties

parent c9f0ab2a
No related branches found
No related tags found
4 merge requests!34Merging develop (merged from 2024Q2_RC) into main creating for 2024Q2 Release,!33Merging 2024Q2_RC into main creating for 2024Q2 Release,!29Resolve "Expose all configurable parameters during Kubernetes deployment",!28Resolve "Kubernetes installation needs to include CRIDGE component"
Pipeline #5763 passed
Showing
with 33 additions and 25 deletions
...@@ -26,6 +26,7 @@ spec: ...@@ -26,6 +26,7 @@ spec:
spec: spec:
containers: containers:
- image: "{{ .Values.image.artemis.repository }}:{{ .Values.image.artemis.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.artemis.repository }}:{{ .Values.image.artemis.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.artemis.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-artemis name: {{ include "openslice.fullname" . }}-artemis
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
......
...@@ -26,6 +26,7 @@ spec: ...@@ -26,6 +26,7 @@ spec:
spec: spec:
containers: containers:
- image: "{{ .Values.image.blockdiag.repository }}:{{ .Values.image.blockdiag.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.blockdiag.repository }}:{{ .Values.image.blockdiag.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.blockdiag.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-blockdiag name: {{ include "openslice.fullname" . }}-blockdiag
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
......
...@@ -26,6 +26,7 @@ spec: ...@@ -26,6 +26,7 @@ spec:
spec: spec:
containers: containers:
- image: "{{ .Values.image.bugzilla.repository }}:{{ .Values.image.bugzilla.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.bugzilla.repository }}:{{ .Values.image.bugzilla.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.bugzilla.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-bugzilla name: {{ include "openslice.fullname" . }}-bugzilla
env: env:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
......
...@@ -26,6 +26,7 @@ spec: ...@@ -26,6 +26,7 @@ spec:
spec: spec:
containers: containers:
- image: "{{ .Values.image.centrallog.repository }}:{{ .Values.image.centrallog.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.centrallog.repository }}:{{ .Values.image.centrallog.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.centrallog.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-centrallog name: {{ include "openslice.fullname" . }}-centrallog
env: env:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
......
...@@ -9,5 +9,5 @@ metadata: ...@@ -9,5 +9,5 @@ metadata:
{{- include "openslice.labels" . | nindent 4 }} {{- include "openslice.labels" . | nindent 4 }}
name: {{ include "openslice.fullname" . }}-cridge-kubeconfig name: {{ include "openslice.fullname" . }}-cridge-kubeconfig
data: data:
kubeconfig: |- config: |-
{{- .Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml" | nindent 4 }} {{- .Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml" | nindent 4 }}
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: Deployment
metadata: metadata:
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: labels:
...@@ -12,7 +12,6 @@ spec: ...@@ -12,7 +12,6 @@ spec:
{{- if not .Values.autoscaling.enabled }} {{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.replicaCount }}
{{- end }} {{- end }}
serviceName: {{ include "openslice.fullname" . }}-cridge
selector: selector:
matchLabels: matchLabels:
app: {{ include "openslice.fullname" . }} app: {{ include "openslice.fullname" . }}
...@@ -31,6 +30,7 @@ spec: ...@@ -31,6 +30,7 @@ spec:
command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-osscapi; do echo waiting for osscapi; sleep 2; done"] command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-osscapi; do echo waiting for osscapi; sleep 2; done"]
containers: containers:
- image: "{{ .Values.image.cridge.repository }}:{{ .Values.image.cridge.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.cridge.repository }}:{{ .Values.image.cridge.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.cridge.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-cridge name: {{ include "openslice.fullname" . }}-cridge
env: env:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
...@@ -40,7 +40,7 @@ spec: ...@@ -40,7 +40,7 @@ spec:
"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.spring.logLevel | default "INFO" }}",
"org.etsi.osl.cridge" : "{{ .Values.cridge.mode | default "DEBUG" }}" "org.etsi.osl.cridge" : "{{ .Values.cridge.mode | default "DEBUG" }}"
} }
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
...@@ -48,12 +48,6 @@ spec: ...@@ -48,12 +48,6 @@ spec:
- name: cridge-kubeconfig - name: cridge-kubeconfig
readOnly: true readOnly: true
mountPath: /root/.kube mountPath: /root/.kube
readinessProbe:
exec:
command: ["sh", "-c", "kubectl version --client"]
initialDelaySeconds: 5
periodSeconds: 2
timeoutSeconds: 1
restartPolicy: Always restartPolicy: Always
volumes: volumes:
- name: cridge-kubeconfig - name: cridge-kubeconfig
......
...@@ -31,6 +31,7 @@ spec: ...@@ -31,6 +31,7 @@ spec:
hostNetwork: {{ .Values.hostNetwork }} hostNetwork: {{ .Values.hostNetwork }}
containers: containers:
- image: "{{ .Values.image.keycloak.repository }}:{{ .Values.image.keycloak.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.keycloak.repository }}:{{ .Values.image.keycloak.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.keycloak.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-keycloak name: {{ include "openslice.fullname" . }}-keycloak
env: env:
- name: DB_VENDOR - name: DB_VENDOR
......
...@@ -26,6 +26,7 @@ spec: ...@@ -26,6 +26,7 @@ spec:
spec: spec:
containers: containers:
- image: "{{ .Values.image.kroki.repository }}:{{ .Values.image.kroki.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.kroki.repository }}:{{ .Values.image.kroki.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.kroki.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-kroki name: {{ include "openslice.fullname" . }}-kroki
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
......
...@@ -26,6 +26,7 @@ spec: ...@@ -26,6 +26,7 @@ spec:
spec: spec:
containers: containers:
- image: "{{ .Values.image.manoclient.repository }}:{{ .Values.image.manoclient.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.manoclient.repository }}:{{ .Values.image.manoclient.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.manoclient.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-manoclient name: {{ include "openslice.fullname" . }}-manoclient
env: env:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
......
...@@ -27,6 +27,7 @@ spec: ...@@ -27,6 +27,7 @@ spec:
spec: spec:
containers: containers:
- image: "{{ .Values.image.mysql.repository }}:{{ .Values.image.mysql.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.mysql.repository }}:{{ .Values.image.mysql.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.mysql.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-mysql name: {{ include "openslice.fullname" . }}-mysql
args: args:
- "--ignore-db-dir=lost+found" - "--ignore-db-dir=lost+found"
......
...@@ -34,6 +34,7 @@ spec: ...@@ -34,6 +34,7 @@ spec:
hostNetwork: {{ .Values.hostNetwork }} hostNetwork: {{ .Values.hostNetwork }}
containers: containers:
- image: "{{ .Values.image.oasapi.repository }}:{{ .Values.image.oasapi.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.oasapi.repository }}:{{ .Values.image.oasapi.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.oasapi.pullPolicy | default "Always" }}
name: {{ .Release.Name }}-oasapi name: {{ .Release.Name }}-oasapi
env: env:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
......
...@@ -26,6 +26,7 @@ spec: ...@@ -26,6 +26,7 @@ spec:
spec: spec:
containers: containers:
- image: "{{ .Values.image.osom.repository }}:{{ .Values.image.osom.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.osom.repository }}:{{ .Values.image.osom.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.osom.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-osom name: {{ include "openslice.fullname" . }}-osom
env: env:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
......
...@@ -35,6 +35,7 @@ spec: ...@@ -35,6 +35,7 @@ spec:
command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"] command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"]
containers: containers:
- image: "{{ .Values.image.portalapi.repository }}:{{ .Values.image.portalapi.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.portalapi.repository }}:{{ .Values.image.portalapi.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.portalapi.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-osportalapi name: {{ include "openslice.fullname" . }}-osportalapi
env: env:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
......
...@@ -34,6 +34,7 @@ spec: ...@@ -34,6 +34,7 @@ spec:
command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"] command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"]
containers: containers:
- image: "{{ .Values.image.osscapi.repository }}:{{ .Values.image.osscapi.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.osscapi.repository }}:{{ .Values.image.osscapi.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.osscapi.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-osscapi name: {{ include "openslice.fullname" . }}-osscapi
env: env:
- name: SPRING_APPLICATION_JSON - name: SPRING_APPLICATION_JSON
......
...@@ -27,6 +27,7 @@ spec: ...@@ -27,6 +27,7 @@ spec:
hostNetwork: {{ .Values.hostNetwork }} hostNetwork: {{ .Values.hostNetwork }}
containers: containers:
- image: "{{ .Values.image.portalweb.repository }}:{{ .Values.image.portalweb.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.portalweb.repository }}:{{ .Values.image.portalweb.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.portalweb.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-portalweb name: {{ include "openslice.fullname" . }}-portalweb
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
......
...@@ -27,6 +27,7 @@ spec: ...@@ -27,6 +27,7 @@ spec:
hostNetwork: {{ .Values.hostNetwork }} hostNetwork: {{ .Values.hostNetwork }}
containers: containers:
- image: "{{ .Values.image.tmfweb.repository }}:{{ .Values.image.tmfweb.tag | default .Chart.AppVersion }}" - image: "{{ .Values.image.tmfweb.repository }}:{{ .Values.image.tmfweb.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.tmfweb.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-tmfweb name: {{ include "openslice.fullname" . }}-tmfweb
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
......
...@@ -7,77 +7,77 @@ replicaCount: 1 ...@@ -7,77 +7,77 @@ replicaCount: 1
image: image:
artemis: artemis:
repository: apache/activemq-artemis repository: apache/activemq-artemis
pullPolicy: IfNotPresent pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "2.30.0" tag: "2.30.0"
blockdiag: blockdiag:
repository: yuzutech/kroki-blockdiag repository: yuzutech/kroki-blockdiag
pullPolicy: IfNotPresent pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" 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: IfNotPresent 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"
centrallog: centrallog:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service
pullPolicy: IfNotPresent 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"
keycloak: keycloak:
repository: quay.io/keycloak/keycloak repository: quay.io/keycloak/keycloak
pullPolicy: IfNotPresent pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "16.1.1" tag: "16.1.1"
kroki: kroki:
repository: yuzutech/kroki repository: yuzutech/kroki
pullPolicy: IfNotPresent pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" 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: IfNotPresent 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"
osom: osom:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom
pullPolicy: IfNotPresent 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"
portalapi: portalapi:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api
pullPolicy: IfNotPresent 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"
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: IfNotPresent 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"
mysql: mysql:
repository: mysql repository: mysql
pullPolicy: IfNotPresent pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "5.7.43" tag: "5.7.43"
oasapi: oasapi:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas
pullPolicy: IfNotPresent 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"
portalweb: portalweb:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web
pullPolicy: IfNotPresent 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"
tmfweb: tmfweb:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web
pullPolicy: IfNotPresent 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"
cridge: cridge:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge
pullPolicy: IfNotPresent 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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment