summaryrefslogtreecommitdiffstats
path: root/kubernetes/so
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-09-11 17:51:38 +0200
committerKrzysztof Opasiak <k.opasiak@samsung.com>2020-09-11 17:55:56 +0200
commit64f0b037f6c26a77b0a9b322caf32cd1c4c4259f (patch)
tree4d27cdda758ef43c5306de8b717f87c91b046a1f /kubernetes/so
parent8c62083d8ac58e74f16409adf775cb1c49063745 (diff)
Revert "[SO] Add helm chart for SO-ETSI-NFVO-NS-LCM"
This reverts commits: b6a0f9ef4cefa4c63bcc9b57e8ffeb236194dcd7 5b4d13d79e72409c49b893b00ce763591696b104 Staging images are not allowed in OOM master branch. When they disappear we get awful failures in gating thus components that sneak in staging images by tagging them in the same way as the release images has to be immediately removed unless a proper docker image is released. Issue-ID: SO-3157 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: Ia18ff5b372b13b9d03a2969f4aaf2fcea144ea77
Diffstat (limited to 'kubernetes/so')
-rw-r--r--kubernetes/so/charts/so-etsi-nfvo-ns-lcm/Chart.yaml18
-rw-r--r--kubernetes/so/charts/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml47
-rw-r--r--kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/configmap.yaml41
-rw-r--r--kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/deployment.yaml92
-rw-r--r--kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/ingress.yaml15
-rw-r--r--kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/secret.yaml15
-rw-r--r--kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/service.yaml15
-rw-r--r--kubernetes/so/charts/so-etsi-nfvo-ns-lcm/values.yaml104
-rwxr-xr-xkubernetes/so/values.yaml11
9 files changed, 0 insertions, 358 deletions
diff --git a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/Chart.yaml b/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/Chart.yaml
deleted file mode 100644
index c4fb9a49d5..0000000000
--- a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright © 2020 Nordix Foundation
-#
-# 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 SO ETSI NFVO NS LCM
-name: so-etsi-nfvo-ns-lcm
-version: 6.0.0
diff --git a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
deleted file mode 100644
index 13d72d891b..0000000000
--- a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright © 2020 Nordix Foundation
-#
-# 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.
-
-aai:
- auth: {{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}}
- version: v19
- endpoint: https://aai.{{ include "common.namespace" . }}:8443
-spring:
- security:
- usercredentials:
- - username: ${ETSI_NFVO_USERNAME}
- password: ${ETSI_NFVO_PASSWORD}
- role: ETSI-NFVO-Client
-server:
- port: {{ .Values.containerPort }}
- tomcat:
- max-threads: 50
-mso:
- key: {{ .Values.mso.key }}
-so:
- adapters:
- sol003-adapter:
- url: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1
- auth: {{ .Values.so.sol003.adapter.auth }}
-etsi-catalog-manager:
- base:
- {{- if .Values.global.msbEnabled }}
- endpoint: https://msb-iag:443/api
- http:
- client:
- ssl:
- trust-store: ${TRUSTSTORE}
- trust-store-password: ${TRUSTSTORE_PASSWORD}
- {{- else }}
- endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api
- {{- end }}
diff --git a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/configmap.yaml b/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/configmap.yaml
deleted file mode 100644
index 3b2e50cd0c..0000000000
--- a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/configmap.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright © 2020 Nordix Foundation
-#
-# 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" . }}-configmap
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
-data:
- LOG_PATH: {{ index .Values.logPath }}
- APP: {{ index .Values.app }}
- ACTIVE_PROFILE: {{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" "aaf" "value2" "basic")}}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-app-configmap
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/deployment.yaml b/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/deployment.yaml
deleted file mode 100644
index 0d16ded26d..0000000000
--- a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/deployment.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright © 2020 Nordix Foundation
-#
-# 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: apps/v1
-kind: Deployment
-metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
-spec:
- selector: {{- include "common.selectors" . | nindent 4 }}
- replicas: {{ index .Values.replicaCount }}
- minReadySeconds: {{ index .Values.minReadySeconds }}
- strategy:
- type: {{ index .Values.updateStrategy.type }}
- rollingUpdate:
- maxUnavailable: {{ index .Values.updateStrategy.maxUnavailable }}
- maxSurge: {{ index .Values.updateStrategy.maxSurge }}
- template:
- metadata: {{- include "common.templateMetadata" . | nindent 6 }}
- spec:
- initContainers: {{ include "so.certificate.container_importer" . | nindent 8 }}
- containers:
- - name: {{ include "common.name" . }}
- command:
- - sh
- args:
- - -c
- - export ETSI_NFVO_PASSWORD=`htpasswd -bnBC 10 "" $ETSI_NFVO_PASSWORD_INPUT | tr -d ':\n' | sed 's/\$2y/\$2a/'`; ./start-app.sh
- image: {{ include "common.repository" . }}/{{ .Values.image }}
- resources: {{ include "common.resources" . | nindent 12 }}
- env:
- - name: TRUSTSTORE
- value: {{ .Values.global.client.certs.truststore }}
- - name: TRUSTSTORE_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ .Release.Name}}-so-client-certs-secret
- key: trustStorePassword
- {{- if eq .Values.global.security.aaf.enabled true }}
- - name: KEYSTORE
- value: {{ .Values.global.client.certs.keystore }}
- - name: KEYSTORE_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ .Release.Name}}-so-client-certs-secret
- key: keyStorePassword
- {{- end }}
- - name: ETSI_NFVO_USERNAME
- {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "etsi-nfvo-nslcm-creds" "key" "login") | indent 14 }}
- - name: ETSI_NFVO_PASSWORD_INPUT
- {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "etsi-nfvo-nslcm-creds" "key" "password") | indent 14 }}
- envFrom:
- - configMapRef:
- name: {{ include "common.fullname" . }}-configmap
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts: {{ include "so.certificate.volume-mounts" . | nindent 12 }}
- - name: logs
- mountPath: /app/logs
- - name: config
- mountPath: /app/config
- readOnly: true
- - name: {{ include "common.fullname" . }}-truststore
- mountPath: /app/client
- readonly: true
- livenessProbe:
- tcpSocket:
- port: {{ index .Values.livenessProbe.port }}
- initialDelaySeconds: {{ index .Values.livenessProbe.initialDelaySeconds}}
- periodSeconds: {{ index .Values.livenessProbe.periodSeconds}}
- successThreshold: {{ index .Values.livenessProbe.successThreshold}}
- failureThreshold: {{ index .Values.livenessProbe.failureThreshold}}
- ports: {{ include "common.containerPorts" . | nindent 12 }}
- volumes: {{ include "so.certificate.volumes" . | nindent 8 }}
- - name: logs
- emptyDir: {}
- - name: config
- configMap:
- name: {{ include "common.fullname" . }}-app-configmap
- - name: {{ include "common.fullname" . }}-truststore
- secret:
- secretName: {{ include "common.release" . }}-so-truststore-secret
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/ingress.yaml b/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/ingress.yaml
deleted file mode 100644
index 443e76b76e..0000000000
--- a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/ingress.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright © 2020 Nordix Foundation
-#
-# 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.
-
-{{ include "common.ingress" . }}
diff --git a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/secret.yaml b/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/secret.yaml
deleted file mode 100644
index 493cfe5f88..0000000000
--- a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/secret.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright © 2020 Nordix Foundation
-#
-# 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.
-
-{{ include "common.secretFast" . }}
diff --git a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/service.yaml b/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/service.yaml
deleted file mode 100644
index a1290de24b..0000000000
--- a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/templates/service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright © 2020 Nordix Foundation
-#
-# 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.
-
-{{ include "common.service" . }}
diff --git a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/values.yaml
deleted file mode 100644
index 12bc8d38af..0000000000
--- a/kubernetes/so/charts/so-etsi-nfvo-ns-lcm/values.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright © 2020 Nordix Foundation
-#
-# 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:
- nodePortPrefixExt: 304
- repository: nexus3.onap.org:10001
- readinessImage: onap/oom/readiness:3.0.1
- persistence:
- mountPath: /dockerdata-nfs
-
-#################################################################
-# Secrets metaconfig
-#################################################################
-secrets:
- - uid: "so-onap-certs"
- externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
- type: generic
- filePaths: '{{ .Values.secretsFilePaths }}'
- - uid: etsi-nfvo-nslcm-creds
- name: '{{ include "common.release" . }}-so-etsi-nfvo-nslcm-creds'
- type: basicAuth
- externalSecret: '{{ tpl (default "" .Values.etsi.nfvo.nslcm.credsExternalSecret) . }}'
- login: '{{ .Values.etsi.nfvo.nslcm.username }}'
- password: '{{ .Values.etsi.nfvo.nslcm.password }}'
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-repository: nexus3.onap.org:10001
-image: onap/so/so-etsi-nfvo-ns-lcm:1.7.1
-pullPolicy: Always
-
-etsi:
- nfvo:
- nslcm:
- username: so-etsi-nfvo-ns-lcm
-replicaCount: 1
-minReadySeconds: 10
-containerPort: 9095
-logPath: ./logs/so-etsi-nfvo-ns-lcm/
-app: so-etsi-nfvo-ns-lcm
-service:
- type: ClusterIP
- name: so-etsi-nfvo-ns-lcm
- annotations:
- service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
- ports:
- - name: nfvo-nslcm-port
- port: 9095
-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: 8Gi
- cpu: 4000m
- requests:
- memory: 2Gi
- cpu: 1000m
- unlimited: {}
-livenessProbe:
- port: 9095
- initialDelaySeconds: 600
- periodSeconds: 60
- timeoutSeconds: 10
- successThreshold: 1
- failureThreshold: 3
-ingress:
- enabled: false
- service:
- - baseaddr: "soetsinfvonslcm"
- name: "so-etsi-nfvo-ns-lcm"
- port: 9095
- config:
- ssl: "redirect"
-nodeSelector: {}
-tolerations: []
-affinity: {}
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 8d037868a2..328f4f296e 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -449,17 +449,6 @@ so-vnfm-adapter:
apiEnforcement: org.onap.so.vnfmAdapterPerm
noAuthn: /manage/health
-so-etsi-nfvo-ns-lcm:
- certSecret: *so-certs
- aai:
- auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586
- mso:
- key: 07a7159d3bf51a0e53be7a8f89699be7
- so:
- sol003:
- adapter:
- auth: Basic dm5mbTpwYXNzd29yZDEk
-
so-mariadb:
db:
rootPasswordExternalSecretLocalDb: *dbRootPassSecretName