summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes')
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml17
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/values.yaml20
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml17
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/values.yaml20
-rwxr-xr-xkubernetes/so/charts/so-mariadb/values.yaml16
-rw-r--r--kubernetes/so/charts/so-monitoring/templates/deployment.yaml4
-rw-r--r--kubernetes/so/charts/so-monitoring/values.yaml19
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml17
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/values.yaml21
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml17
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/values.yaml21
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/templates/deployment.yaml17
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/values.yaml21
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/values.yaml19
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml17
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/values.yaml21
-rwxr-xr-xkubernetes/so/templates/deployment.yaml17
-rwxr-xr-xkubernetes/so/values.yaml44
19 files changed, 319 insertions, 28 deletions
diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
index 20068a8edd..ad3a19f37e 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
@@ -34,6 +34,21 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - {{ .Values.mariadb.nameOverride }}
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
@@ -73,7 +88,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "common.fullname" . }}-configmap
- imagePullPolicy: {{ index .Values "global" "pullPolicy" }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: logs
mountPath: /app/logs
diff --git a/kubernetes/so/charts/so-bpmn-infra/values.yaml b/kubernetes/so/charts/so-bpmn-infra/values.yaml
index 6f301b9774..44d32fa4b8 100755
--- a/kubernetes/so/charts/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/values.yaml
@@ -11,9 +11,25 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ nodePortPrefixExt: 304
+ repository: nexus3.onap.org:10001
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
+ persistence:
+ mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
repository: nexus3.onap.org:10001
image: onap/so/bpmn-infra:1.3.0-STAGING-latest
-pullPolicy: IfNotPresent
+pullPolicy: Always
+
replicaCount: 1
minReadySeconds: 10
containerPort: 8081
@@ -55,6 +71,8 @@ livenessProbe:
timeoutSeconds: 10
successThreshold: 1
failureThreshold: 3
+mariadb:
+ nameOverride: so-mariadb
ingress:
enabled: false
nodeSelector: {}
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
index 20068a8edd..ad3a19f37e 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
@@ -34,6 +34,21 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - {{ .Values.mariadb.nameOverride }}
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
@@ -73,7 +88,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "common.fullname" . }}-configmap
- imagePullPolicy: {{ index .Values "global" "pullPolicy" }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: logs
mountPath: /app/logs
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
index 2083633599..105b3d4085 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
@@ -11,9 +11,25 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ nodePortPrefixExt: 304
+ repository: nexus3.onap.org:10001
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
+ persistence:
+ mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
repository: nexus3.onap.org:10001
image: onap/so/catalog-db-adapter:1.3.0-STAGING-latest
-pullPolicy: IfNotPresent
+pullPolicy: Always
+
replicaCount: 1
minReadySeconds: 10
containerPort: 8082
@@ -56,6 +72,8 @@ livenessProbe:
timeoutSeconds: 10
successThreshold: 1
failureThreshold: 3
+mariadb:
+ nameOverride: so-mariadb
ingress:
enabled: false
nodeSelector: {}
diff --git a/kubernetes/so/charts/so-mariadb/values.yaml b/kubernetes/so/charts/so-mariadb/values.yaml
index 954589967c..9587c4a4cd 100755
--- a/kubernetes/so/charts/so-mariadb/values.yaml
+++ b/kubernetes/so/charts/so-mariadb/values.yaml
@@ -14,16 +14,28 @@
# Default values for mariadb.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
-global: # global defaults
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
nodePortPrefix: 302
- persistence: {}
+ nodePortPrefixExt: 304
+ repository: nexus3.onap.org:10001
readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
ubuntuInitRepository: registry.hub.docker.com
+ persistence:
+ mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
# application image
repository: nexus3.onap.org:10001
image: mariadb:10.1.11
pullPolicy: Always
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+
# application configuration
config:
mariadbRootPassword: password
diff --git a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
index e11e404e8d..bfedc05a19 100644
--- a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
volumeMounts:
- name: logs
mountPath: /app/logs
- imagePullPolicy: {{ index .Values.pullPolicy }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/bin/sh", "-c", "chown -Rf 1000:1000 /app/logs"]
restartPolicy: Always
containers:
@@ -87,7 +87,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "common.fullname" . }}-configmap
- imagePullPolicy: {{ index .Values "global" "pullPolicy" }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: logs
mountPath: /app/logs
diff --git a/kubernetes/so/charts/so-monitoring/values.yaml b/kubernetes/so/charts/so-monitoring/values.yaml
index 79170eb5d2..a0915a1223 100644
--- a/kubernetes/so/charts/so-monitoring/values.yaml
+++ b/kubernetes/so/charts/so-monitoring/values.yaml
@@ -16,8 +16,25 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
# @author: gareth.roper@ericsson.com
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ nodePortPrefixExt: 304
+ repository: nexus3.onap.org:10001
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
+ persistence:
+ mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+repository: nexus3.onap.org:10001
image: onap/so/so-monitoring:latest
-pullPolicy: IfNotPresent
+pullPolicy: Always
+
replicaCount: 1
minReadySeconds: 10
containerPort: 9091
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
index 20068a8edd..ad3a19f37e 100755
--- a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
@@ -34,6 +34,21 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - {{ .Values.mariadb.nameOverride }}
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
@@ -73,7 +88,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "common.fullname" . }}-configmap
- imagePullPolicy: {{ index .Values "global" "pullPolicy" }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: logs
mountPath: /app/logs
diff --git a/kubernetes/so/charts/so-openstack-adapter/values.yaml b/kubernetes/so/charts/so-openstack-adapter/values.yaml
index f30de2799f..447b7cab75 100755
--- a/kubernetes/so/charts/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/values.yaml
@@ -11,8 +11,25 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ nodePortPrefixExt: 304
+ repository: nexus3.onap.org:10001
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
+ persistence:
+ mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
image: onap/so/openstack-adapter:1.3.0-STAGING-latest
-pullPolicy: IfNotPresent
+pullPolicy: Always
+repository: nexus3.onap.org:10001
+
replicaCount: 1
minReadySeconds: 10
containerPort: 8087
@@ -55,6 +72,8 @@ livenessProbe:
timeoutSeconds: 10
successThreshold: 1
failureThreshold: 3
+mariadb:
+ nameOverride: so-mariadb
ingress:
enabled: false
config:
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
index 20068a8edd..ad3a19f37e 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
@@ -34,6 +34,21 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - {{ .Values.mariadb.nameOverride }}
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
@@ -73,7 +88,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "common.fullname" . }}-configmap
- imagePullPolicy: {{ index .Values "global" "pullPolicy" }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: logs
mountPath: /app/logs
diff --git a/kubernetes/so/charts/so-request-db-adapter/values.yaml b/kubernetes/so/charts/so-request-db-adapter/values.yaml
index 50eb7ba776..9d350c4248 100755
--- a/kubernetes/so/charts/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/values.yaml
@@ -11,8 +11,25 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ nodePortPrefixExt: 304
+ repository: nexus3.onap.org:10001
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
+ persistence:
+ mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+repository: nexus3.onap.org:10001
image: onap/so/request-db-adapter:1.3.0-STAGING-latest
-pullPolicy: IfNotPresent
+pullPolicy: Always
+
replicaCount: 1
minReadySeconds: 10
containerPort: 8083
@@ -55,6 +72,8 @@ livenessProbe:
timeoutSeconds: 10
successThreshold: 1
failureThreshold: 3
+mariadb:
+ nameOverride: so-mariadb
ingress:
enabled: false
nodeSelector: {}
diff --git a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
index 20068a8edd..ad3a19f37e 100755
--- a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
@@ -34,6 +34,21 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - {{ .Values.mariadb.nameOverride }}
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
@@ -73,7 +88,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "common.fullname" . }}-configmap
- imagePullPolicy: {{ index .Values "global" "pullPolicy" }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: logs
mountPath: /app/logs
diff --git a/kubernetes/so/charts/so-sdc-controller/values.yaml b/kubernetes/so/charts/so-sdc-controller/values.yaml
index 2981a82c0d..e996c24da6 100755
--- a/kubernetes/so/charts/so-sdc-controller/values.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/values.yaml
@@ -11,8 +11,25 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ nodePortPrefixExt: 304
+ repository: nexus3.onap.org:10001
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
+ persistence:
+ mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+repository: nexus3.onap.org:10001
image: onap/so/sdc-controller:1.3.0-STAGING-latest
-pullPolicy: IfNotPresent
+pullPolicy: Always
+
replicaCount: 1
minReadySeconds: 10
containerPort: 8085
@@ -55,6 +72,8 @@ livenessProbe:
timeoutSeconds: 10
successThreshold: 1
failureThreshold: 3
+mariadb:
+ nameOverride: so-mariadb
ingress:
enabled: false
nodeSelector: {}
diff --git a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
index 20068a8edd..56b628c539 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
@@ -73,7 +73,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "common.fullname" . }}-configmap
- imagePullPolicy: {{ index .Values "global" "pullPolicy" }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: logs
mountPath: /app/logs
diff --git a/kubernetes/so/charts/so-sdnc-adapter/values.yaml b/kubernetes/so/charts/so-sdnc-adapter/values.yaml
index 4bab856b98..11abcd8415 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/values.yaml
@@ -11,8 +11,25 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ nodePortPrefixExt: 304
+ repository: nexus3.onap.org:10001
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
+ persistence:
+ mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+repository: nexus3.onap.org:10001
image: onap/so/sdnc-adapter:1.3.0-STAGING-latest
-pullPolicy: IfNotPresent
+pullPolicy: Always
+
replicaCount: 1
minReadySeconds: 10
containerPort: 8086
diff --git a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
index 20068a8edd..ad3a19f37e 100755
--- a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
@@ -34,6 +34,21 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - {{ .Values.mariadb.nameOverride }}
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
@@ -73,7 +88,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "common.fullname" . }}-configmap
- imagePullPolicy: {{ index .Values "global" "pullPolicy" }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: logs
mountPath: /app/logs
diff --git a/kubernetes/so/charts/so-vfc-adapter/values.yaml b/kubernetes/so/charts/so-vfc-adapter/values.yaml
index b0c3b0114e..3d9de229e9 100755
--- a/kubernetes/so/charts/so-vfc-adapter/values.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/values.yaml
@@ -11,8 +11,25 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ nodePortPrefixExt: 304
+ repository: nexus3.onap.org:10001
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
+ persistence:
+ mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+repository: nexus3.onap.org:10001
image: onap/so/vfc-adapter:1.3.0-STAGING-latest
-pullPolicy: IfNotPresent
+pullPolicy: Always
+
replicaCount: 1
minReadySeconds: 10
containerPort: 8084
@@ -55,6 +72,8 @@ livenessProbe:
timeoutSeconds: 10
successThreshold: 1
failureThreshold: 3
+mariadb:
+ nameOverride: so-mariadb
ingress:
enabled: false
nodeSelector: {}
diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index 20068a8edd..ad3a19f37e 100755
--- a/kubernetes/so/templates/deployment.yaml
+++ b/kubernetes/so/templates/deployment.yaml
@@ -34,6 +34,21 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - {{ .Values.mariadb.nameOverride }}
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
@@ -73,7 +88,7 @@ spec:
envFrom:
- configMapRef:
name: {{ include "common.fullname" . }}-configmap
- imagePullPolicy: {{ index .Values "global" "pullPolicy" }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: logs
mountPath: /app/logs
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 60d0424e6f..8a504beb3b 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -11,9 +11,25 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ nodePortPrefixExt: 304
+ repository: nexus3.onap.org:10001
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
+ persistence:
+ mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
repository: nexus3.onap.org:10001
image: onap/so/api-handler-infra:1.3.0-STAGING-latest
-pullPolicy: IfNotPresent
+pullPolicy: Always
+
replicaCount: 1
minReadySeconds: 10
containerPort: 8080
@@ -55,13 +71,25 @@ livenessProbe:
timeoutSeconds: 10
successThreshold: 1
failureThreshold: 3
-global:
- nodePortPrefix: 302
- # docker repository
- repository: nexus3.onap.org:10001
- # image pull Policy
- pullPolicy: IfNotPresent
mariadb:
- nameOverride: so-db
+ nameOverride: so-mariadb
+so-bpmn-infra:
+ mariadb:
+ nameOverride: so-mariadb
+so-catalog-db-adapter:
+ mariadb:
+ nameOverride: so-mariadb
+so-openstack-adapter:
+ mariadb:
+ nameOverride: so-mariadb
+so-request-db-adapter:
+ mariadb:
+ nameOverride: so-mariadb
+so-sdc-controller:
+ mariadb:
+ nameOverride: so-mariadb
+so-vfc-adapter:
+ mariadb:
+ nameOverride: so-mariadb
nodeSelector: {}
affinity: {}