apiVersion: v1
kind: Service
metadata:
- name: {{ include "a1mediator.fullname" . }}
+ name: {{ include "common.servicename.a1mediator" . }}
labels:
-{{ include "a1mediator.labels" . | indent 4 }}
+ app.kubernetes.io/name: {{ include "common.fullname.a1mediator" . }}
+ helm.sh/chart: {{ include "common.chart" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ {{- if .Chart.AppVersion }}
+ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+ {{- end }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
spec:
type: {{ .Values.httpservice.type }}
NAME: xappmgr
-DBAAS_SERVICE_HOST: "r0-dbaas-redis-standalone"
+DBAAS_SERVICE_HOST: __DBAAS_SERVICE_HOST__
DBAAS_SERVICE_PORT: "6379"
-DBAAS_PORT_6379_TCP_ADDR: "r0-dbaas-redis-standalone"
+DBAAS_PORT_6379_TCP_ADDR: __DBAAS_SERVICE_HOST__
DBAAS_PORT_6379_TCP_PORT: "6379"
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "appmgr.fullname" . }}-appconfig
+ name: {{ include "common.configmapname.appmgr" . }}-appconfig
data:
- appmgr.yaml: |
{{- $restport := default ":8080" (printf ":%.0f" .Values.appmgr.containerPort) | quote -}}
{{- $helmrepo := include "common.helmrepository" . | quote -}}
{{- $reponame := default "helm-repo" .Values.appmgr.reponame | quote -}}
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "appmgr.fullname" . }}-appenv
+ name: {{ include "common.configmapname.appmgr" . }}-appenv
data:
- {{- (.Files.Get "resources/appenv.yaml") | nindent 2 }}
-
+ {{- $dbaasservicehost := include "common.servicename.dbaas" . | quote -}}
+ {{- (.Files.Get "resources/appenv.yaml") | replace "__DBAAS_SERVICE_HOST__" $dbaasservicehost | nindent 2 }}
apiVersion: apps/v1
kind: Deployment
metadata:
- name: {{ include "appmgr.fullname" . }}
+ name: {{ include "common.deploymentname.appmgr" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
matchLabels:
app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
release: {{ .Release.Name }}
- #app.kubernetes.io/name: {{ include "appmgr.name" . }}
- #app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
release: {{ .Release.Name }}
spec:
hostname: {{ .Chart.Name }}
- hostAliases:
- - ip: "135.207.143.86"
- hostnames:
- - "helm.ricinfra.local"
imagePullSecrets:
- name: {{ include "common.repositoryCred" . }}
containers:
mountPath: {{ .Values.appmgr.appcertpath }}
envFrom:
- configMapRef:
- name: {{ include "appmgr.fullname" . }}-appenv
+ name: {{ include "common.configmapname.appmgr" . }}-appenv
livenessProbe:
#exec:
# command:
volumes:
- name: config-volume
configMap:
- name: {{ include "appmgr.fullname" . }}-appconfig
+ name: {{ include "common.configmapname.appmgr" . }}-appconfig
- name: secret-volume
secret:
secretName: {{ include "common.helmrepositorycred" . }}
apiVersion: v1
kind: Service
metadata:
- name: {{ include "appmgr.fullname" . }}
+ name: {{ include "common.servicename.appmgr" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
# Helm Tiller port for xApp
# The global setting will override this default value
# You can further override using helmRepositoryTillerPortOverride: ""
-helmRepositoryTillerPort: "44134"
+helmRepositoryTillerPort: 44134
# Uncomment the following line to override the docker registry
#repositoryOverride: ""
# limitations under the License. #
################################################################################
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "appmgr.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "appmgr.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "appmgr.chart" -}}
+{{- define "common.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
-
{{- define "common.configmapname.appmgr" -}}
- {{- $name := ( include "common.name.appmgr" . ) -}}
+ {{- $name := ( include "common.fullname.appmgr" . ) -}}
{{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "common.configmapname.dbaas" -}}
- {{- $name := ( include "common.name.dbaas" . ) -}}
+ {{- $name := ( include "common.fullname.dbaas" . ) -}}
{{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
+{{- end -}}:
{{- define "common.configmapname.e2mgr" -}}
- {{- $name := ( include "common.name.e2mgr" . ) -}}
+ {{- $name := ( include "common.fullname.e2mgr" . ) -}}
{{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "common.configmapname.e2term" -}}
- {{- $name := ( include "common.name.e2term" . ) -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
{{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "common.configmapname.rtmgr" -}}
- {{- $name := ( include "common.name.rtmgr" . ) -}}
+ {{- $name := ( include "common.fullname.rtmgr" . ) -}}
{{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
-
+{{- define "common.configmapname.a1mediator" -}}
+ {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
{{- define "common.deploymentname.appmgr" -}}
- {{- $name := ( include "common.name.appmgr" . ) -}}
+ {{- $name := ( include "common.fullname.appmgr" . ) -}}
{{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "common.deploymentname.dbaas" -}}
- {{- $name := ( include "common.name.dbaas" . ) -}}
+ {{- $name := ( include "common.fullname.dbaas" . ) -}}
{{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "common.deploymentname.e2mgr" -}}
- {{- $name := ( include "common.name.e2mgr" . ) -}}
+ {{- $name := ( include "common.fullname.e2mgr" . ) -}}
{{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "common.deploymentname.e2term" -}}
- {{- $name := ( include "common.name.e2term" . ) -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
{{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "common.deploymentname.rtmgr" -}}
- {{- $name := ( include "common.name.rtmgr" . ) -}}
+ {{- $name := ( include "common.fullname.rtmgr" . ) -}}
{{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
+{{- define "common.deploymentname.a1mediator" -}}
+ {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
--- /dev/null
+################################################################################
+# Copyright (c) 2019 AT&T Intellectual Property. #
+# Copyright (c) 2019 Nokia. #
+# #
+# 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. #
+################################################################################
+
+{{/*
+ Resolve the ingress controller addresses.
+*/}}
+{{- define "common.ingressurl.ricplt" -}}
+ {{- if .Values.kongplatform -}}
+ {{- if .Values.kongplatform.ingressurlOverride -}}
+ {{- printf "%s" .Values.kongplatform.ingressurlOverride -}}
+ {{- else -}}
+ {{- printf "ricplt-entry" -}}
+ {{- end -}}
+ {{- else -}}
+ {{- printf "ricplt-entry" -}}
+ {{- end -}}
+{{- end -}}
+
+
+
+{{- define "common.ingresshttpport.ricplt" -}}
+ {{- if .Values.kongplatform -}}
+ {{- if .Values.kongplatform.ingresshttpportOverride -}}
+ {{- printf "%.0f" .Values.kongplatform.ingresshttpportOverride -}}
+ {{- else -}}
+ {{- printf "30080" -}}
+ {{- end -}}
+ {{- else -}}
+ {{- printf "30080" -}}
+ {{- end -}}
+{{- end -}}
+
+
+
+{{- define "common.ingresshttpsport.ricplt" -}}
+ {{- if .Values.kongplatform -}}
+ {{- if .Values.kongplatform.ingresshttpsportOverride -}}
+ {{- printf "%.0f" .Values.kongplatform.ingresshttpsportOverride -}}
+ {{- else -}}
+ {{- printf "30443" -}}
+ {{- end -}}
+ {{- else -}}
+ {{- printf "30443" -}}
+ {{- end -}}
+{{- end -}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{- define "common.ingressurl.ricxapp" -}}
+ {{- if .Values.kongxapp -}}
+ {{- if .Values.kongxapp.ingressurlOverride -}}
+ {{- printf "%s" .Values.kongxapp.ingressurlOverride -}}
+ {{- else -}}
+ {{- printf "ricxapp-entry" -}}
+ {{- end -}}
+ {{- else -}}
+ {{- printf "ricxapp-entry" -}}
+ {{- end -}}
+{{- end -}}
+
+
+
+{{- define "common.ingresshttpport.ricxapp" -}}
+ {{- if .Values.kongxapp -}}
+ {{- if .Values.kongxapp.ingresshttpportOverride -}}
+ {{- printf "%.0f" .Values.kongxapp.ingresshttpportOverride -}}
+ {{- else -}}
+ {{- printf "31080" -}}
+ {{- end -}}
+ {{- else -}}
+ {{- printf "31080" -}}
+ {{- end -}}
+{{- end -}}
+
+
+
+{{- define "common.ingresshttpsport.ricxapp" -}}
+ {{- if .Values.kongxapp -}}
+ {{- if .Values.kongxapp.ingresshttpsportOverride -}}
+ {{- printf "%.0f" .Values.kongxapp.ingresshttpsportOverride -}}
+ {{- else -}}
+ {{- printf "31443" -}}
+ {{- end -}}
+ {{- else -}}
+ {{- printf "31443" -}}
+ {{- end -}}
+{{- end -}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{- define "common.ingressurl.ricaux" -}}
+ {{- if .Values.kongaux -}}
+ {{- if .Values.kongaux.ingressurlOverride -}}
+ {{- printf "%s" .Values.kongaux.ingressurlOverride -}}
+ {{- else -}}
+ {{- printf "ricaux-entry" -}}
+ {{- end -}}
+ {{- else -}}
+ {{- printf "ricaux-entry" -}}
+ {{- end -}}
+{{- end -}}
+
+
+
+
+
+{{- define "common.ingresshttpport.ricaux" -}}
+ {{- if .Values.kongaux -}}
+ {{- if .Values.kongaux.ingresshttpportOverride -}}
+ {{- printf "%.0f" .Values.kongaux.ingresshttpportOverride -}}
+ {{- else -}}
+ {{- printf "32080" -}}
+ {{- end -}}
+ {{- else -}}
+ {{- printf "32080" -}}
+ {{- end -}}
+{{- end -}}
+
+
+
+{{- define "common.ingresshttpsport.ricaux" -}}
+ {{- if .Values.kongaux -}}
+ {{- if .Values.kongaux.ingresshttpsportOverride -}}
+ {{- printf "%.0f" .Values.kongaux.ingresshttpsportOverride -}}
+ {{- else -}}
+ {{- printf "32443" -}}
+ {{- end -}}
+ {{- else -}}
+ {{- printf "32443" -}}
+ {{- end -}}
+{{- end -}}
+
+{{- define "common.name.a1mediator" -}}
+ {{- if .Values.a1mediator -}}
+ {{- if .Values.a1mediator.nameOverride -}}
+ {{- printf "%s" .Values.a1mediator.nameOverride -}}
+ {{- else -}}
+ {{- printf "a1mediator" -}}
+ {{- end -}}
+ {{- else -}}
+ {{- printf "a1mediator" -}}
+ {{- end -}}
+{{- end -}}
+
+
+{{- define "common.fullname.a1mediator" -}}
+ {{- $name := ( include "common.name.a1mediator" . ) -}}
+ {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
{{- define "common.servicename.appmgr" -}}
- {{- $name := ( include "common.name.appmgr" . ) -}}
+ {{- $name := ( include "common.fullname.appmgr" . ) -}}
{{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "common.servicename.dbaas" -}}
- {{- $name := ( include "common.name.dbaas" . ) -}}
+ {{- $name := ( include "common.fullname.dbaas" . ) -}}
{{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "common.servicename.e2mgr" -}}
- {{- $name := ( include "common.name.e2mgr" . ) -}}
+ {{- $name := ( include "common.fullname.e2mgr" . ) -}}
{{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "common.servicename.e2term" -}}
- {{- $name := ( include "common.name.e2term" . ) -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
{{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "common.servicename.rtmgr" -}}
- {{- $name := ( include "common.name.rtmgr" . ) -}}
+ {{- $name := ( include "common.fullname.rtmgr" . ) -}}
{{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
+{{- define "common.servicename.a1mediator" -}}
+ {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+ {{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}