aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/cps
diff options
context:
space:
mode:
authorputhuparambil.aditya <aditya.puthuparambil@bell.ca>2021-07-23 13:57:22 +0100
committerKrzysztof Opasiak <k.opasiak@samsung.com>2021-08-09 19:53:54 +0000
commitb35e2deb1580a13a435b039fdf8f8381a9873d36 (patch)
treeb1ae1678e981af039521310f69bbfb3e2819b703 /kubernetes/cps
parente5fca1f12d11ffb3ebbb7afbfac35e62f7a55068 (diff)
[CPS] Refactor CPS charts to include sub charts for other cps components
Cps-core sub chart added in CPS. Issue-ID: CPS-513 Signed-off-by: puthuparambil.aditya <aditya.puthuparambil@bell.ca> Change-Id: Ifb049f33864b0608ce8d938158f33bd3c01f87f4
Diffstat (limited to 'kubernetes/cps')
-rw-r--r--kubernetes/cps/.helmignore2
-rw-r--r--kubernetes/cps/Chart.yaml4
-rw-r--r--kubernetes/cps/Makefile54
-rw-r--r--kubernetes/cps/README.md2
-rw-r--r--kubernetes/cps/components/Makefile67
-rw-r--r--kubernetes/cps/components/cps-core/.helmignore22
-rw-r--r--kubernetes/cps/components/cps-core/Chart.yaml18
-rw-r--r--kubernetes/cps/components/cps-core/requirements.yaml30
-rw-r--r--[-rwxr-xr-x]kubernetes/cps/components/cps-core/resources/config/application-helm.yml (renamed from kubernetes/cps/resources/config/application-helm.yml)32
-rw-r--r--kubernetes/cps/components/cps-core/resources/config/logback.xml (renamed from kubernetes/cps/resources/config/logback.xml)4
-rw-r--r--kubernetes/cps/components/cps-core/templates/NOTES.txt (renamed from kubernetes/cps/templates/NOTES.txt)0
-rw-r--r--kubernetes/cps/components/cps-core/templates/configmap.yaml (renamed from kubernetes/cps/templates/configmap.yaml)0
-rw-r--r--[-rwxr-xr-x]kubernetes/cps/components/cps-core/templates/deployment.yaml (renamed from kubernetes/cps/templates/deployment.yaml)4
-rw-r--r--kubernetes/cps/components/cps-core/templates/ingress.yaml (renamed from kubernetes/cps/templates/ingress.yaml)0
-rw-r--r--kubernetes/cps/components/cps-core/templates/secrets.yaml (renamed from kubernetes/cps/templates/secrets.yaml)0
-rw-r--r--kubernetes/cps/components/cps-core/templates/service.yaml17
-rw-r--r--kubernetes/cps/components/cps-core/values.yaml168
-rw-r--r--kubernetes/cps/requirements.yaml14
-rw-r--r--kubernetes/cps/templates/service.yaml17
-rwxr-xr-xkubernetes/cps/values.yaml148
20 files changed, 408 insertions, 195 deletions
diff --git a/kubernetes/cps/.helmignore b/kubernetes/cps/.helmignore
index 80b47d2723..7ddbad7ef4 100644
--- a/kubernetes/cps/.helmignore
+++ b/kubernetes/cps/.helmignore
@@ -19,4 +19,4 @@
.project
.idea/
*.tmproj
-components/ \ No newline at end of file
+components/
diff --git a/kubernetes/cps/Chart.yaml b/kubernetes/cps/Chart.yaml
index 325f26dc38..0837c72dd9 100644
--- a/kubernetes/cps/Chart.yaml
+++ b/kubernetes/cps/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Pantheon.tech
+# Copyright (C) 2021 Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,6 +13,6 @@
# limitations under the License.
apiVersion: v1
-description: Configuration Persistance Service (CPS)
+description: ONAP Configuration Persistance Service (CPS)
name: cps
version: 8.0.0
diff --git a/kubernetes/cps/Makefile b/kubernetes/cps/Makefile
new file mode 100644
index 0000000000..70bb031af3
--- /dev/null
+++ b/kubernetes/cps/Makefile
@@ -0,0 +1,54 @@
+# Copyright © 2020 Samsung Electronics
+# Copyright (c) 2021 AT&T. All rights reserved.
+#
+# 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.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+HELM_REPO := local
+
+EXCLUDES :=
+HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME $(HELM_REPO); fi
+ @sleep 3
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/cps/README.md b/kubernetes/cps/README.md
index 4b578c41c2..876da2ca57 100644
--- a/kubernetes/cps/README.md
+++ b/kubernetes/cps/README.md
@@ -19,4 +19,4 @@
ONAP Configuration Persistence Service (CPS) includes the following Kubernetes services:
-1) Cps and xNF - Configuration Persistence Service together with Nf Configuration Persistence Service \ No newline at end of file
+1) cps-core - Configuration Persistence Service together with Nf Configuration Persistence Service \ No newline at end of file
diff --git a/kubernetes/cps/components/Makefile b/kubernetes/cps/components/Makefile
new file mode 100644
index 0000000000..db8704c2ca
--- /dev/null
+++ b/kubernetes/cps/components/Makefile
@@ -0,0 +1,67 @@
+# Copyright © 2020 Samsung Electronics
+# Copyright (c) 2021 AT&T. All rights reserved.
+#
+# 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.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+HELM_REPO := local
+
+EXCLUDES :=
+HELM_BIN := helm
+# Helm v2 and helm v3 uses different version format so we first try in helm v3 format
+# and if it fails then we fallback to helm v2 one
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}" 2>/dev/null)
+ifneq "$(findstring v3,$(HELM_VER))" "v3"
+ HELM_VER := $(shell $(HELM_BIN) version -c --template "{{.Client.SemVer}}")
+endif
+
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS) helm-repo-update
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME $(HELM_REPO); fi
+ @sleep 3
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+
+helm-repo-update:
+ifeq "$(findstring v3,$(HELM_VER))" "v3"
+ @$(HELM_BIN) repo update
+endif
+
+%:
+ @:
diff --git a/kubernetes/cps/components/cps-core/.helmignore b/kubernetes/cps/components/cps-core/.helmignore
new file mode 100644
index 0000000000..80b47d2723
--- /dev/null
+++ b/kubernetes/cps/components/cps-core/.helmignore
@@ -0,0 +1,22 @@
+# 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
+components/ \ No newline at end of file
diff --git a/kubernetes/cps/components/cps-core/Chart.yaml b/kubernetes/cps/components/cps-core/Chart.yaml
new file mode 100644
index 0000000000..710032896e
--- /dev/null
+++ b/kubernetes/cps/components/cps-core/Chart.yaml
@@ -0,0 +1,18 @@
+# Copyright (C) Pantheon.tech, Orange
+#
+# 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 Configuration Persistance Service (CPS) - Core
+name: cps-core
+version: 8.0.0
diff --git a/kubernetes/cps/components/cps-core/requirements.yaml b/kubernetes/cps/components/cps-core/requirements.yaml
new file mode 100644
index 0000000000..d6b6712852
--- /dev/null
+++ b/kubernetes/cps/components/cps-core/requirements.yaml
@@ -0,0 +1,30 @@
+# Copyright (C) 2021 Pantheon.tech, Orange
+#
+# 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: ~8.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~8.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~8.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~8.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~8.x-0
+ repository: '@local'
diff --git a/kubernetes/cps/resources/config/application-helm.yml b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
index 5f19007231..f181b82fec 100755..100644
--- a/kubernetes/cps/resources/config/application-helm.yml
+++ b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
@@ -1,21 +1,21 @@
{{/*
- # Copyright (C) 2021 Pantheon.tech
- # Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
- # Modifications Copyright (C) 2021 Nordix Foundation. All rights reserved.
- #
- # 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.
+# Copyright (C) 2021 Pantheon.tech
+# Modifications Copyright (C) 2020 Bell Canada.
+# Modifications Copyright (C) 2021 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.
*/}}
----
+
server:
port: 8080
diff --git a/kubernetes/cps/resources/config/logback.xml b/kubernetes/cps/components/cps-core/resources/config/logback.xml
index 56ffc88220..8256cfa18d 100644
--- a/kubernetes/cps/resources/config/logback.xml
+++ b/kubernetes/cps/components/cps-core/resources/config/logback.xml
@@ -1,11 +1,13 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2020 Bell Canada. All rights reserved.
+ Copyright (C) 2020 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.
diff --git a/kubernetes/cps/templates/NOTES.txt b/kubernetes/cps/components/cps-core/templates/NOTES.txt
index 09d22dfa7c..09d22dfa7c 100644
--- a/kubernetes/cps/templates/NOTES.txt
+++ b/kubernetes/cps/components/cps-core/templates/NOTES.txt
diff --git a/kubernetes/cps/templates/configmap.yaml b/kubernetes/cps/components/cps-core/templates/configmap.yaml
index eeb057cbd8..eeb057cbd8 100644
--- a/kubernetes/cps/templates/configmap.yaml
+++ b/kubernetes/cps/components/cps-core/templates/configmap.yaml
diff --git a/kubernetes/cps/templates/deployment.yaml b/kubernetes/cps/components/cps-core/templates/deployment.yaml
index 61877c38a0..2047a39497 100755..100644
--- a/kubernetes/cps/templates/deployment.yaml
+++ b/kubernetes/cps/components/cps-core/templates/deployment.yaml
@@ -1,7 +1,7 @@
{{/*
# Copyright (C) 2021 Pantheon.tech, Orange
# Modifications Copyright (C) 2021 Bell Canada.
-# Modifications Copyright (C) 2021 Nordix Foundation. All rights reserved.
+# Modifications Copyright (C) 2021 Nordix Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -103,4 +103,4 @@ spec:
- name: init-temp
emptyDir: {}
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/cps/templates/ingress.yaml b/kubernetes/cps/components/cps-core/templates/ingress.yaml
index 16f9440aba..16f9440aba 100644
--- a/kubernetes/cps/templates/ingress.yaml
+++ b/kubernetes/cps/components/cps-core/templates/ingress.yaml
diff --git a/kubernetes/cps/templates/secrets.yaml b/kubernetes/cps/components/cps-core/templates/secrets.yaml
index f25044d339..f25044d339 100644
--- a/kubernetes/cps/templates/secrets.yaml
+++ b/kubernetes/cps/components/cps-core/templates/secrets.yaml
diff --git a/kubernetes/cps/components/cps-core/templates/service.yaml b/kubernetes/cps/components/cps-core/templates/service.yaml
new file mode 100644
index 0000000000..97657bfc0b
--- /dev/null
+++ b/kubernetes/cps/components/cps-core/templates/service.yaml
@@ -0,0 +1,17 @@
+{{/*
+# Copyright (C) 2021 Pantheon.tech, Orange
+#
+# 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/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
new file mode 100644
index 0000000000..ae8bccd2a8
--- /dev/null
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -0,0 +1,168 @@
+# Copyright (C) 2021 Pantheon.tech, Orange, 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.
+
+#################################################################
+# Secrets.
+#################################################################
+secrets:
+ - uid: pg-root-pass
+ name: &pgRootPassSecretName '{{ include "common.release" . }}-cps-pg-root-pass'
+ type: password
+ externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgRootPasswordExternalSecret) .) (hasSuffix "cps-pg-root-pass" .Values.postgres.config.pgRootPasswordExternalSecret) }}'
+ password: '{{ .Values.postgres.config.pgRootpassword }}'
+ policy: generate
+ - uid: pg-user-creds
+ name: &pgUserCredsSecretName '{{ include "common.release" . }}-cps-pg-user-creds'
+ type: basicAuth
+ externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgUserExternalSecret) .) (hasSuffix "cps-pg-user-creds" .Values.postgres.config.pgUserExternalSecret) }}'
+ login: '{{ .Values.postgres.config.pgUserName }}'
+ password: '{{ .Values.postgres.config.pgUserPassword }}'
+ passwordPolicy: generate
+ - uid: app-user-creds
+ type: basicAuth
+ externalSecret: '{{ tpl (default "" .Values.config.appUserExternalSecret) . }}'
+ login: '{{ .Values.config.appUserName }}'
+ password: '{{ .Values.config.appUserPassword }}'
+ passwordPolicy: generate
+
+#################################################################
+# Global configuration defaults.
+#################################################################
+
+# bitnami image doesn't support well single quote in password
+passwordStrengthOverride: basic
+global:
+ ingress:
+ virtualhost:
+ baseurl: "simpledemo.onap.org"
+
+image: onap/cps-and-nf-proxy:1.0.1
+containerPort: &svc_port 8080
+
+service:
+ type: ClusterIP
+ name: cps-core
+ ports:
+ - name: &port http
+ port: *svc_port
+
+pullPolicy: Always
+# flag to enable debugging - application support required
+debugEnabled: false
+nodeSelector: {}
+affinity: {}
+# Resource Limit flavor -By Default using small
+flavor: small
+# default number of instances
+replicaCount: 1
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 2Gi
+ requests:
+ cpu: 1
+ memory: 1Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 4Gi
+ requests:
+ cpu: 2
+ memory: 2Gi
+ unlimited: {}
+# probe configuration parameters
+liveness:
+ initialDelaySeconds: 20
+ periodSeconds: 20
+ # necessary to disable liveness probe when setting breakpoints
+ # in debugger so K8s doesn't restart unresponsive container
+ enabled: true
+ path: /manage/health
+ port: *port
+
+readiness:
+ initialDelaySeconds: 15
+ periodSeconds: 15
+ path: /manage/health
+ port: *port
+
+ingress:
+ enabled: true
+ service:
+ - baseaddr: "cps-core"
+ path: "/"
+ name: "cps-core"
+ port: *svc_port
+
+serviceAccount:
+ nameOverride: cps-core
+ roles:
+ - read
+
+securityContext:
+ user_id: 100
+ group_id: 655533
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+
+config:
+
+ # Set it for pre loading xnfdata, else set to null
+ liquibaseLabels: xnf-data-preload
+
+ # REST API basic authentication credentials (passsword is generated if not provided)
+ appUserName: cpsuser
+ spring:
+ profile: helm
+ #appUserPassword:
+
+# Any new property can be added in the env by setting in overrides in the format mentioned below
+# All the added properties must be in "key: value" format insead of yaml.
+# additional:
+# spring.config.max-size: 200
+# spring.config.min-size: 10
+
+logging:
+ level: INFO
+ path: /tmp
+
+#################################################################
+# Postgres overriding defaults in the postgres
+#################################################################
+postgres:
+ nameOverride: &postgresName cps-postgres
+ service:
+ name: *postgresName
+ name2: cps-pg-primary
+ name3: cps-pg-replica
+ container:
+ name:
+ primary: cps-pg-primary
+ replica: cps-pg-replica
+ persistence:
+ mountSubPath: cps/data
+ mountInitPath: cps
+ config:
+ pgUserName: cps
+ pgDatabase: cpsdb
+ pgUserExternalSecret: *pgUserCredsSecretName
+ pgRootPasswordExternalSecret: *pgRootPassSecretName
+
+readinessCheck:
+ wait_for:
+ - cps-postgres
diff --git a/kubernetes/cps/requirements.yaml b/kubernetes/cps/requirements.yaml
index d6b6712852..9d044dcd13 100644
--- a/kubernetes/cps/requirements.yaml
+++ b/kubernetes/cps/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Pantheon.tech, Orange
+# Copyright (C) 2021 Bell Canada.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,15 +16,7 @@ dependencies:
- name: common
version: ~8.x-0
repository: '@local'
- - name: postgres
- version: ~8.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~8.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~8.x-0
- repository: '@local'
- - name: serviceAccount
+ - name: cps-core
version: ~8.x-0
repository: '@local'
+ condition: cps-core.enabled \ No newline at end of file
diff --git a/kubernetes/cps/templates/service.yaml b/kubernetes/cps/templates/service.yaml
deleted file mode 100644
index bfcaabc178..0000000000
--- a/kubernetes/cps/templates/service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-{{/*
- # Copyright (C) 2021 Pantheon.tech, Orange
- #
- # 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/cps/values.yaml b/kubernetes/cps/values.yaml
index 2312a4994d..87bba7f1da 100755
--- a/kubernetes/cps/values.yaml
+++ b/kubernetes/cps/values.yaml
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Pantheon.tech, Orange, Bell Canada.
+# Copyright (C) 2021 Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,156 +13,16 @@
# limitations under the License.
#################################################################
-# Secrets.
-#################################################################
-secrets:
- - uid: pg-root-pass
- name: &pgRootPassSecretName '{{ include "common.release" . }}-cps-pg-root-pass'
- type: password
- externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgRootPasswordExternalSecret) .) (hasSuffix "cps-pg-root-pass" .Values.postgres.config.pgRootPasswordExternalSecret) }}'
- password: '{{ .Values.postgres.config.pgRootpassword }}'
- policy: generate
- - uid: pg-user-creds
- name: &pgUserCredsSecretName '{{ include "common.release" . }}-cps-pg-user-creds'
- type: basicAuth
- externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgUserExternalSecret) .) (hasSuffix "cps-pg-user-creds" .Values.postgres.config.pgUserExternalSecret) }}'
- login: '{{ .Values.postgres.config.pgUserName }}'
- password: '{{ .Values.postgres.config.pgUserPassword }}'
- passwordPolicy: generate
- - uid: app-user-creds
- type: basicAuth
- externalSecret: '{{ tpl (default "" .Values.config.appUserExternalSecret) . }}'
- login: '{{ .Values.config.appUserName }}'
- password: '{{ .Values.config.appUserPassword }}'
- passwordPolicy: generate
-
-#################################################################
# Global configuration defaults.
#################################################################
-
-# bitnami image doesn't support well single quote in password
passwordStrengthOverride: basic
global:
ingress:
virtualhost:
baseurl: "simpledemo.onap.org"
-image: onap/cps-and-nf-proxy:1.0.1
-containerPort: &svc_port 8080
-
-service:
- type: ClusterIP
- name: cps
- ports:
- - name: &port http
- port: *svc_port
+config: {}
-pullPolicy: Always
-# flag to enable debugging - application support required
-debugEnabled: false
-nodeSelector: {}
-affinity: {}
-# Resource Limit flavor -By Default using small
-flavor: small
-# default number of instances
-replicaCount: 1
-# Segregation for Different environment (Small and Large)
-resources:
- small:
- limits:
- cpu: 2
- memory: 2Gi
- requests:
- cpu: 1
- memory: 1Gi
- large:
- limits:
- cpu: 4
- memory: 4Gi
- requests:
- cpu: 2
- memory: 2Gi
- unlimited: {}
-# probe configuration parameters
-liveness:
- initialDelaySeconds: 20
- periodSeconds: 20
- # necessary to disable liveness probe when setting breakpoints
- # in debugger so K8s doesn't restart unresponsive container
+# Enable all CPS components by default
+cps-core:
enabled: true
- path: /manage/health
- port: *port
-
-readiness:
- initialDelaySeconds: 15
- periodSeconds: 15
- path: /manage/health
- port: *port
-
-ingress:
- enabled: true
- service:
- - baseaddr: "cps"
- path: "/"
- name: "cps"
- port: *svc_port
-
-serviceAccount:
- nameOverride: cps
- roles:
- - read
-
-securityContext:
- user_id: 100
- group_id: 655533
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-
-config:
-
- # Set it for pre loading xnfdata, else set to null
- liquibaseLabels: xnf-data-preload
-
- # REST API basic authentication credentials (passsword is generated if not provided)
- appUserName: cpsuser
- spring:
- profile: helm
- #appUserPassword:
-
-# Any new property can be added in the env by setting in overrides in the format mentioned below
-# All the added properties must be in "key: value" format insead of yaml.
-# additional:
-# spring.config.max-size: 200
-# spring.config.min-size: 10
-
-logging:
- level: INFO
- path: /tmp
-
-#################################################################
-# Postgres overriding defaults in the postgres
-#################################################################
-postgres:
- nameOverride: &postgresName cps-postgres
- service:
- name: *postgresName
- name2: cps-pg-primary
- name3: cps-pg-replica
- container:
- name:
- primary: cps-pg-primary
- replica: cps-pg-replica
- persistence:
- mountSubPath: cps/data
- mountInitPath: cps
- config:
- pgUserName: cps
- pgDatabase: cpsdb
- pgUserExternalSecret: *pgUserCredsSecretName
- pgRootPasswordExternalSecret: *pgRootPassSecretName
-
-readinessCheck:
- wait_for:
- - cps-postgres