From 93ed075394f96106433fec580fabb6a066ed10dd Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Sat, 21 Nov 2020 21:22:18 +0100 Subject: [POMBA] Uses new tpls for repos / images This commit makes Pomba chart to use the new generator for repositories and images. As new templates doesn't work well with "sub charts", we move also subcharts to components folder. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux Change-Id: Ib94d70d7eb0af5835774719851046ada0af96202 --- .../pomba/charts/pomba-sdncctxbuilder/.helmignore | 21 ---- .../pomba/charts/pomba-sdncctxbuilder/Chart.yaml | 18 ---- .../charts/pomba-sdncctxbuilder/requirements.yaml | 18 ---- .../resources/config/application.properties | 73 ------------- .../resources/config/logback.xml | 31 ------ .../pomba-sdncctxbuilder/templates/configmap.yaml | 32 ------ .../pomba-sdncctxbuilder/templates/deployment.yaml | 117 -------------------- .../pomba-sdncctxbuilder/templates/service.yaml | 43 -------- .../pomba/charts/pomba-sdncctxbuilder/values.yaml | 119 --------------------- 9 files changed, 472 deletions(-) delete mode 100644 kubernetes/pomba/charts/pomba-sdncctxbuilder/.helmignore delete mode 100644 kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml delete mode 100644 kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml delete mode 100644 kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties delete mode 100644 kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/logback.xml delete mode 100644 kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/configmap.yaml delete mode 100644 kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/deployment.yaml delete mode 100644 kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/service.yaml delete mode 100644 kubernetes/pomba/charts/pomba-sdncctxbuilder/values.yaml (limited to 'kubernetes/pomba/charts/pomba-sdncctxbuilder') diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/.helmignore b/kubernetes/pomba/charts/pomba-sdncctxbuilder/.helmignore deleted file mode 100644 index f0c1319444..0000000000 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml deleted file mode 100644 index edd2385f55..0000000000 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright © 2018 Amdocs -# -# 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: v1 -description: ONAP POMBA SDNC Context Builder -name: pomba-sdncctxbuilder -version: 6.0.0 diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml deleted file mode 100644 index e4c7240290..0000000000 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright © 2018 Amdocs -# -# 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. - -dependencies: - - name: common - version: ~6.x-0 - repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties b/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties deleted file mode 100644 index f95fa85fc1..0000000000 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties +++ /dev/null @@ -1,73 +0,0 @@ -{{/* -# Copyright © 2019 Amdocs -# -# 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 -*/}} - -spring.jersey.type=filter -spring.mvc.urls=swagger,docs,prometheus,auditevents,info,heapdump,autoconfig,beans,loggers,dump,env,trace,health,configprops,mappings,metrics,webjars -camel.springboot.xmlRoutes = file:config/dynamic/routes/*.route -service.xml.beans = config/dynamic/conf/*.xml - -server.contextPath=/sdnccontextbuilder -spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - -#This property is used to set the Tomcat connector attributes.developers can define multiple attributes separated by comma -#tomcat.connector.attributes=allowTrace-true -#The max number of active threads in this pool -server.tomcat.max-threads=200 -#The minimum number of threads always kept alive -server.tomcat.min-spare-threads=25 - -# Basic Authorization credentials for SDNC Context Builder REST Service -sdncCtxBuilder.userId={{ .Values.config.sdncCtxBuilderUserId }} -sdncCtxBuilder.password={{ .Values.config.sdncCtxBuilderPassword }} - -# AAI REST Client Configuration -aai.serviceName={{ .Values.config.aaiServiceName }}.{{.Release.Namespace}} -aai.servicePort={{ .Values.config.aaiPort }} -# AAI APIs authentication mode. Valid values: [basic_auth, client_cert] -aai.authentication=basic_auth -aai.trustStorePath=n/a -aai.keyStorePath=n/a -aai.keyStorePassword=n/a -aai.username={{ .Values.config.aaiUsername }} -aai.password={{ .Values.config.aaiPassword }} -aai.httpProtocol={{ .Values.config.aaiHttpProtocol }} -aai.authentication={{ .Values.config.aaiAuthentication }} -aai.trustStorePath={{ .Values.config.aaiTrustStorePath }} -aai.keyStorePath={{ .Values.config.aaiKeyStorePath }} -aai.keyStorePassword={{ .Values.config.aaiKeyStorePassword }} -aai.connectionTimeout={{ .Values.config.aaiConnectionTimeout }} -aai.readTimeout={{ .Values.config.aaiReadTimeout }} - -# HTTP Basic Authorization credentials for AAI Rest Service API -aai.http.userId={{ .Values.config.aaiHttpUserId }} -aai.http.password={{ .Values.config.aaiHttpPassword }} - -aai.serviceInstanceQuery=/aai/v13/nodes/service-instance/{0} - -# SDNC REST Client Configuration -sdnc.serviceName={{ .Values.config.sdncServiceName }}.{{.Release.Namespace}} -sdnc.servicePort={{ .Values.config.sdncPort }} -sdnc.user={{ .Values.config.sdncUsername }} -sdnc.password={{ .Values.config.sdncPassword }} -sdnc.httpProtocol={{ .Values.config.sdncHttpProtocol }} -sdnc.connectionTimeout={{ .Values.config.sdncConnectionTimeout }} -sdnc.readTimeout={{ .Values.config.sdncReadTimeout }} -sdnc.genericResourcePath=/restconf/config/GENERIC-RESOURCE-API:services/service/{0} -sdnc.portMirrorResourcePath=/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{0}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input -sdnc.vnfPath=/restconf/config/VNF-API:vnfs/vnf-list/{0} - -#Servlet context parameters -server.context_parameters.p-name=value #context parameter with p-name as key and value as value. diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/logback.xml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/logback.xml deleted file mode 100644 index 0a4b616453..0000000000 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/logback.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - ${pattern} - - - - /opt/app/logs/EELF/output.log - - ${pattern} - - - - - - - - - - - diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/configmap.yaml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/configmap.yaml deleted file mode 100644 index d0e26326ce..0000000000 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/configmap.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{/* -# Copyright © 2018 Amdocs -# -# 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: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-log - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-configmap - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/config/application.properties").AsConfig . | indent 2 }} diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/deployment.yaml deleted file mode 100644 index 6b32632613..0000000000 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/deployment.yaml +++ /dev/null @@ -1,117 +0,0 @@ -{{/* -# Copyright © 2018 Amdocs -# -# 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" . }} - spec: - 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: - volumeMounts: - - mountPath: /etc/localtime - name: localtime - readOnly: true - - name: {{ include "common.fullname" . }}-logs - mountPath: /opt/app/logs - readOnly: false - - mountPath: /opt/app/config/logback.xml - name: {{ include "common.fullname" . }}-log-conf - subPath: logback.xml - - name: {{ include "common.fullname" . }}-logs-eelf - mountPath: /opt/app/logs/EELF - readOnly: false - - mountPath: /opt/app/config/application.properties - name: {{ include "common.fullname" . }}-config - subPath: application.properties - readOnly: true - 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 }} - - # Filebeat sidecar container - - 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" . }}-data-filebeat - mountPath: /usr/share/filebeat/data - - name: {{ include "common.fullname" . }}-logs - mountPath: /opt/app/logs - - volumes: - - name: localtime - hostPath: - path: /etc/localtime - - name: {{ include "common.fullname" . }}-config - configMap: - name: {{ include "common.fullname" . }}-configmap - - name: {{ include "common.fullname" . }}-log-conf - configMap: - name: {{ include "common.fullname" . }}-log - - name: {{ include "common.fullname" . }}-filebeat-conf - configMap: - name: {{ include "common.release" . }}-pomba-filebeat-configmap - - name: {{ include "common.fullname" . }}-data-filebeat - emptyDir: {} - - name: {{ include "common.fullname" . }}-logs - emptyDir: {} - - name: {{ include "common.fullname" . }}-logs-eelf - emptyDir: {} - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/service.yaml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/service.yaml deleted file mode 100644 index 2ebd6758a0..0000000000 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/service.yaml +++ /dev/null @@ -1,43 +0,0 @@ -{{/* -# Copyright © 2018 Amdocs -# -# 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: v1 -kind: Service -metadata: - name: {{ include "common.servicename" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ include "common.release" . }} - heritage: {{ .Release.Service }} -spec: - type: {{ .Values.service.type }} - ports: - {{if eq .Values.service.type "NodePort" -}} - - port: {{ .Values.service.externalPort }} - #Example internal target port if required - #targetPort: {{ .Values.service.internalPort }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.portName | default "http" }} - {{- else -}} - - port: {{ .Values.service.externalPort }} - targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.portName | default "http" }} - {{- end}} - selector: - app: {{ include "common.name" . }} - release: {{ include "common.release" . }} diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/values.yaml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/values.yaml deleted file mode 100644 index 2b12660123..0000000000 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/values.yaml +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright © 2018 Amdocs -# -# 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 defaults. -################################################################# -global: - nodePortPrefix: 302 - repository: nexus3.onap.org:10001 - -################################################################# -# Application configuration defaults. -################################################################# -# application image -repository: nexus3.onap.org:10001 -image: onap/pomba-sdnc-context-builder:1.5.1 -pullPolicy: Always - -# flag to enable debugging - application support required -debugEnabled: false - -# application configuration -# Example: -config: - # AAI Rest Client Connection - aaiServiceName: aai - aaiPort: 8443 - aaiUsername: AAI - aaiPassword: OBF:1gfr1ev31gg7 - aaiHttpProtocol: https - aaiAuthentication: basic_auth - aaiTrustStorePath: n/a - aaiKeyStorePath: n/a - aaiKeyStorePassword: n/a - aaiConnectionTimeout: 5000 - aaiReadTimeout: 5000 - # HTTP Basic Authorization credentials for Rest Service API - aaiHttpUserId: admin - aaiHttpPassword: OBF:1u2a1toa1w8v1tok1u30 - sdncCtxBuilderUserId: admin - sdncCtxBuilderPassword: OBF:1u2a1toa1w8v1tok1u30 - - # SDNC Rest Client Connection - sdncServiceName: sdnc - sdncPort: 8282 - sdncUsername: admin - sdncPassword: OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp - sdncHttpProtocol: http - sdncConnectionTimeout: 5000 - sdncReadTimeout: 5000 - -# default number of instances -replicaCount: 1 - -nodeSelector: {} - -affinity: {} - -# probe configuration parameters -liveness: - initialDelaySeconds: 60 - periodSeconds: 30 - # necessary to disable liveness probe when setting breakpoints - # in debugger so K8s doesn't restart unresponsive container - enabled: true - -readiness: - initialDelaySeconds: 60 - periodSeconds: 30 - -#Example service definition with external, internal and node ports. -service: - # The default service name (exposed in the service.yaml) will be the same - # name as the chart. If the service name needs to be overriden (such as - # when a subchart is shared), uncomment the value below. - #name: - - #Services may use any combination of ports depending on the 'type' of - #service being defined. - type: ClusterIP - externalPort: 9530 - internalPort: 8080 -# nodePort: - # optional port name override - default can be defined in service.yaml - #portName: http - -ingress: - enabled: false - -# Resource Limit flavor -By Default using small -flavor: small -# Segregation for Different environment (Small and Large) -resources: - small: - limits: - cpu: 1 - memory: 800Mi - requests: - cpu: 100m - memory: 400Mi - large: - limits: - cpu: 2 - memory: 1600Mi - requests: - cpu: 200m - memory: 800Mi - unlimited: {} -- cgit 1.2.3-korg