Skip to content

Commit eb0f29e

Browse files
FrapschenFrapschen
authored
Merge pull request #96 from openinsight-proj/offline_compatibility
[chore] Offline compatibility
2 parents 7ff477a + 6d53602 commit eb0f29e

File tree

11 files changed

+192
-228
lines changed

11 files changed

+192
-228
lines changed

‎charts/opentelemetry-demo-lite/Chart.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ dependencies:
55
- name: redis-operator
66
repository: https://ot-container-kit.github.io/helm-charts
77
version: 0.11.2
8-
digest: sha256:d0beda407f314b68fe2b9706945a3fd6daa2f5246d894383a708bad4edc7521d
9-
generated: "2023-04-10T16:57:36.822397+08:00"
8+
digest: sha256:9816ca8aa77a63026aebe7ca46b785ebf387eed2e9bc1e7c51787a19fb671c0a
9+
generated: "2023-04-20T21:05:43.012917+08:00"

‎charts/opentelemetry-demo-lite/Chart.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
apiVersion: v2
22
name: opentelemetry-demo-lite
33
type: application
4-
version: 0.0.3
4+
version: 0.0.4
5+
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
56
description: A helm chart for openTelemetry community demo application integration with other component(lite version).
67
sources:
78
- https://github.com/openinsight-proj/openinsight-helm-charts
@@ -17,4 +18,4 @@ dependencies:
1718
- name: redis-operator
1819
version: 0.11.2
1920
repository: "https://ot-container-kit.github.io/helm-charts"
20-
condition: redis_operator.enabled
21+
condition: redis-operator.enabled

‎charts/opentelemetry-demo-lite/README_ZH.md‎

Lines changed: 0 additions & 135 deletions
This file was deleted.

‎charts/opentelemetry-demo-lite/templates/_help.tpl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ app.kubernetes.io/instance: {{ .Release.Name }}
2424
redis selector
2525
*/}}
2626
{{- define "redis.addr" -}}
27-
{{- if .Values.redis_resource.enabled -}}
27+
{{- if .Values.extensions.redis.enabled -}}
28+
{{- if .Values.extensions.redis.redisCRResource.enabled -}}
2829
redis-standalone.{{ .Release.Namespace }}.svc.cluster.local:6379
2930
{{- else -}}
3031
{{ include "otel-demo.name" . }}-redis:6379
3132
{{- end }}
3233
{{- end }}
34+
{{- end }}

charts/opentelemetry-demo-lite/templates/cartservice.yaml renamed to charts/opentelemetry-demo-lite/templates/cartservice/cartservice.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
spec:
2828
containers:
2929
- name: cartservice
30-
image: 'ghcr.io/openinsight-proj/demo:v1.3.2-cartservice'
30+
image: "{{ .Values.extensions.cartservice.image.registry }}/{{ .Values.extensions.cartservice.image.repository }}:{{ .Values.extensions.cartservice.image.tag }}"
3131
ports:
3232
- name: service
3333
containerPort: 8080

‎charts/opentelemetry-demo-lite/templates/cartservice/redis.yaml‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
{{- if .Values.extensions.redis.enabled -}}
2+
apiVersion: apps/v1
3+
kind: Deployment
4+
metadata:
5+
name: {{ .Release.Name }}-redis
6+
labels:
7+
opentelemetry.io/name: {{ .Release.Name }}-redis
8+
app.kubernetes.io/instance: {{ .Release.Name }}
9+
app.kubernetes.io/component: redis
10+
app.kubernetes.io/name: {{ .Release.Name }}-redis
11+
spec:
12+
selector:
13+
matchLabels:
14+
app.kubernetes.io/component: redis
15+
app.kubernetes.io/instance: {{ .Release.Name }}
16+
app.kubernetes.io/name: {{ .Release.Name }}-redis
17+
template:
18+
metadata:
19+
labels:
20+
opentelemetry.io/name: {{ .Release.Name }}-redis
21+
app.kubernetes.io/component: redis
22+
app.kubernetes.io/instance: {{ .Release.Name }}
23+
app.kubernetes.io/name: {{ .Release.Name }}-redis
24+
spec:
25+
containers:
26+
- name: redis
27+
image: "{{ .Values.extensions.redis.image.registry }}/{{ .Values.extensions.redis.image.repository }}:{{ .Values.extensions.redis.image.tag }}"
28+
ports:
29+
- containerPort: 6379
30+
name: redis
31+
env:
32+
- name: OTEL_SERVICE_NAME
33+
valueFrom:
34+
fieldRef:
35+
apiVersion: v1
36+
fieldPath: metadata.labels['app.kubernetes.io/component']
37+
- name: OTEL_K8S_NAMESPACE
38+
valueFrom:
39+
fieldRef:
40+
apiVersion: v1
41+
fieldPath: metadata.namespace
42+
- name: OTEL_K8S_NODE_NAME
43+
valueFrom:
44+
fieldRef:
45+
apiVersion: v1
46+
fieldPath: spec.nodeName
47+
- name: OTEL_K8S_POD_NAME
48+
valueFrom:
49+
fieldRef:
50+
apiVersion: v1
51+
fieldPath: metadata.name
52+
- name: OTEL_K8S_POD_UID
53+
valueFrom:
54+
fieldRef:
55+
apiVersion: v1
56+
fieldPath: metadata.uid
57+
- name: OTEL_COLLECTOR_NAME
58+
value: 'my-otel-demo-otelcol'
59+
- name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
60+
value: cumulative
61+
- name: OTEL_RESOURCE_ATTRIBUTES
62+
value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME)
63+
resources:
64+
limits:
65+
memory: 20Mi
66+
---
67+
apiVersion: v1
68+
kind: Service
69+
metadata:
70+
name: {{ .Release.Name }}-redis
71+
labels:
72+
opentelemetry.io/name: {{ .Release.Name }}-redis
73+
app.kubernetes.io/instance: {{ .Release.Name }}
74+
app.kubernetes.io/component: redis
75+
app.kubernetes.io/name: {{ .Release.Name }}-redis
76+
spec:
77+
type: ClusterIP
78+
ports:
79+
- port: 6379
80+
name: redis
81+
targetPort: 6379
82+
selector:
83+
opentelemetry.io/name: {{ .Release.Name }}-redis
84+
{{- if .Values.extensions.redis.redisCRResource.enabled -}}
85+
---
86+
apiVersion: redis.redis.opstreelabs.in/v1beta1
87+
kind: Redis
88+
metadata:
89+
name: redis-standalone
90+
spec:
91+
kubernetesConfig:
92+
image: "{{ .Values.extensions.redisredisCRResource.image.registry }}/{{ .Values.extensions.cartservice.image.repository }}:{{ .Values.extensions.cartservice.image.tag }}"
93+
imagePullPolicy: IfNotPresent
94+
resources:
95+
requests:
96+
cpu: 101m
97+
memory: 128Mi
98+
limits:
99+
cpu: 101m
100+
memory: 128Mi
101+
redisExporter:
102+
enabled: false
103+
image: "{{ .Values.extensions.redisredisCRResource.redisExporterImage.registry }}/{{ .Values.extensions.cartservice.redisExporterImage.repository }}:{{ .Values.extensions.cartservice.redisExporterImage.tag }}"
104+
imagePullPolicy: Always
105+
resources:
106+
requests:
107+
cpu: 100m
108+
memory: 128Mi
109+
limits:
110+
cpu: 100m
111+
memory: 128Mi
112+
readinessProbe:
113+
failureThreshold: 5
114+
initialDelaySeconds: 15
115+
periodSeconds: 15
116+
successThreshold: 1
117+
timeoutSeconds: 5
118+
livenessProbe:
119+
failureThreshold: 5
120+
initialDelaySeconds: 15
121+
periodSeconds: 15
122+
successThreshold: 1
123+
timeoutSeconds: 5
124+
storage:
125+
volumeClaimTemplate:
126+
spec:
127+
storageClassName: default
128+
accessModes: ["ReadWriteOnce"]
129+
resources:
130+
requests:
131+
storage: 1Gi
132+
{{- end }}
133+
{{- end }}

‎charts/opentelemetry-demo-lite/templates/dataservice/dataservice.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
spec:
2626
containers:
2727
- name: dataservice
28-
image: "{{ .Values.extensions.dataservice.image.repository }}:{{ .Values.extensions.dataservice.image.tag | default .Chart.AppVersion }}"
28+
image: "{{ .Values.extensions.dataservice.image.registry }}/{{ .Values.extensions.dataservice.image.repository }}:{{ .Values.extensions.dataservice.image.tag }}"
2929
imagePullPolicy: {{ .Values.extensions.dataservice.image.pullPolicy }}
3030
{{- if .Values.extensions.dataservice.ports }}
3131
ports:

‎charts/opentelemetry-demo-lite/templates/dataservice/mysql.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
app: mysql
3030
spec:
3131
containers:
32-
- image: docker.m.daocloud.io/mysql:8.0.31
32+
- image: '{{ .Values.extensions.mysql.image.registry }}/{{ .Values.extensions.mysql.image.repository }}:{{ .Values.extensions.mysql.image.tag }}'
3333
name: mysql
3434
env:
3535
# Use secret in real usage

‎charts/opentelemetry-demo-lite/templates/frontend-nodeport-svc.yaml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)