From 503b229517a752ce1ebc5950deb823a4b428148e Mon Sep 17 00:00:00 2001
From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Sat, 21 Nov 2020 22:29:17 +0100
Subject: [CDS] Uses new tpls for repos / images
This commit makes CDS 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 <sylvain.desbureaux@orange.com>
Change-Id: I8156c8b568054b7eacf333196d877e12f7a52216
---
kubernetes/cds/charts/cds-ui/Chart.yaml | 18 ----
kubernetes/cds/charts/cds-ui/requirements.yaml | 18 ----
.../cds/charts/cds-ui/templates/deployment.yaml | 98 ------------------
.../cds/charts/cds-ui/templates/ingress.yaml | 1 -
.../cds/charts/cds-ui/templates/service.yaml | 41 --------
kubernetes/cds/charts/cds-ui/values.yaml | 111 ---------------------
6 files changed, 287 deletions(-)
delete mode 100644 kubernetes/cds/charts/cds-ui/Chart.yaml
delete mode 100644 kubernetes/cds/charts/cds-ui/requirements.yaml
delete mode 100644 kubernetes/cds/charts/cds-ui/templates/deployment.yaml
delete mode 100644 kubernetes/cds/charts/cds-ui/templates/ingress.yaml
delete mode 100644 kubernetes/cds/charts/cds-ui/templates/service.yaml
delete mode 100644 kubernetes/cds/charts/cds-ui/values.yaml
(limited to 'kubernetes/cds/charts/cds-ui')
diff --git a/kubernetes/cds/charts/cds-ui/Chart.yaml b/kubernetes/cds/charts/cds-ui/Chart.yaml
deleted file mode 100644
index 3ed3cf3717..0000000000
--- a/kubernetes/cds/charts/cds-ui/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2019 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: v1
-description: ONAP CDS UI
-name: cds-ui
-version: 6.0.0
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-ui/requirements.yaml b/kubernetes/cds/charts/cds-ui/requirements.yaml
deleted file mode 100644
index b33ac701fe..0000000000
--- a/kubernetes/cds/charts/cds-ui/requirements.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2019 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.
-
-dependencies:
- - name: common
- version: ~6.x-0
- repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
deleted file mode 100644
index 4d3d8347db..0000000000
--- a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-{{/*
-# Copyright © 2018 Orange
-# Modifications Copyright © 2018 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: apps/v1
-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:
- selector:
- matchLabels:
- app: {{ include "common.name" . }}
- replicas: {{ .Values.replicaCount }}
- template:
- metadata:
- labels:
- app: {{ include "common.name" . }}
- release: {{ include "common.release" . }}
- name: {{ include "common.fullname" . }}
- 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 }}
- env:
- - name: HOST
- value: 0.0.0.0
- - name: APP_ACTION_DEPLOY_BLUEPRINT_GRPC_ENABLED
- value: "{{ .Values.config.app.action.deployBlueprint.grpcEnabled }}"
- - name: API_BLUEPRINT_CONTROLLER_HTTP_BASE_URL
- value: {{ .Values.config.api.controller.http.baseUrl }}
- - name: API_BLUEPRINT_CONTROLLER_HTTP_AUTH_TOKEN
- value: {{ .Values.config.api.controller.http.authToken }}
- - name: API_BLUEPRINT_PROCESSOR_HTTP_BASE_URL
- value: {{ .Values.config.api.processor.http.baseUrl }}
- - name: API_BLUEPRINT_PROCESSOR_HTTP_AUTH_TOKEN
- value: {{ .Values.config.api.processor.http.authToken }}
- - name: API_BLUEPRINT_PROCESSOR_GRPC_HOST
- value: {{ .Values.config.api.processor.grpc.host }}
- - name: API_BLUEPRINT_PROCESSOR_GRPC_PORT
- value: "{{ .Values.config.api.processor.grpc.port }}"
- - name: API_BLUEPRINT_PROCESSOR_GRPC_AUTH_TOKEN
- value: {{ .Values.config.api.processor.grpc.authToken }}
- readinessProbe:
- tcpSocket:
- port: {{ .Values.service.internalPort }}
- initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
- periodSeconds: {{ .Values.readiness.periodSeconds }}
- volumeMounts:
- - mountPath: /etc/localtime
- name: localtime
- 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 }}
- volumes:
- - name: localtime
- hostPath:
- path: /etc/localtime
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/cds/charts/cds-ui/templates/ingress.yaml b/kubernetes/cds/charts/cds-ui/templates/ingress.yaml
deleted file mode 100644
index 8f87c68f1e..0000000000
--- a/kubernetes/cds/charts/cds-ui/templates/ingress.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{ include "common.ingress" . }}
diff --git a/kubernetes/cds/charts/cds-ui/templates/service.yaml b/kubernetes/cds/charts/cds-ui/templates/service.yaml
deleted file mode 100644
index bfc3e30c84..0000000000
--- a/kubernetes/cds/charts/cds-ui/templates/service.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada, 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
-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.internalPort }}
- nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}-{{ .Values.service.internalPort }}
- {{- else -}}
- - port: {{ .Values.service.externalPort }}
- targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
- {{- end}}
- selector:
- app: {{ include "common.name" . }}
- release: {{ include "common.release" . }}
diff --git a/kubernetes/cds/charts/cds-ui/values.yaml b/kubernetes/cds/charts/cds-ui/values.yaml
deleted file mode 100644
index 496aa85fea..0000000000
--- a/kubernetes/cds/charts/cds-ui/values.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright © 2018 Orange
-# Modifications Copyright © 2018 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.
-
-#################################################################
-# Global configuration defaults.
-#################################################################
-global:
- nodePortPrefixExt: 304
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
-
-subChartsOnly:
- enabled: true
-
-# application image
-repository: nexus3.onap.org:10001
-image: onap/ccsdk-cds-ui-server:1.0.3
-pullPolicy: Always
-
-# application configuration
-config:
- app:
- action:
- deployBlueprint:
- grpcEnabled: true
- api:
- controller:
- http:
- baseUrl: http://cds-blueprints-processor-http:8081/api/v1
- authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
- processor:
- http:
- baseUrl: http://cds-blueprints-processor-http:8080/api/v1
- authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
- grpc:
- host: cds-blueprints-processor-grpc
- port: 9111
- authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
- httpGet:
- path: /
- port: 3000
- initialDelaySeconds: 30
- periodSeconds: 10
- # necessary to disable liveness probe when setting breakpoints
- # in debugger so K8s doesn't restart unresponsive container
- enabled: true
-
-readiness:
- httpGet:
- path: /ping
- port: 3000
- initialDelaySeconds: 30
- periodSeconds: 10
-
-service:
- type: NodePort
- portName: cds-ui
- name: cds-ui
- nodePort: 97
- internalPort: 3000
-
-ingress:
- enabled: false
- service:
- - baseaddr: "cdsui"
- name: "cds-ui"
- port: 3000
- config:
- ssl: "redirect"
-
-# Resource Limit flavor -By Default using small
-flavor: small
-# Segregation for Different environment (Small and Large)
-resources:
- small:
- limits:
- cpu: 1
- memory: 1Gi
- requests:
- cpu: 10m
- memory: 100Mi
- large:
- limits:
- cpu: 2
- memory: 2Gi
- requests:
- cpu: 200m
- memory: 200Mi
- unlimited: {}
--
cgit