3 files changed, 105 insertions, 105 deletions
diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml
index 14b126863c..52a2c51844 100644
--- a/kubernetes/common/network-name-gen/requirements.yaml
+++ b/kubernetes/common/network-name-gen/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~2.0.0
+    version: ~3.0.0
     repository: '@local'
   - name: mariadb-galera
-    version: ~2.0.0
+    version: ~3.0.0
     repository: file://../mariadb-galera/
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml
index 96b3c790da..743c8be02e 100644
--- a/kubernetes/common/network-name-gen/templates/deployment.yaml
+++ b/kubernetes/common/network-name-gen/templates/deployment.yaml
@@ -78,7 +78,7 @@ spec:
         - name: AAI_URI
           value: "{{ .Values.config.aaiUri }}"
         resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml
index c992beae62..b40ac91cbc 100644
--- a/kubernetes/common/network-name-gen/values.yaml
+++ b/kubernetes/common/network-name-gen/values.yaml
@@ -1,102 +1,102 @@
-# Copyright (C) 2018  AT&T Intellectual Property.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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 default values that can be inherited by
-# all subcharts.
-#################################################################
-global:
-
-  # Change to an unused port prefix range to prevent port conflicts
-  # with other instances running within the same k8s cluster
-  nodePortPrefix: 302
-
-  # image repositories
-  repository: nexus3.onap.org:10001
-
-
-  # readiness check
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
-
-  # image pull policy
-  pullPolicy: IfNotPresent
-
-# sub-chart config
-mariadb-galera:
-  config:
-      userName: nenguser
-      userPassword: nenguser123
-      mariadbRootPassword: nenguser123
-      mysqlDatabase: nengdb
-  nameOverride: nengdb
-  service:
-    name: nengdb
-    portName: nengdbport
-  replicaCount: 1
-  persistence:
-    enabled: true
-    mountSubPath: network-name-gen/data
-
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-repository: nexus3.onap.org:10001
-image: onap/ccsdk-apps-ms-neng:latest
-pullPolicy: IfNotPresent
-
-# application configuration
-config:
-  dbUrl: jdbc:mysql://nengdb:3306/nengdb
-  springProfile: live
-  polClientAuth: TBD
-  polBasicAuth: TBD
-  polUrl: TBD
-  polEnv: TEST
-  polReqId: xx
-  aaiCertPass: TBD
-  aaiCertPath: TBD
-  aaiUri: TBD
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  enabled: false
-
-readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-
-service:
-  type: ClusterIP
-  name: neng-serv
-  portName: neng-serv-port
-  internalPort: 8080
-  externalPort: 8080
-
-ingress:
-  enabled: false
-
-resources: {}
+# Copyright (C) 2018  AT&T Intellectual Property.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 default values that can be inherited by
+# all subcharts.
+#################################################################
+global:
+
+  # Change to an unused port prefix range to prevent port conflicts
+  # with other instances running within the same k8s cluster
+  nodePortPrefix: 302
+
+  # image repositories
+  repository: nexus3.onap.org:10001
+
+
+  # readiness check
+  readinessRepository: oomk8s
+  readinessImage: readiness-check:2.0.0
+
+  # image pull policy
+  pullPolicy: IfNotPresent
+
+# sub-chart config
+mariadb-galera:
+  config:
+      userName: nenguser
+      userPassword: nenguser123
+      mariadbRootPassword: nenguser123
+      mysqlDatabase: nengdb
+  nameOverride: nengdb
+  service:
+    name: nengdb
+    portName: nengdbport
+  replicaCount: 1
+  persistence:
+    enabled: true
+    mountSubPath: network-name-gen/data
+
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+# application image
+repository: nexus3.onap.org:10001
+image: onap/ccsdk-apps-ms-neng:latest
+pullPolicy: IfNotPresent
+
+# application configuration
+config:
+  dbUrl: jdbc:mysql://nengdb:3306/nengdb
+  springProfile: live
+  polClientAuth: TBD
+  polBasicAuth: TBD
+  polUrl: TBD
+  polEnv: TEST
+  polReqId: xx
+  aaiCertPass: TBD
+  aaiCertPath: TBD
+  aaiUri: TBD
+
+# default number of instances
+replicaCount: 1
+
+nodeSelector: {}
+
+affinity: {}
+
+# probe configuration parameters
+liveness:
+  initialDelaySeconds: 10
+  periodSeconds: 10
+  # necessary to disable liveness probe when setting breakpoints
+  # in debugger so K8s doesn't restart unresponsive container
+  enabled: false
+
+readiness:
+  initialDelaySeconds: 10
+  periodSeconds: 10
+
+service:
+  type: ClusterIP
+  name: neng-serv
+  portName: neng-serv-port
+  internalPort: 8080
+  externalPort: 8080
+
+ingress:
+  enabled: false
+
+resources: {}