From 858122e7f47e73584cd0e4a46b5095026faf416c Mon Sep 17 00:00:00 2001
From: dgiannopoulos <dimitris.giannopoulos@hotmail.com>
Date: Thu, 25 Apr 2024 16:36:10 +0300
Subject: [PATCH] feat: cleanup of files and properties
---
.../helm/openslice/templates/artemis.yaml | 1 +
.../helm/openslice/templates/blockdiag.yaml | 1 +
.../helm/openslice/templates/bugzilla.yaml | 1 +
.../helm/openslice/templates/centrallog.yaml | 1 +
.../openslice/templates/cridge-config.yaml | 2 +-
.../helm/openslice/templates/cridge.yaml | 12 ++------
.../helm/openslice/templates/keycloak.yaml | 1 +
.../helm/openslice/templates/kroki.yaml | 1 +
.../helm/openslice/templates/manoclient.yaml | 1 +
.../helm/openslice/templates/mysql.yaml | 1 +
.../helm/openslice/templates/oasapi.yaml | 1 +
kubernetes/helm/openslice/templates/osom.yaml | 1 +
.../helm/openslice/templates/osportalapi.yaml | 1 +
.../helm/openslice/templates/osscapi.yaml | 1 +
.../helm/openslice/templates/portalweb.yaml | 1 +
.../helm/openslice/templates/tmfweb.yaml | 1 +
kubernetes/helm/openslice/values.yaml | 30 +++++++++----------
17 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/kubernetes/helm/openslice/templates/artemis.yaml b/kubernetes/helm/openslice/templates/artemis.yaml
index 74c4800..87c75ea 100644
--- a/kubernetes/helm/openslice/templates/artemis.yaml
+++ b/kubernetes/helm/openslice/templates/artemis.yaml
@@ -26,6 +26,7 @@ spec:
spec:
containers:
- image: "{{ .Values.image.artemis.repository }}:{{ .Values.image.artemis.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.artemis.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-artemis
resources:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/blockdiag.yaml b/kubernetes/helm/openslice/templates/blockdiag.yaml
index fbd5e7a..30b2025 100644
--- a/kubernetes/helm/openslice/templates/blockdiag.yaml
+++ b/kubernetes/helm/openslice/templates/blockdiag.yaml
@@ -26,6 +26,7 @@ spec:
spec:
containers:
- image: "{{ .Values.image.blockdiag.repository }}:{{ .Values.image.blockdiag.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.blockdiag.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-blockdiag
resources:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/bugzilla.yaml b/kubernetes/helm/openslice/templates/bugzilla.yaml
index 6402257..d759a25 100644
--- a/kubernetes/helm/openslice/templates/bugzilla.yaml
+++ b/kubernetes/helm/openslice/templates/bugzilla.yaml
@@ -26,6 +26,7 @@ spec:
spec:
containers:
- image: "{{ .Values.image.bugzilla.repository }}:{{ .Values.image.bugzilla.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.bugzilla.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-bugzilla
env:
- name: SPRING_APPLICATION_JSON
diff --git a/kubernetes/helm/openslice/templates/centrallog.yaml b/kubernetes/helm/openslice/templates/centrallog.yaml
index a43e810..b8143fc 100644
--- a/kubernetes/helm/openslice/templates/centrallog.yaml
+++ b/kubernetes/helm/openslice/templates/centrallog.yaml
@@ -26,6 +26,7 @@ spec:
spec:
containers:
- image: "{{ .Values.image.centrallog.repository }}:{{ .Values.image.centrallog.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.centrallog.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-centrallog
env:
- name: SPRING_APPLICATION_JSON
diff --git a/kubernetes/helm/openslice/templates/cridge-config.yaml b/kubernetes/helm/openslice/templates/cridge-config.yaml
index a70e104..a08ebd4 100644
--- a/kubernetes/helm/openslice/templates/cridge-config.yaml
+++ b/kubernetes/helm/openslice/templates/cridge-config.yaml
@@ -9,5 +9,5 @@ metadata:
{{- include "openslice.labels" . | nindent 4 }}
name: {{ include "openslice.fullname" . }}-cridge-kubeconfig
data:
- kubeconfig: |-
+ config: |-
{{- .Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml" | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/cridge.yaml b/kubernetes/helm/openslice/templates/cridge.yaml
index 7c80c48..3b90404 100644
--- a/kubernetes/helm/openslice/templates/cridge.yaml
+++ b/kubernetes/helm/openslice/templates/cridge.yaml
@@ -1,5 +1,5 @@
apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
metadata:
namespace: {{ .Release.Namespace }}
labels:
@@ -12,7 +12,6 @@ spec:
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
{{- end }}
- serviceName: {{ include "openslice.fullname" . }}-cridge
selector:
matchLabels:
app: {{ include "openslice.fullname" . }}
@@ -31,6 +30,7 @@ spec:
command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-osscapi; do echo waiting for osscapi; sleep 2; done"]
containers:
- image: "{{ .Values.image.cridge.repository }}:{{ .Values.image.cridge.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.cridge.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-cridge
env:
- name: SPRING_APPLICATION_JSON
@@ -40,7 +40,7 @@ spec:
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"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:
{{- toYaml .Values.resources | nindent 12 }}
@@ -48,12 +48,6 @@ spec:
- name: cridge-kubeconfig
readOnly: true
mountPath: /root/.kube
- readinessProbe:
- exec:
- command: ["sh", "-c", "kubectl version --client"]
- initialDelaySeconds: 5
- periodSeconds: 2
- timeoutSeconds: 1
restartPolicy: Always
volumes:
- name: cridge-kubeconfig
diff --git a/kubernetes/helm/openslice/templates/keycloak.yaml b/kubernetes/helm/openslice/templates/keycloak.yaml
index 1b69756..fca2bdb 100644
--- a/kubernetes/helm/openslice/templates/keycloak.yaml
+++ b/kubernetes/helm/openslice/templates/keycloak.yaml
@@ -31,6 +31,7 @@ spec:
hostNetwork: {{ .Values.hostNetwork }}
containers:
- image: "{{ .Values.image.keycloak.repository }}:{{ .Values.image.keycloak.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.keycloak.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-keycloak
env:
- name: DB_VENDOR
diff --git a/kubernetes/helm/openslice/templates/kroki.yaml b/kubernetes/helm/openslice/templates/kroki.yaml
index c6b6f71..3139d11 100644
--- a/kubernetes/helm/openslice/templates/kroki.yaml
+++ b/kubernetes/helm/openslice/templates/kroki.yaml
@@ -26,6 +26,7 @@ spec:
spec:
containers:
- image: "{{ .Values.image.kroki.repository }}:{{ .Values.image.kroki.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.kroki.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-kroki
resources:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/manoclient.yaml b/kubernetes/helm/openslice/templates/manoclient.yaml
index caea660..88fd713 100644
--- a/kubernetes/helm/openslice/templates/manoclient.yaml
+++ b/kubernetes/helm/openslice/templates/manoclient.yaml
@@ -26,6 +26,7 @@ spec:
spec:
containers:
- image: "{{ .Values.image.manoclient.repository }}:{{ .Values.image.manoclient.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.manoclient.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-manoclient
env:
- name: SPRING_APPLICATION_JSON
diff --git a/kubernetes/helm/openslice/templates/mysql.yaml b/kubernetes/helm/openslice/templates/mysql.yaml
index 6aa246a..b69a3f1 100644
--- a/kubernetes/helm/openslice/templates/mysql.yaml
+++ b/kubernetes/helm/openslice/templates/mysql.yaml
@@ -27,6 +27,7 @@ spec:
spec:
containers:
- image: "{{ .Values.image.mysql.repository }}:{{ .Values.image.mysql.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.mysql.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-mysql
args:
- "--ignore-db-dir=lost+found"
diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml
index 1b4ec2c..c73b3df 100644
--- a/kubernetes/helm/openslice/templates/oasapi.yaml
+++ b/kubernetes/helm/openslice/templates/oasapi.yaml
@@ -34,6 +34,7 @@ spec:
hostNetwork: {{ .Values.hostNetwork }}
containers:
- image: "{{ .Values.image.oasapi.repository }}:{{ .Values.image.oasapi.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.oasapi.pullPolicy | default "Always" }}
name: {{ .Release.Name }}-oasapi
env:
- name: SPRING_APPLICATION_JSON
diff --git a/kubernetes/helm/openslice/templates/osom.yaml b/kubernetes/helm/openslice/templates/osom.yaml
index 906bed0..12edc14 100644
--- a/kubernetes/helm/openslice/templates/osom.yaml
+++ b/kubernetes/helm/openslice/templates/osom.yaml
@@ -26,6 +26,7 @@ spec:
spec:
containers:
- image: "{{ .Values.image.osom.repository }}:{{ .Values.image.osom.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.osom.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-osom
env:
- name: SPRING_APPLICATION_JSON
diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml
index 072c2f5..c84ee91 100644
--- a/kubernetes/helm/openslice/templates/osportalapi.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi.yaml
@@ -35,6 +35,7 @@ spec:
command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"]
containers:
- image: "{{ .Values.image.portalapi.repository }}:{{ .Values.image.portalapi.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.portalapi.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-osportalapi
env:
- name: SPRING_APPLICATION_JSON
diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml
index 6721ca2..e52a6b3 100644
--- a/kubernetes/helm/openslice/templates/osscapi.yaml
+++ b/kubernetes/helm/openslice/templates/osscapi.yaml
@@ -34,6 +34,7 @@ spec:
command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"]
containers:
- image: "{{ .Values.image.osscapi.repository }}:{{ .Values.image.osscapi.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.osscapi.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-osscapi
env:
- name: SPRING_APPLICATION_JSON
diff --git a/kubernetes/helm/openslice/templates/portalweb.yaml b/kubernetes/helm/openslice/templates/portalweb.yaml
index 9beec9d..c2b22a1 100644
--- a/kubernetes/helm/openslice/templates/portalweb.yaml
+++ b/kubernetes/helm/openslice/templates/portalweb.yaml
@@ -27,6 +27,7 @@ spec:
hostNetwork: {{ .Values.hostNetwork }}
containers:
- image: "{{ .Values.image.portalweb.repository }}:{{ .Values.image.portalweb.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.portalweb.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-portalweb
resources:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/tmfweb.yaml b/kubernetes/helm/openslice/templates/tmfweb.yaml
index 5ee8974..2d324ec 100644
--- a/kubernetes/helm/openslice/templates/tmfweb.yaml
+++ b/kubernetes/helm/openslice/templates/tmfweb.yaml
@@ -27,6 +27,7 @@ spec:
hostNetwork: {{ .Values.hostNetwork }}
containers:
- image: "{{ .Values.image.tmfweb.repository }}:{{ .Values.image.tmfweb.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.image.tmfweb.pullPolicy | default "Always" }}
name: {{ include "openslice.fullname" . }}-tmfweb
resources:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml
index cbc1df7..2f6ccca 100644
--- a/kubernetes/helm/openslice/values.yaml
+++ b/kubernetes/helm/openslice/values.yaml
@@ -7,77 +7,77 @@ replicaCount: 1
image:
artemis:
repository: apache/activemq-artemis
- pullPolicy: IfNotPresent
+ pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "2.30.0"
blockdiag:
repository: yuzutech/kroki-blockdiag
- pullPolicy: IfNotPresent
+ pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
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.
tag: "develop"
centrallog:
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.
tag: "develop"
keycloak:
repository: quay.io/keycloak/keycloak
- pullPolicy: IfNotPresent
+ pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "16.1.1"
kroki:
repository: yuzutech/kroki
- pullPolicy: IfNotPresent
+ pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
manoclient:
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.
tag: "develop"
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.
tag: "develop"
portalapi:
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.
tag: "develop"
osscapi:
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.
tag: "develop"
mysql:
repository: mysql
- pullPolicy: IfNotPresent
+ pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "5.7.43"
oasapi:
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.
tag: "develop"
portalweb:
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.
tag: "develop"
tmfweb:
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.
tag: "develop"
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.
tag: "develop"
--
GitLab