diff options
Diffstat (limited to 'kubernetes/so/charts/so-vfc-adapter')
4 files changed, 20 insertions, 29 deletions
diff --git a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml index 6c26671296..6f579e7c1d 100755 --- a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml @@ -13,17 +13,6 @@ # limitations under the License. logging: path: logs -spring: - datasource: - driver-class-name: org.mariadb.jdbc.Driver - url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - dbcp2: - initial-size: 5 - max-total: 20 - validation-query: select 1 - test-on-borrow: true server: port: 8084 tomcat: @@ -34,10 +23,10 @@ mso: adapters: requestDb: auth: Basic YnBlbDptc28tZGItMTUwNyE= - endpoint: https://c1.vm1.mso.simpledemo.onap.org:8081 + endpoint: https://so-request-db-adapter.{{ include "common.namespace" . }}:8083 #Actuator management: security: enabled: false basic: - enabled: false
\ No newline at end of file + enabled: false diff --git a/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml index 48d9ef8820..a03dbd8930 100755 --- a/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml +++ b/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml @@ -26,8 +26,4 @@ metadata: name: {{ include "common.fullname" . }}-app-configmap namespace: {{ include "common.namespace" . }} data: - {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}} - {{- $root := . }} - {{- range $path, $bytes := .Files.Glob $yamlpath }} - override.yaml: {{ $root.Files.Get $path | quote }} - {{- end }}
\ No newline at end of file +{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }} diff --git a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml index d235545aa3..a69c189c5b 100755 --- a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml @@ -47,12 +47,7 @@ spec: - name: {{ include "common.name" . }} image: {{ include "common.repository" . }}/{{ .Values.image }} resources: - requests: - memory: {{ index .Values.resources.requests.memory}} - cpu: {{ index .Values.resources.requests.cpu}} - limits: - memory: {{ index .Values.resources.limits.memory}} - cpu: {{ index .Values.resources.limits.cpu}} +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} env: - name: DB_HOST valueFrom: @@ -141,4 +136,4 @@ spec: configMap: name: {{ include "common.fullname" . }}-app-configmap imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file + - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/so/charts/so-vfc-adapter/values.yaml b/kubernetes/so/charts/so-vfc-adapter/values.yaml index 3007a2fc8b..884280620a 100755 --- a/kubernetes/so/charts/so-vfc-adapter/values.yaml +++ b/kubernetes/so/charts/so-vfc-adapter/values.yaml @@ -21,19 +21,30 @@ app: vfc-adapter service: type: ClusterIP internalPort: 8084 - externalPort: 10600 + externalPort: 8084 portName: so-vfc-port updateStrategy: type: RollingUpdate maxUnavailable: 1 maxSurge: 1 +# Resource Limit flavor -By Default using small +flavor: small +# Segregation for Different environment (Small and Large) resources: + small: + limits: + memory: 4Gi + cpu: 2000m requests: memory: 1Gi cpu: 500m + large: limits: - memory: 4Gi - cpu: 2000m + memory: 8Gi + cpu: 4000m + requests: + memory: 2Gi + cpu: 1000m livenessProbe: path: /manage/health port: 8084 @@ -47,4 +58,4 @@ ingress: enabled: false nodeSelector: {} tolerations: [] -affinity: {}
\ No newline at end of file +affinity: {} |