Skip to content

Commit 666a802

Browse files
FrapschenFrapschen
authored
Merge pull request #99 from openinsight-proj/remove_redis_operator
[chore] Remove redis operator
2 parents 6ae0d85 + 7881444 commit 666a802

File tree

6 files changed

+63
-73
lines changed

6 files changed

+63
-73
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
dependencies:
1+
cdependencies:
22
- name: opentelemetry-demo
33
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
44
version: 0.21.1
5-
- name: redis-operator
6-
repository: https://ot-container-kit.github.io/helm-charts
7-
version: 0.11.2
8-
digest: sha256:9816ca8aa77a63026aebe7ca46b785ebf387eed2e9bc1e7c51787a19fb671c0a
9-
generated: "2023-04-20T21:05:43.012917+08:00"
5+
digest: sha256:b652a9a810b0d0fe25c31859479ce8d58ea77b5d3e4199f5261b9ba0201de15a
6+
generated: "2023-04-21T18:00:31.86846+08:00"

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: opentelemetry-demo-lite
33
type: application
4-
version: 0.0.6
4+
version: 0.0.7
55
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
66
description: A helm chart for openTelemetry community demo application integration with other component(lite version).
77
sources:
@@ -17,8 +17,4 @@ dependencies:
1717
- name: opentelemetry-demo
1818
version: 0.21.1
1919
repository: "https://open-telemetry.github.io/opentelemetry-helm-charts"
20-
condition: opentelemetry-demo.enabled
21-
- name: redis-operator
22-
version: 0.11.2
23-
repository: "https://ot-container-kit.github.io/helm-charts"
24-
condition: redis-operator.enabled
20+
condition: opentelemetry-demo.enabled

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ app.kubernetes.io/instance: {{ .Release.Name }}
2424
redis selector
2525
*/}}
2626
{{- define "redis.addr" -}}
27-
{{- if .Values.extensions.redis.enabled -}}
28-
{{- if .Values.extensions.redis.redisCRResource.enabled -}}
29-
redis-standalone.{{ .Release.Namespace }}.svc.cluster.local:6379
30-
{{- else -}}
27+
28+
{{- if eq .Values.global.middleware.redis.deployBy "builtin" -}}
3129
{{ include "otel-demo.name" . }}-redis:6379
32-
{{- end }}
30+
{{- else -}}
31+
redis-standalone.{{ .Release.Namespace }}.svc.cluster.local:6379
3332
{{- end }}
3433
{{- end }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ spec:
5454
- -c
5555
- until nc -z -v -w30 {{ include "redis.addr" . }}; do echo waiting
5656
for redis; sleep 2; done;
57-
image: docker.m.daocloud.io/busybox:1.36.0
57+
image: "{{ .Values.extensions.cartservice.busyboxImage.registry }}/{{ .Values.extensions.cartservice.busyboxImage.repository }}:{{ .Values.extensions.cartservice.busyboxImage.tag }}"
5858
name: wait-for-redis
5959
resources:
6060
requests:

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

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.extensions.redis.enabled -}}
1+
{{- if eq .Values.global.middleware.redis.deployBy "builtin" -}}
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
@@ -23,50 +23,50 @@ spec:
2323
app.kubernetes.io/name: {{ .Release.Name }}-redis
2424
spec:
2525
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-
requests:
65-
cpu: "0.2"
66-
memory: 100Mi
67-
limits:
68-
cpu: "0.5"
69-
memory: 512Mi
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+
requests:
65+
cpu: "0.2"
66+
memory: 100Mi
67+
limits:
68+
cpu: "0.5"
69+
memory: 512Mi
7070
---
7171
apiVersion: v1
7272
kind: Service
@@ -85,15 +85,15 @@ spec:
8585
targetPort: 6379
8686
selector:
8787
opentelemetry.io/name: {{ .Release.Name }}-redis
88-
{{- if .Values.extensions.redis.redisCRResource.enabled -}}
88+
{{- else }}
8989
---
9090
apiVersion: redis.redis.opstreelabs.in/v1beta1
9191
kind: Redis
9292
metadata:
9393
name: redis-standalone
9494
spec:
9595
kubernetesConfig:
96-
image: "{{ .Values.extensions.redisredisCRResource.image.registry }}/{{ .Values.extensions.cartservice.image.repository }}:{{ .Values.extensions.cartservice.image.tag }}"
96+
image: "{{ .Values.extensions.redis.redisCRResource.image.registry }}/{{ .Values.extensions.redis.redisCRResource.image.repository }}:{{ .Values.extensions.redis.redisCRResource.image.tag }}"
9797
imagePullPolicy: IfNotPresent
9898
resources:
9999
requests:
@@ -104,7 +104,7 @@ spec:
104104
memory: 128Mi
105105
redisExporter:
106106
enabled: false
107-
image: "{{ .Values.extensions.redisredisCRResource.redisExporterImage.registry }}/{{ .Values.extensions.cartservice.redisExporterImage.repository }}:{{ .Values.extensions.cartservice.redisExporterImage.tag }}"
107+
image: "{{ .Values.extensions.redis.redisCRResource.redisExporterImage.registry }}/{{ .Values.extensions.redis.redisCRResource.redisExporterImage.repository }}:{{ .Values.extensions.redis.redisCRResource.redisExporterImage.tag }}"
108108
imagePullPolicy: Always
109109
resources:
110110
requests:
@@ -133,5 +133,4 @@ spec:
133133
resources:
134134
requests:
135135
storage: 1Gi
136-
{{- end }}
137136
{{- end }}

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,10 @@ global:
2323
sentinel:
2424
enabled: true
2525
middleware:
26-
Redis:
26+
redis:
2727
# enum: builtin or redisCR
2828
deployBy: "builtin"
2929

30-
redis-operator:
31-
enabled: false
32-
3330
extensions:
3431
mysql:
3532
enabled: true
@@ -38,9 +35,7 @@ extensions:
3835
repository: mysql
3936
tag: 8.0.31
4037
redis:
41-
enabled: true
4238
redisCRResource:
43-
enabled: false
4439
redisExporterImage:
4540
registry: quay.m.daocloud.io
4641
repository: opstree/redis-exporter
@@ -97,6 +92,10 @@ extensions:
9792
registry: ghcr.io
9893
repository: openinsight-proj/demo
9994
tag: "v1.3.2-cartservice"
95+
busyboxImage:
96+
registry: docker.m.daocloud.io
97+
repository: busybox
98+
tag: "1.36.0"
10099

101100
opentelemetry-demo:
102101
enabled: true

0 commit comments

Comments
 (0)