diff --git a/kubernetes/helm/openslice/templates/artemis.yaml b/kubernetes/helm/openslice/templates/artemis.yaml
index 74c4800b1946b065839abad8a06410616c721ffb..87c75ea00d59459c65d068fce3d7f8eb62fa71bc 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 fbd5e7ae90c52c52e21ca95771174db2b226595c..30b2025c27637392e801158d5ea496c11c8a03b2 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 640225776ec891c031d180b7f1d68bb508d9a849..d759a2554c42af2abf6e209f2207b92cfc9ef7cb 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 a43e810552eff7c0d1a95f2d78947e671e512bbf..b8143fcd9f39869242c7192e96b1a55a08e94246 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 a70e1047bb55b54189cb39cd915bfe196ec67002..a08ebd4510247017626150e9f5b5553d9417bbfc 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 7c80c481a30f1cfeaf67613f22dc6d4acc89ff8a..3b90404a5f87cce2bc5151ad8fb72393f8cc8405 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 1b697565a8116436074791fe09518368ce8a0f9b..fca2bdbe8782e30adda9e4a54e3b0aa455f5a573 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 c6b6f71ba2d290421912ef305928122da48cc7d4..3139d11f6a3c164693ec045c753586ec917ad651 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 caea66047d3a6c270b03a2b8bf6c6e39beeaf40b..88fd7131a43fb6ea2a7ecf30084a872063294ca2 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 6aa246a2e5cd655ff7c51c1538ab4be1b9ad619a..b69a3f1e8cd3ecf222ed5aaa21f44feb52d2d950 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 1b4ec2c137fa7e270177548ba3580a4b2f05ce14..c73b3df7afde260c8e74fafd0a8825a3d455e8d7 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 906bed086f2e2978dfc2dd228815fdb1867be2f8..12edc14626ad446a6114fec67e38954cd46e8bac 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 072c2f5f92a886ef30d43d59d1290a0ecf630c7c..c84ee91f0b44ef930b1d4c510a9ce12a2b8b7556 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 6721ca24d667b10cd7ce994e009e159e19eb0e26..e52a6b32f69513b09de3169b0780b39fdc7b56bf 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 9beec9d4e45b20fc6ef526efc92e187e2a034a76..c2b22a10b01c00f22a850b9e951189c86e849fb4 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 5ee897432d96423bec7cc1044835901b9e20f442..2d324ec79f2f34379c10d8b12ae10d3ad1cd493f 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 cbc1df7bff511836369bee4b2e8f8f57bffd66b0..2f6cccaa56be85aaecd3fa3e7a233e03a00f9a46 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"