updated 3rdparty influxdb templates to refer the definitions from the common template
updated supporting files in the ric-dep repo
Signed-off-by: Chandrasekaran Ramachandran <chandrasekaran-r@hcl.com>
Change-Id: If5b2fc8cb7b62a071788ccc045e6dcf36fa76490
################################################################################
# Copyright (c) 2019 AT&T Intellectual Property. #
+# Copyright (c) 2021 HCL Technologies Limited. #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
name: ric-plt-alarmmanager
tag: 0.5.9
+
+influxdb:
+ image:
+ registry: "influxdb"
+ name: influxdb
+ tag: "1.8.0-alpine"
################################################################################
# Copyright (c) 2019 AT&T Intellectual Property. #
# Copyright (c) 2019 Nokia. #
+# Copyright (c) 2021 HCL Technologies Limited. #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
LOCAL_REPOSITORY=$(echo "$COMMON_BLOCK" | awk '/^ *localregistry:/{print $2}')
# replace the dbaasha with dbaas1 if deploying non HA DBaaS
-COMPONENTS=${LIST_OF_COMPONENTS:-"infrastructure dbaas xapp-onboarder appmgr rtmgr e2mgr e2term a1mediator submgr vespamgr jaegeradapter o1mediator alarmmanager"}
+COMPONENTS=${LIST_OF_COMPONENTS:-"infrastructure dbaas xapp-onboarder appmgr rtmgr e2mgr e2term a1mediator submgr vespamgr jaegeradapter o1mediator alarmmanager influxdb"}
echo "Deploying RIC infra components [$COMPONENTS]"
################################################################################
# Copyright (c) 2019 AT&T Intellectual Property. #
# Copyright (c) 2019 Nokia. #
+# Copyright (c) 2021 HCL Technologies Limited. #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
# limitations under the License. #
################################################################################
-COMPONENTS="xapp-onboarder appmgr rtmgr e2mgr e2term a1mediator submgr vespamgr jaegeradapter dbaas infrastructure o1mediator alarmmanager"
+COMPONENTS="xapp-onboarder appmgr rtmgr e2mgr e2term a1mediator submgr vespamgr jaegeradapter dbaas infrastructure o1mediator alarmmanager influxdb"
RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep ricplt-recipe | awk '{print $1}')
kubectl get configmap -n $RECIPE_NAMESPACE ricplt-recipe -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml
--- /dev/null
+################################################################################
+# Copyright (c) 2021 HCL Technologies Limited. #
+# #
+# 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: ric-common
+ version: ^3.1.0
+ repository: "@local"
-InfluxDB can be accessed via port {{ .Values.config.http.bind_address | default 8086 }} on the following DNS name from within your cluster:
-
- http://{{ include "influxdb.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.config.http.bind_address | default 8086 }}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
+InfluxDB can be accessed via port {{ include "common.serviceport.influxdb.http.bind_address" . | default 8086 }} on the following DNS name from within your cluster:
+
+ http://{{ include "common.fullname.influxdb" . }}.{{ .Release.Namespace }}:{{ include "common.serviceport.influxdb.http.bind_address" . | default 8086 }}
You can connect to the remote instance with the influx CLI. To forward the API port to localhost:8086, run the following:
- kubectl port-forward --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ include "influxdb.fullname" . }} -o jsonpath='{ .items[0].metadata.name }') 8086:{{ .Values.config.http.bind_address | default 8086 }}
+ kubectl port-forward --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ include "common.fullname.influxdb" . }} -o jsonpath='{ .items[0].metadata.name }') 8086:{{ include "common.serviceport.influxdb.http.bind_address" . | default 8086 }}
You can also connect to the influx CLI from inside the container. To open a shell session in the InfluxDB pod, run the following:
- kubectl exec -i -t --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ include "influxdb.fullname" . }} -o jsonpath='{.items[0].metadata.name}') /bin/sh
+ kubectl exec -i -t --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ include "common.fullname.influxdb" . }} -o jsonpath='{.items[0].metadata.name}') /bin/sh
To view the logs for the InfluxDB pod, run the following:
- kubectl logs -f --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ include "influxdb.fullname" . }} -o jsonpath='{ .items[0].metadata.name }')
+ kubectl logs -f --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ include "common.fullname.influxdb" . }} -o jsonpath='{ .items[0].metadata.name }')
{{- if .Values.setDefaultUser.enabled }}
{{- else }}
- echo $(kubectl get secret {{ include "influxdb.fullname" . }}-auth -o "jsonpath={.data['influxdb-user']}" --namespace {{ .Release.Namespace }} | base64 --decode)
+ echo $(kubectl get secret {{ include "common.fullname.influxdb" . }}-auth -o "jsonpath={.data['influxdb-user']}" --namespace {{ .Release.Namespace }} | base64 --decode)
{{- end }}
{{- else }}
- echo $(kubectl get secret {{ include "influxdb.fullname" . }}-auth -o "jsonpath={.data['influxdb-password']}" --namespace {{ .Release.Namespace }} | base64 --decode)
+ echo $(kubectl get secret {{ include "common.fullname.influxdb" . }}-auth -o "jsonpath={.data['influxdb-password']}" --namespace {{ .Release.Namespace }} | base64 --decode)
{{- end }}
{{- end }}
+++ /dev/null
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "influxdb.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 "influxdb.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 "influxdb.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "influxdb.labels" -}}
-helm.sh/chart: {{ include "influxdb.chart" . }}
-{{ include "influxdb.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "influxdb.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "influxdb.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "influxdb.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
- {{ default (include "influxdb.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
- {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
{{- if .Values.backup.enabled }}
apiVersion: batch/v1beta1
kind: CronJob
metadata:
- name: {{ include "influxdb.fullname" . }}-backup
+ name: {{ include "common.fullname.influxdb" . }}-backup
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
app.kubernetes.io/component: backup
annotations:
{{- toYaml .Values.backup.annotations | nindent 4 }}
{{ toYaml .Values.backup.podAnnotations | nindent 12 }}
{{- end }}
labels:
- {{- include "influxdb.selectorLabels" . | nindent 12 }}
+ {{- include "common.influxdb.selectorLabels" . | nindent 12 }}
spec:
restartPolicy: OnFailure
volumes:
- name: backup
{{- if .Values.backup.persistence.enabled }}
persistentVolumeClaim:
- claimName: {{ include "influxdb.fullname" . }}-backup
+ claimName: {{ include "common.fullname.influxdb" . }}-backup
{{- else }}
emptyDir: {}
{{- end }}
secretName: {{ .Values.backup.s3.credentialsSecret | quote }}
{{- end }}
{{- end }}
- serviceAccountName: {{ include "influxdb.serviceAccountName" . }}
+ serviceAccountName: {{ include "common.influxdb.serviceAccountName" . }}
initContainers:
- name: influxdb-backup
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- '-c'
- |
influxd backup \
- -host {{ include "influxdb.fullname" . }}.{{ .Release.Namespace }}.svc:{{ .Values.config.rpc.bind_address | default 8088 }} \
+ -host {{ include "common.fullname.influxdb" . }}.{{ .Release.Namespace }}.svc:{{ include "common.serviceport.influxdb.rpc.bind_address" . | default 8088 }} \
-portable /backup/"$(date +%Y%m%d%H%M%S)"
resources:
{{- toYaml .Values.backup.resources | nindent 14 }}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
{{- if and .Values.backup.enabled .Values.backup.persistence.enabled }}
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
- name: {{ include "influxdb.fullname" . }}-backup
+ name: {{ include "common.fullname.influxdb" . }}-backup
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
spec:
accessModes:
- {{ .Values.backup.persistence.accessMode | quote }}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
{{- if .Values.backupRetention.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "influxdb.fullname" . }}-backup-retention
+ name: {{ include "common.fullname.influxdb" . }}-backup-retention
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
data:
backup-retention.sh: |-
{{- .Files.Get "files/backup-retention-script.sh" | nindent 4 }}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
{{- if .Values.backupRetention.enabled }}
apiVersion: batch/v1beta1
kind: CronJob
metadata:
- name: {{ include "influxdb.fullname" . }}-backup-retention
+ name: {{ include "common.fullname.influxdb" . }}-backup-retention
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
app.kubernetes.io/component: backup-retention
annotations:
{{- toYaml .Values.backupRetention.annotations | nindent 4 }}
{{ toYaml .Values.backupRetention.podAnnotations | nindent 12 }}
{{- end }}
labels:
- {{- include "influxdb.selectorLabels" . | nindent 12 }}
+ {{- include "common.influxdb.selectorLabels" . | nindent 12 }}
spec:
restartPolicy: OnFailure
volumes:
- name: scripts
configMap:
- name: {{ include "influxdb.fullname" . }}-backup-retention
+ name: {{ include "common.fullname.influxdb" . }}-backup-retention
{{- if .Values.backupRetention.gcs }}
{{- if .Values.backupRetention.gcs.serviceAccountSecret }}
- name: google-cloud-key
secretName: {{ .Values.backupRetention.s3.credentialsSecret | quote }}
{{- end }}
{{- end }}
- serviceAccountName: {{ include "influxdb.serviceAccountName" . }}
+ serviceAccountName: {{ include "common.influxdb.serviceAccountName" . }}
containers:
{{- if .Values.backupRetention.gcs }}
{{- end }}
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "influxdb.fullname" . }}
+ name: {{ include "common.fullname.influxdb" . }}
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
data:
influxdb.conf: |+
reporting-disabled = {{ .Values.config.reporting_disabled | default false }}
- bind-address = ":{{ .Values.config.rpc.bind_address | default 8088 }}"
+ bind-address = ":{{ include "common.serviceport.influxdb.rpc.bind_address" . | default 8088 }}"
[meta]
dir = "/var/lib/influxdb/meta"
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
{{- if .Values.ingress.enabled -}}
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
- name: {{ include "influxdb.fullname" . }}
+ name: {{ include "common.fullname.influxdb" . }}
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
annotations:
{{ toYaml .Values.ingress.annotations | indent 4 }}
spec:
paths:
- path: {{ .Values.ingress.path }}
backend:
- serviceName: {{ include "influxdb.fullname" . }}
- servicePort: 8086
+ serviceName: {{ include "common.fullname.influxdb" . }}
+ servicePort: {{ include "common.serviceport.influxdb.http" .}}
{{- end -}}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
{{- if .Values.initScripts.enabled -}}
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "influxdb.fullname" . }}-init
+ name: {{ include "common.fullname.influxdb" . }}-init
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
data:
{{ toYaml .Values.initScripts.scripts | indent 2 }}
{{- end -}}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
{{ if .Values.enterprise.enabled -}}
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "influxdb.fullname" . }}-meta
+ name: {{ include "common.fullname.influxdb" . }}-meta
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
app.kubernetes.io/component: meta
data:
influxdb-meta.conf: |+
reporting-disabled = {{ .Values.config.reporting_disabled | default false }}
- bind-address = ":{{ .Values.config.meta.bind_address | default 8091 }}"
+ bind-address = ":{{ include "common.serviceport.influxdb.meta.bind_address" . | default 8091 }}"
[enterprise]
license-key = {{ .Values.enterprise.licensekey | quote }}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
{{ if .Values.enterprise.enabled -}}
apiVersion: v1
kind: Service
annotations:
{{ toYaml .Values.service.annotations | indent 4 }}
{{- end }}
- name: {{ include "influxdb.fullname" . }}-meta
+ name: {{ include "common.fullname.influxdb" . }}-meta
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
app.kubernets.io/component: meta
spec:
type: ClusterIP
publishNotReadyAddresses: true
ports:
- name: meta
- port: {{ .Values.config.meta.bind_address | default 8091 }}
+ port: {{ include "common.serviceport.influxdb.meta.bind_address" . | default 8091 }}
targetPort: meta
selector:
- {{- include "influxdb.selectorLabels" . | nindent 4 }}
+ {{- include "common.influxdb.selectorLabels" . | nindent 4 }}
app.kubernets.io/component: meta
{{- end }}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
{{- if .Values.enterprise.enabled }}
apiVersion: apps/v1
kind: StatefulSet
metadata:
- name: {{ include "influxdb.fullname" . }}-meta
+ name: {{ include "common.fullname.influxdb" . }}-meta
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
app.kubernetes.io/component: meta
spec:
replicas: {{ .Values.enterprise.meta.clusterSize }}
selector:
matchLabels:
- {{- include "influxdb.selectorLabels" . | nindent 6 }}
+ {{- include "common.influxdb.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: meta
- serviceName: "{{ include "influxdb.fullname" . }}-meta"
+ serviceName: "{{ include "common.fullname.influxdb" . }}-meta"
template:
metadata:
labels:
- {{- include "influxdb.selectorLabels" . | nindent 8 }}
+ {{- include "common.influxdb.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: meta
{{- if .Values.podAnnotations }}
annotations:
- name: {{ . }}
{{- end}}
{{- end }}
- serviceAccountName: {{ include "influxdb.serviceAccountName" . }}
+ serviceAccountName: {{ include "common.influxdb.serviceAccountName" . }}
containers:
- - name: "{{ include "influxdb.fullname" . }}-meta"
+ - name: "{{ include "common.fullname.influxdb" . }}-meta"
image: "{{ .Values.image.repository }}:{{ .Values.enterprise.meta.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
resources:
{{ toYaml .Values.enterprise.meta.resources | indent 10 }}
ports:
- name: udp
- containerPort: {{ .Values.config.udp.bind_address | default 8089 }}
+ containerPort: {{ include "common.serviceport.influxdb.udp.bind_address" . | default 8089 }}
- name: rpc
- containerPort: {{ .Values.config.rpc.bind_address | default 8088 }}
+ containerPort: {{ include "common.serviceport.influxdb.rpc.bind_address" . | default 8088 }}
- name: meta
- containerPort: {{ .Values.config.meta.bind_address | default 8091 }}
+ containerPort: {{ include "common.serviceport.influxdb.meta.bind_address" . | default 8091 }}
{{- if .Values.env }}
env:
{{ toYaml .Values.env | indent 10 }}
# Values.env's HOSTNAME isn't fundamentally different from $HOSTNAME, but this way we get a distinguished name for InfluxDB at runtime.
- name: INFLUXDB_HOSTNAME
- value: "$(_HOSTNAME).{{ include "influxdb.fullname" . }}-meta"
+ value: "$(_HOSTNAME).{{ include "common.fullname.influxdb" . }}-meta"
{{- end }}
livenessProbe:
httpGet:
periodSeconds: {{ .Values.startupProbe.periodSeconds | default 5 }}
{{- end }}
volumeMounts:
- - name: {{ include "influxdb.fullname" . }}-meta
+ - name: {{ include "common.fullname.influxdb" . }}-meta
mountPath: /var/lib/influxdb
- name: config
mountPath: /etc/influxdb
volumes:
- name: config
configMap:
- name: {{ include "influxdb.fullname" . }}-meta
+ name: {{ include "common.fullname.influxdb" . }}-meta
{{- if .Values.initScripts.enabled }}
- name: init
configMap:
- name: {{ include "influxdb.fullname" . }}-init
+ name: {{ include "common.fullname.influxdb" . }}-init
{{- end }}
{{- if (not .Values.persistence.enabled ) }}
- - name: {{ include "influxdb.fullname" . }}-meta
+ - name: {{ include "common.fullname.influxdb" . }}-meta
emptyDir: {}
{{- end }}
{{- if .Values.schedulerName }}
{{- if .Values.persistence.enabled }}
volumeClaimTemplates:
- metadata:
- name: {{ include "influxdb.fullname" . }}-meta
+ name: {{ include "common.fullname.influxdb" . }}-meta
annotations:
{{- range $key, $value := .Values.persistence.annotations }}
{{ $key }}: "{{ $value }}"
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
{{- if .Values.setDefaultUser.enabled -}}
apiVersion: batch/v1
kind: Job
metadata:
- name: {{ include "influxdb.fullname" . }}-set-auth
+ name: {{ include "common.fullname.influxdb" . }}-set-auth
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
annotations:
"helm.sh/hook": post-install
"helm.sh/hook-delete-policy": {{ .Values.setDefaultUser.hookDeletePolicy }}
template:
metadata:
labels:
- {{- include "influxdb.selectorLabels" . | nindent 8 }}
+ {{- include "common.influxdb.selectorLabels" . | nindent 8 }}
spec:
containers:
- - name: {{ include "influxdb.fullname" . }}-set-auth
+ - name: {{ include "common.fullname.influxdb" . }}-set-auth
image: "{{ .Values.setDefaultUser.image }}"
env:
- name: INFLUXDB_USER
{{- if .Values.setDefaultUser.user.existingSecret }}
name: {{ .Values.setDefaultUser.user.existingSecret -}}
{{ else }}
- name: {{ include "influxdb.fullname" . }}-auth
+ name: {{ include "common.fullname.influxdb" . }}-auth
{{- end }}
key: influxdb-user
- name: INFLUXDB_PASSWORD
{{- if .Values.setDefaultUser.user.existingSecret }}
name: {{ .Values.setDefaultUser.user.existingSecret -}}
{{ else }}
- name: {{ include "influxdb.fullname" . }}-auth
+ name: {{ include "common.fullname.influxdb" . }}-auth
{{- end }}
key: influxdb-password
args:
- "/bin/sh"
- "-c"
- |
- curl -X POST http://{{ include "influxdb.fullname" . }}:{{ .Values.config.http.bind_address | default 8086 }}/query \
+ curl -X POST http://{{ include "common.fullname.influxdb" . }}:{{ include "common.serviceport.influxdb.http.bind_address" . | default 8086 }}/query \
--data-urlencode \
"q=CREATE USER \"${INFLUXDB_USER}\" WITH PASSWORD '${INFLUXDB_PASSWORD}' {{ .Values.setDefaultUser.user.privileges }}"
restartPolicy: {{ .Values.setDefaultUser.restartPolicy }}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
{{- if .Values.setDefaultUser.enabled -}}
{{- if not (.Values.setDefaultUser.user.existingSecret) -}}
apiVersion: v1
kind: Secret
metadata:
- name: {{ include "influxdb.fullname" . }}-auth
+ name: {{ include "common.fullname.influxdb" . }}-auth
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
data:
{{- if .Values.setDefaultUser.user.password }}
influxdb-password: {{ .Values.setDefaultUser.user.password | b64enc | quote }}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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:
annotations:
{{ toYaml .Values.service.annotations | indent 4 }}
{{- end }}
- name: {{ include "influxdb.fullname" . }}
+ name: {{ include "common.fullname.influxdb" . }}
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
- name: api
- port: {{ .Values.config.http.bind_address | default 8086 }}
+ port: {{ include "common.serviceport.influxdb.http.bind_address" . | default 8086 }}
targetPort: api
- name: rpc
- port: {{ .Values.config.rpc.bind_address | default 8088 }}
+ port: {{ include "common.serviceport.influxdb.rpc.bind_address" . | default 8088 }}
targetPort: rpc
{{- if .Values.config.graphite.enabled }}
- name: graphite
- port: {{ .Values.config.graphite.bind_address | default 2003 }}
+ port: {{ include "common.serviceport.influxdb.graphite.bind_address" . | default 2003 }}
targetPort: graphite
{{- end }}
{{- if .Values.config.collectd.enabled }}
- name: collectd
- port: {{ .Values.config.collectd.bind_address | default 25826 }}
+ port: {{ include "common.serviceport.influxdb.collectd.bind_address" . | default 25826 }}
protocol: UDP
targetPort: collectd
{{- end }}
{{- if .Values.config.udp.enabled }}
- name: udp
- port: {{ .Values.config.udp.bind_address | default 8089 }}
+ port: {{ include "common.serviceport.influxdb.udp.bind_address" . | default 8089 }}
protocol: UDP
targetPort: udp
{{- end }}
{{- if .Values.config.opentsdb.enabled }}
- name: opentsdb
- port: {{ .Values.config.opentsdb.bind_address | default 4242 }}
+ port: {{ include "common.serviceport.influxdb.opentsdb.bind_address" . | default 4242 }}
targetPort: opentsdb
{{- end }}
selector:
- {{- include "influxdb.selectorLabels" . | nindent 4 }}
+ {{- include "common.influxdb.selectorLabels" . | nindent 4 }}
{{- if .Values.service.loadBalancerIP }}
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
{{- end }}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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. #
+################################################################################
+---
{{- if .Values.serviceAccount.create -}}
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ include "influxdb.serviceAccountName" . }}
+ name: {{ include "common.influxdb.serviceAccountName" . }}
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
- {{- end }}
+ {{- end }}
{{- end -}}
+################################################################################
+# Copyright (c) 2021 HCL Technolgies Limited. #
+# #
+# 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: StatefulSet
metadata:
- name: {{ include "influxdb.fullname" . }}
+ name: {{ include "common.fullname.influxdb" . }}-meta
labels:
- {{- include "influxdb.labels" . | nindent 4 }}
+ {{- include "common.influxdb.labels" . | nindent 4 }}
spec:
{{- if .Values.enterprise.enabled }}
replicas: {{ .Values.enterprise.clusterSize }}
{{- end}}
selector:
matchLabels:
- {{- include "influxdb.selectorLabels" . | nindent 6 }}
- serviceName: "{{ include "influxdb.fullname" . }}"
+ {{- include "common.influxdb.selectorLabels" . | nindent 6 }}
+ serviceName: {{ include "common.fullname.influxdb" . }}-meta
template:
metadata:
labels:
- {{- include "influxdb.selectorLabels" . | nindent 8 }}
+ {{- include "common.influxdb.selectorLabels" . | nindent 8 }}
{{- if .Values.podAnnotations }}
annotations:
{{ toYaml .Values.podAnnotations | indent 8 }}
- name: {{ . }}
{{- end}}
{{- end }}
- serviceAccountName: {{ include "influxdb.serviceAccountName" . }}
+ serviceAccountName: {{ include "common.influxdb.serviceAccountName" . }}
containers:
- - name: {{ include "influxdb.fullname" . }}
+ - name: {{ include "common.fullname.influxdb" . }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
resources:
{{ toYaml .Values.resources | indent 10 }}
ports:
- name: api
- containerPort: {{ .Values.config.http.bind_address | default 8086 }}
+ containerPort: {{ include "common.serviceport.influxdb.http.bind_address" . | default 8086 }}
{{- if .Values.config.graphite.enabled }}
- name: graphite
- containerPort: {{ .Values.config.graphite.bind_address | default 2003 }}
+ containerPort: {{ include "common.serviceport.influxdb.graphite.bind_address" . | default 2003 }}
{{- end }}
{{- if .Values.config.collectd.enabled }}
- name: collectd
- containerPort: {{ .Values.config.collectd.bind_address | default 25826 }}
+ containerPort: {{ include "common.serviceport.influxdb.collectd.bind_address" . | default 25826 }}
protocol: UDP
{{- end }}
{{- if .Values.config.udp.enabled }}
- name: udp
- containerPort: {{ .Values.config.udp.bind_address | default 8089 }}
+ containerPort: {{ include "common.serviceport.influxdb.udp.bind_address" . | default 8089 }}
protocol: UDP
{{- end }}
{{- if .Values.config.opentsdb.enabled }}
- name: opentsdb
- containerPort: {{ .Values.config.opentsdb.bind_address | default 4242 }}
+ containerPort: {{ include "common.serviceport.influxdb.opentsdb.bind_address" . | default 4242 }}
{{- end }}
- name: rpc
- containerPort: {{ .Values.config.rpc.bind_address | default 8088 }}
+ containerPort: {{ include "common.serviceport.influxdb.rpc.bind_address" . | default 8088 }}
{{- if .Values.enterprise.enabled }}
- name: meta
- containerPort: {{ .Values.config.meta.bind_address | default 8091 }}
+ containerPort: {{ include "common.serviceport.influxdb.meta.bind_address" . | default 8091 }}
{{- end }}
{{- if .Values.env }}
env:
{{ toYaml .Values.env | indent 10 }}
{{- if .Values.enterprise.enabled }}
- name: INFLUXDB_HOSTNAME # Values.env's HOSTNAME isn't fundamentally different from $HOSTNAME, but this way weg get a distinguished name at runtime.
- value: "$(_HOSTNAME).{{ include "influxdb.fullname" . }}"
+ value: "$(_HOSTNAME).{{ include "common.fullname.influxdb" . }}"
{{- end }}
{{- end }}
{{- if .Values.envFromSecret }}
periodSeconds: {{ .Values.startupProbe.periodSeconds | default 5 }}
{{- end }}
volumeMounts:
- - name: {{ include "influxdb.fullname" . }}-data
+ - name: {{ include "common.fullname.influxdb" . }}-data
mountPath: /var/lib/influxdb
- name: config
mountPath: /etc/influxdb
volumes:
- name: config
configMap:
- name: {{ include "influxdb.fullname" . }}
+ name: {{ include "common.fullname.influxdb" . }}
{{- if .Values.initScripts.enabled }}
- name: init
configMap:
- name: {{ include "influxdb.fullname" . }}-init
+ name: {{ include "common.fullname.influxdb" . }}-init
{{- end }}
{{- if (not .Values.persistence.enabled ) }}
- - name: {{ include "influxdb.fullname" . }}-data
+ - name: {{ include "common.fullname.influxdb" . }}-data
emptyDir: {}
{{- end }}
# Cannot use existing claim in enterprise mode
{{- if and .Values.persistence.enabled .Values.persistence.existingClaim (not .Values.enterprise.enabled) }}
- - name: {{ include "influxdb.fullname" . }}-data
+ - name: {{ include "common.fullname.influxdb" . }}-data
persistentVolumeClaim:
claimName: {{ .Values.persistence.existingClaim }}
{{- end }}
{{- if and .Values.persistence.enabled (or (not .Values.persistence.existingClaim) .Values.enterprise.enabled) }}
volumeClaimTemplates:
- metadata:
- name: {{ include "influxdb.fullname" . }}-data
+ name: {{ include "common.fullname.influxdb" . }}-data
annotations:
{{- range $key, $value := .Values.persistence.annotations }}
{{ $key }}: "{{ $value }}"
Code Review / ric-plt / ric-dep.git / commitdiff