summaryrefslogtreecommitdiffstats
path: root/springboot/springboot2/pom.xml
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-09-09 12:53:27 -0400
committerDan Timoney <dtimoney@att.com>2020-09-09 12:53:27 -0400
commitbde1f888c4de0d44b5487809d87f0b911bb91af9 (patch)
tree98db7343193be29368d5a76d5ddff792e51414b5 /springboot/springboot2/pom.xml
parent3e6281d7d8c072d3e1ae4886a04e75dbc4e334b2 (diff)
Roll to initial Honolulu release version
Roll master branch to initial Honolulu release version Change-Id: I215dc2c5b3f0c817a653a43b9cf448b78caba1f8 Issue-ID: CCSDK-2742 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'springboot/springboot2/pom.xml')
-rw-r--r--springboot/springboot2/pom.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 8b21e8f7..e10a34f4 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -91,13 +91,13 @@
<logging-analytics.version>1.6.5</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.0.1-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.0.1-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.0.1-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.0.1-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.0.1-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.0.0-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
+ <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
<!-- Spring versions -->
<spring.boot.version>2.3.3.RELEASE</spring.boot.version>
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
#0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
# Copyright © 2017 Amdocs, Bell Canada
#
# 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.

apiVersion: extensions/v1beta1
kind: Deployment
metadata:
  name: {{ include "common.fullname" . }}
  namespace: {{ include "common.namespace" . }}
  labels:
    app: {{ include "common.name" . }}
    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
    release: {{ include "common.release" . }}
    heritage: {{ .Release.Service }}
spec:
  replicas: {{ .Values.replicaCount }}
  template:
    metadata:
      labels:
        app: {{ include "common.name" . }}
        release: {{ include "common.release" . }}
      annotations:
        sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
    spec:
      initContainers:
      - command:
        - /root/ready.py
        args:
        - --container-name
        - vfc-mariadb
        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 }}"
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
          ports:
          - containerPort: {{ .Values.service.internalPort }}
          # disable liveness probe when breakpoints set in debugger
          # so K8s doesn't restart unresponsive container
          {{ if .Values.liveness.enabled }}
          livenessProbe:
            tcpSocket:
              port: {{ .Values.service.internalPort }}
            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
            periodSeconds: {{ .Values.liveness.periodSeconds }}
          {{ end }}
          readinessProbe:
            tcpSocket:
              port: {{ .Values.service.internalPort }}
            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
            periodSeconds: {{ .Values.readiness.periodSeconds }}
          env:
            - name: MSB_PROTO
              value: "{{ .Values.global.config.msbprotocol }}"
            - name: SSL_ENABLED
              value: "{{ .Values.global.config.ssl_enabled }}"
            - name: MSB_ADDR
              value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
            - name: MYSQL_ADDR
              value: "{{ .Values.global.config.dbServiceName }}:{{ .Values.global.config.dbPort }}"
            - name: REDIS_ADDR
              value: "{{ .Values.global.config.redisServiceName }}:{{ .Values.global.config.redisPort }}"
            - name: MYSQL_AUTH
              value: "{{ .Values.global.config.dbUser }}:{{ .Values.global.config.mariadbRootPassword }}"

          volumeMounts:
          - name: {{ include "common.fullname" . }}-localtime
            mountPath: /etc/localtime
            readOnly: true
          - name: {{ include "common.fullname" . }}-logs
            mountPath: /var/log/onap
          - name: {{ include "common.fullname" . }}-logconfig
            mountPath: /opt/vfc/gvnfm-vnfmgr/config/log.yml
            subPath: log.yml
          resources:
{{ include "common.resources" . | indent 12 }}
        {{- if .Values.nodeSelector }}
        nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
        {{- end -}}
        {{- if .Values.affinity }}
        affinity:
{{ toYaml .Values.affinity | indent 10 }}
        {{- end }}

        # side car containers
        - name: {{ include "common.name" . }}-filebeat-onap
          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
          volumeMounts:
          - name: {{ include "common.fullname" . }}-filebeat-conf
            mountPath: /usr/share/filebeat/filebeat.yml
            subPath: filebeat.yml
          - name: {{ include "common.fullname" . }}-logs
            mountPath: /var/log/onap
          - name: {{ include "common.fullname" . }}-data-filebeat
            mountPath: /usr/share/filebeat/data

      volumes:
        - name: {{ include "common.fullname" . }}-localtime
          hostPath:
            path: /etc/localtime
        - name:  {{ include "common.fullname" . }}-logs
          emptyDir: {}
        - name: {{ include "common.fullname" . }}-logconfig
          configMap:
            name : {{ include "common.fullname" . }}-logging-configmap

        - name: {{ include "common.fullname" . }}-filebeat-conf
          configMap:
            name: {{ include "common.release" . }}-vfc-filebeat-configmap
        - name: {{ include "common.fullname" . }}-data-filebeat
          emptyDir: {}
      imagePullSecrets:
      - name: "{{ include "common.namespace" . }}-docker-registry-key"