Add tested Helm chart and configuration files for OpenTelemetry demo services

3 files changed, 137 insertions, 0 deletions

diff --git a/astroshop-helm/ad/templates/_helpers.tpl b/astroshop-helm/ad/templates/_helpers.tpl
new file mode 100644
index 0000000..b6d6510
--- /dev/null
+++ b/astroshop-helm/ad/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "ad.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 "ad.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 "ad.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "ad.labels" -}}
+helm.sh/chart: {{ include "ad.chart" . }}
+{{ include "ad.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "ad.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "ad.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "ad.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "ad.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/astroshop-helm/ad/templates/deployment.yaml b/astroshop-helm/ad/templates/deployment.yaml
new file mode 100644
index 0000000..756b98f
--- /dev/null
+++ b/astroshop-helm/ad/templates/deployment.yaml
@@ -0,0 +1,59 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: {{ .Values.namespace }}
+  name: {{ include "ad.fullname" . }}
+  labels:
+    app.kubernetes.io/component: adservice
+    app.kubernetes.io/part-of: opentelemetry-demo
+    opentelemetry.io/name: {{ .Values.namespace }}-{{ include "ad.fullname" . }}  # Changed this line
+  {{- include "ad.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.opentelemetryDemoAdservice.replicas }}
+  revisionHistoryLimit: {{ .Values.opentelemetryDemoAdservice.revisionHistoryLimit }}
+  selector:
+    matchLabels:
+      opentelemetry.io/name: {{ .Values.namespace }}-{{ include "ad.fullname" . }}  # Changed this line
+    {{- include "ad.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: adservice
+        app.kubernetes.io/instance: opentelemetry-demo
+        app.kubernetes.io/name: {{ .Values.namespace }}-{{ include "ad.fullname" . }}  # Changed this line
+        opentelemetry.io/name: {{ .Values.namespace }}-{{ include "ad.fullname" . }}  # Changed this line
+      {{- include "ad.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+      - env:
+        - name: OTEL_SERVICE_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.labels['app.kubernetes.io/component']
+        - name: OTEL_COLLECTOR_NAME
+          value: {{ quote .Values.opentelemetryDemoAdservice.adservice.env.otelCollectorName }}
+        - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+          value: {{ quote .Values.opentelemetryDemoAdservice.adservice.env.otelExporterOtlpMetricsTemporalityPreference }}
+        - name: AD_PORT
+          value: {{ quote .Values.opentelemetryDemoAdservice.adservice.env.adServicePort }}
+        - name: FLAGD_HOST
+          value: {{ quote .Values.opentelemetryDemoAdservice.adservice.env.flagdHost }}
+        - name: FLAGD_PORT
+          value: {{ quote .Values.opentelemetryDemoAdservice.adservice.env.flagdPort }}
+        - name: OTEL_EXPORTER_OTLP_ENDPOINT
+          value: {{ quote .Values.opentelemetryDemoAdservice.adservice.env.otelExporterOtlpEndpoint }}
+        - name: OTEL_LOGS_EXPORTER
+          value: {{ quote .Values.opentelemetryDemoAdservice.adservice.env.otelLogsExporter }}
+        - name: OTEL_RESOURCE_ATTRIBUTES
+          value: {{ quote .Values.opentelemetryDemoAdservice.adservice.env.otelResourceAttributes }}
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        image: {{ .Values.opentelemetryDemoAdservice.adservice.image.repository }}:{{ .Values.opentelemetryDemoAdservice.adservice.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.opentelemetryDemoAdservice.adservice.imagePullPolicy }}
+        name: adservice
+        ports:
+        - containerPort: 8080
+          name: service
+        resources: {{- toYaml .Values.opentelemetryDemoAdservice.adservice.resources | nindent 10 }}
+      serviceAccountName: {{ .Values.serviceAccount.name }}
diff --git a/astroshop-helm/ad/templates/service.yaml b/astroshop-helm/ad/templates/service.yaml
new file mode 100644
index 0000000..359ee81
--- /dev/null
+++ b/astroshop-helm/ad/templates/service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.namespace }}-{{ include "ad.fullname" . }}
+  labels:
+    app.kubernetes.io/component: adservice
+    app.kubernetes.io/part-of: opentelemetry-demo
+    opentelemetry.io/name: {{ .Values.namespace }}-{{ include "ad.fullname" . }}
+  {{- include "ad.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.opentelemetryDemoAdservice.type }}
+  selector:
+    opentelemetry.io/name: {{ .Values.namespace }}-{{ include "ad.fullname" . }}
+    {{- include "ad.selectorLabels" . | nindent 4 }}
+  ports:
+  {{- .Values.opentelemetryDemoAdservice.ports | toYaml | nindent 2 }}