Added missing maria db dependencies

If there are other inter-pod dependencies that should be
managed, please comment to let me know so they can be added.

Also addressed the missing globals section in the pods values.yaml
files and incorrect pull policy management to make them follow
the standard conventions

Change-Id: I3625f8452d90182391e1ff4af5fddfe9d0948a32
Signed-off-by: jmac <james.macnider@amdocs.com>
Issue-ID: OOM-1472

diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
index 20068a8..ad3a19f 100755 (executable)
--- 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:
         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 }}
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "common.repository" . }}/{{ .Values.image }}


@@ -73,7 +88,7 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ include "common.fullname" . }}-configmap
         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
         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 6f301b9..44d32fa 100755 (executable)
--- 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.
 # 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
 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
 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8081


@@ -55,6 +71,8 @@ livenessProbe:
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3

+mariadb:
+  nameOverride: so-mariadb

 ingress:
   enabled: false
 nodeSelector: {}
 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 20068a8..ad3a19f 100755 (executable)
--- 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:
         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 }}
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "common.repository" . }}/{{ .Values.image }}


@@ -73,7 +88,7 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ include "common.fullname" . }}-configmap
         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
         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 2083633..105b3d4 100755 (executable)
--- 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.
 # 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
 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
 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8082


@@ -56,6 +72,8 @@ livenessProbe:
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3

+mariadb:
+  nameOverride: so-mariadb

 ingress:
   enabled: false
 nodeSelector: {}
 ingress:
   enabled: false
 nodeSelector: {}

diff --git a/kubernetes/so/charts/so-mariadb/values.yaml b/kubernetes/so/charts/so-mariadb/values.yaml
index 9545899..9587c4a 100755 (executable)
--- 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.
 # 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
   nodePortPrefix: 302

-  persistence: {}
+  nodePortPrefixExt: 304
+  repository: nexus3.onap.org:10001

   readinessRepository: oomk8s
   readinessRepository: oomk8s

+  readinessImage: readiness-check:2.0.0

   ubuntuInitRepository: registry.hub.docker.com
   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 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
 # 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 e11e404..bfedc05 100644 (file)
--- 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
         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:
         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
         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
         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 79170eb..a0915a1 100644 (file)
--- 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
 #  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
 image: onap/so/so-monitoring:latest

-pullPolicy: IfNotPresent
+pullPolicy: Always
+

 replicaCount: 1
 minReadySeconds: 10
 containerPort: 9091
 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 20068a8..ad3a19f 100755 (executable)
--- 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:
         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 }}
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "common.repository" . }}/{{ .Values.image }}


@@ -73,7 +88,7 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ include "common.fullname" . }}-configmap
         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
         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 867e599..d076c72 100755 (executable)
--- 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.
 # 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
 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
 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8087


@@ -55,6 +72,8 @@ livenessProbe:
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3

+mariadb:
+  nameOverride: so-mariadb

 ingress:
   enabled: false
 nodeSelector: {}
 ingress:
   enabled: false
 nodeSelector: {}

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 20068a8..ad3a19f 100755 (executable)
--- 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:
         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 }}
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "common.repository" . }}/{{ .Values.image }}


@@ -73,7 +88,7 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ include "common.fullname" . }}-configmap
         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
         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 50eb7ba..9d350c4 100755 (executable)
--- 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.
 # 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
 image: onap/so/request-db-adapter:1.3.0-STAGING-latest

-pullPolicy: IfNotPresent
+pullPolicy: Always
+

 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8083
 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8083


@@ -55,6 +72,8 @@ livenessProbe:
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3

+mariadb:
+  nameOverride: so-mariadb

 ingress:
   enabled: false
 nodeSelector: {}
 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 20068a8..ad3a19f 100755 (executable)
--- 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:
         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 }}
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "common.repository" . }}/{{ .Values.image }}


@@ -73,7 +88,7 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ include "common.fullname" . }}-configmap
         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
         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 2981a82..e996c24 100755 (executable)
--- 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.
 # 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
 image: onap/so/sdc-controller:1.3.0-STAGING-latest

-pullPolicy: IfNotPresent
+pullPolicy: Always
+

 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8085
 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8085


@@ -55,6 +72,8 @@ livenessProbe:
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3

+mariadb:
+  nameOverride: so-mariadb

 ingress:
   enabled: false
 nodeSelector: {}
 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 20068a8..56b628c 100755 (executable)
--- 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
         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
         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 4bab856..11abcd8 100755 (executable)
--- 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.
 # 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
 image: onap/so/sdnc-adapter:1.3.0-STAGING-latest

-pullPolicy: IfNotPresent
+pullPolicy: Always
+

 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8086
 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 20068a8..ad3a19f 100755 (executable)
--- 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:
         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 }}
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "common.repository" . }}/{{ .Values.image }}


@@ -73,7 +88,7 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ include "common.fullname" . }}-configmap
         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
         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 b0c3b01..3d9de22 100755 (executable)
--- 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.
 # 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
 image: onap/so/vfc-adapter:1.3.0-STAGING-latest

-pullPolicy: IfNotPresent
+pullPolicy: Always
+

 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8084
 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8084


@@ -55,6 +72,8 @@ livenessProbe:
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3

+mariadb:
+  nameOverride: so-mariadb

 ingress:
   enabled: false
 nodeSelector: {}
 ingress:
   enabled: false
 nodeSelector: {}

diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index 20068a8..ad3a19f 100755 (executable)
--- 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:
         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 }}
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "common.repository" . }}/{{ .Values.image }}


@@ -73,7 +88,7 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ include "common.fullname" . }}-configmap
         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
         volumeMounts:
         - name: logs
           mountPath: /app/logs

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 60d0424..8a504be 100755 (executable)
--- 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.
 # 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
 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
 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8080


@@ -55,13 +71,25 @@ livenessProbe:
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3

-global:
-  nodePortPrefix: 302
-  # docker repository
-  repository: nexus3.onap.org:10001
-  # image pull Policy
-  pullPolicy: IfNotPresent

 mariadb:
 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: {}
 nodeSelector: {}
 affinity: {}