diff options
author | 2019-11-07 16:26:50 +0000 | |
---|---|---|
committer | 2019-11-07 16:58:20 +0000 | |
commit | e9cd1ee8e62624af8e3939a2e3c8d45ff644f65d (patch) | |
tree | 0f82878fb5c0766608ae539c4ea43eb7088e3a6f /kubernetes/dcaegen2/charts/dcae-config-binding-service/templates | |
parent | 5bdb14011023be31471622a92b98493a04da0281 (diff) |
Attempt 2 at chart restructure
Helm value override file now supports component-specific settings:
dcae-bootstrap:
enabled: true
dcae-cloudify-manager:
enabled: true
dcae-config-binding-service:
enabled: true
dcae-healthcheck:
enabled: true
dcae-redis:
enabled: true
dcae-servicechange-handler:
enabled: true
dcae-inventory-api:
enabled: true
dcae-deployment-handler:
enabled: true
dcae-policy-handler:
enabled: true
dcae-dashboard:
enabled: true
Issue-ID: OOM-1574
Signed-off-by: Ubuntu <dgl@research.att.com>
Change-Id: I85e0fe6ae19e176d954611549ec954a5fe662307
Signed-off-by: Ubuntu <dgl@research.att.com>
Diffstat (limited to 'kubernetes/dcaegen2/charts/dcae-config-binding-service/templates')
3 files changed, 0 insertions, 263 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/configmap.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/configmap.yaml deleted file mode 100644 index a150cbd336..0000000000 --- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/configmap.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright © 2017 Amdocs, Bell Canada -# Modifications Copyright © 2019 AT&T -# -# 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: {{ .Release.Name }}-cbs-filebeat-configmap - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }} diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml deleted file mode 100644 index c3e63fb968..0000000000 --- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml +++ /dev/null @@ -1,181 +0,0 @@ -#============LICENSE_START======================================================== -# ================================================================================ -# Copyright (c) 2019 AT&T Intellectual Property. 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. -# ============LICENSE_END========================================================= - -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: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: 1 - template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - spec: - initContainers: - - name: {{ include "common.name" . }}-readiness - image: {{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }} - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - command: - - /root/ready.py - args: - - --container-name - - consul-server - - "-t" - - "15" - env: - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - {{- if .Values.service.secure.enabled }} - - name: init-tls - env: - - name: POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }} - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - resources: {} - volumeMounts: - - mountPath: /opt/tls/shared - name: tls-info - {{ end }} - containers: - {{- if .Values.service.secure.enabled }} - - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - resources: -{{ include "common.resources" . | indent 12 }} - ports: - - containerPort: {{ .Values.service.secure.internalPort }} - # disable liveness probe when breakpoints set in debugger - # so K8s doesn't restart unresponsive container - {{- if eq .Values.liveness.enabled true }} - livenessProbe: - tcpSocket: - port: {{ .Values.service.secure.internalPort }} - initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end -}} - readinessProbe: - httpGet: - scheme: "HTTPS" - path: {{ .Values.readiness.path }} - port: {{ .Values.service.secure.internalPort }} - initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.readiness.periodSeconds }} - volumeMounts: - - name: {{ include "common.fullname" . }}-logs - mountPath: /opt/logs - - name: tls-info - mountPath: /opt/tls - env: - - name: CONSUL_HOST - value: consul.{{ include "common.namespace" . }} - - name: USE_HTTPS - value: "1" - - name: HTTPS_CERT_PATH - value: "/opt/tls/cert.pem" - - name: HTTPS_KEY_PATH - value: "/opt/tls/key.pem" - - name: {{ include "common.name" . }}-fb-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - volumeMounts: - - name: {{ include "common.fullname" . }}-fb-conf - mountPath: /usr/share/filebeat/filebeat.yml - subPath: filebeat.yml - - name: {{ include "common.fullname" . }}-data-fb - mountPath: /usr/share/filebeat/data - - name: {{ include "common.fullname" . }}-logs - mountPath: /var/log/onap/config-binding-service - {{ end }} - {{- if .Values.service.insecure.enabled }} - - name: {{ include "common.name" . }}-insecure - image: "{{ include "common.repository" . }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - resources: -{{ include "common.resources" . | indent 12 }} - ports: - - containerPort: {{ .Values.service.insecure.internalPort }} - # disable liveness probe when breakpoints set in debugger - # so K8s doesn't restart unresponsive container - {{- if eq .Values.liveness.enabled true }} - livenessProbe: - tcpSocket: - port: {{ .Values.service.insecure.internalPort }} - initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end -}} - readinessProbe: - httpGet: - scheme: "HTTP" - path: {{ .Values.readiness.path }} - port: {{ .Values.service.insecure.internalPort }} - initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.readiness.periodSeconds }} - volumeMounts: - - name: {{ include "common.fullname" . }}-logs-i - mountPath: /opt/logs - env: - - name: CONSUL_HOST - value: consul.{{ include "common.namespace" . }} - - name: {{ include "common.name" . }}-fb-onap-i - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - volumeMounts: - - name: {{ include "common.fullname" . }}-fb-conf - mountPath: /usr/share/filebeat/filebeat.yml - subPath: filebeat.yml - - name: {{ include "common.fullname" . }}-data-fb-i - mountPath: /usr/share/filebeat/data - - name: {{ include "common.fullname" . }}-logs-i - mountPath: /var/log/onap/config-binding-service - {{ end }} - volumes: - - name: {{ include "common.fullname" . }}-fb-conf - configMap: - name: {{ .Release.Name }}-cbs-filebeat-configmap - {{- if .Values.service.secure.enabled }} - - name: {{ include "common.fullname" . }}-data-fb - emptyDir: {} - - name: {{ include "common.fullname" . }}-logs - emptyDir: {} - - name: tls-info - emptyDir: {} - {{ end }} - {{- if .Values.service.insecure.enabled }} - - name: {{ include "common.fullname" . }}-data-fb-i - emptyDir: {} - - name: {{ include "common.fullname" . }}-logs-i - emptyDir: {} - {{ end }} - - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/service.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/service.yaml deleted file mode 100644 index 8176e77c1e..0000000000 --- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/service.yaml +++ /dev/null @@ -1,56 +0,0 @@ -#============LICENSE_START======================================================== -# ================================================================================ -# Copyright (c) 2019 AT&T Intellectual Property. 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. -# ============LICENSE_END========================================================= - -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: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - type: {{ .Values.service.type }} - ports: - {{ if eq .Values.service.type "NodePort" -}} - {{ if .Values.service.insecure.enabled -}} - - port: {{ .Values.service.insecure.externalPort }} - nodePort: {{ .Values.global.nodePortPrefixExt| default .Values.nodePortPrefixExt }}{{ .Values.service.insecure.nodePort }} - name: {{ .Values.service.name }}-insecure - {{- end }} - {{ if .Values.service.secure.enabled -}} - - port: {{ .Values.service.secure.externalPort }} - nodePort: {{ .Values.global.nodePortPrefixExt| default .Values.nodePortPrefixExt }}{{ .Values.service.secure.nodePort }} - name: {{ .Values.service.name }}-secure - {{- end }} - {{- else -}} - {{ if .Values.service.insecure.enabled -}} - - port: {{ .Values.service.insecure.externalPort }} - targetPort: {{ .Values.service.insecure.internalPort }} - name: {{ .Values.service.name }}-insecure - {{- end }} - {{ if .Values.service.secure.enabled -}} - - port: {{ .Values.service.secure.externalPort }} - targetPort: {{ .Values.service.secure.internalPort }} - name: {{ .Values.service.name }}-secure - {{- end }} - {{- end }} - selector: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} |