diff options
author | 2020-11-21 22:29:17 +0100 | |
---|---|---|
committer | 2020-11-24 13:56:53 +0100 | |
commit | 503b229517a752ce1ebc5950deb823a4b428148e (patch) | |
tree | 3f0db8508451351dfa3b3816dd3c94c3af6b029f /kubernetes/cds/charts/cds-ui/templates | |
parent | d73cd28ebecb469d0fdad1a5a85ed9c31570037b (diff) |
[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
Diffstat (limited to 'kubernetes/cds/charts/cds-ui/templates')
-rw-r--r-- | kubernetes/cds/charts/cds-ui/templates/deployment.yaml | 98 | ||||
-rw-r--r-- | kubernetes/cds/charts/cds-ui/templates/ingress.yaml | 1 | ||||
-rw-r--r-- | kubernetes/cds/charts/cds-ui/templates/service.yaml | 41 |
3 files changed, 0 insertions, 140 deletions
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" . }} |