From c4f04d379ab427475ec792d9758ae2c02aae1e00 Mon Sep 17 00:00:00 2001 From: jmac Date: Fri, 12 Oct 2018 18:24:24 +0000 Subject: 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 Issue-ID: OOM-1472 --- .../charts/so-sdnc-adapter/templates/deployment.yaml | 2 +- kubernetes/so/charts/so-sdnc-adapter/values.yaml | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'kubernetes/so/charts/so-sdnc-adapter') 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 -- cgit 1.2.3-korg