Skip to content

Commit 2ad1e30

Browse files
authored
sourcegraph: remove flaky snapshot tests (#253)
1 parent 6882d45 commit 2ad1e30

File tree

2 files changed

+0
-170
lines changed

2 files changed

+0
-170
lines changed
Lines changed: 0 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
should render service account when frontend.serviceAccount.create=true:
2-
1: |
3-
apiVersion: v1
4-
kind: ServiceAccount
5-
metadata:
6-
labels:
7-
app.kubernetes.io/component: frontend
8-
category: rbac
9-
deploy: sourcegraph
10-
name: sourcegraph-frontend
111
should render service account when openTelemetry.agent.serviceAccount.create is true:
122
1: |
133
apiVersion: v1
@@ -28,160 +18,3 @@ should render service account when openTelemetry.gateway.serviceAccount.create i
2818
category: rbac
2919
deploy: sourcegraph
3020
name: otel-collector
31-
should should reference service account when openTelemetry.agent.serviceAccount.create is true:
32-
1: |
33-
apiVersion: apps/v1
34-
kind: DaemonSet
35-
metadata:
36-
annotations:
37-
description: Forwards telemetry data to the OpenTelemetry Collector Deployment.
38-
labels:
39-
app.kubernetes.io/component: otel-collector
40-
app.kubernetes.io/instance: sourcegraph
41-
app.kubernetes.io/managed-by: Helm
42-
app.kubernetes.io/name: sourcegraph
43-
app.kubernetes.io/version: 4.4.2
44-
deploy: sourcegraph
45-
helm.sh/chart: sourcegraph-4.4.2
46-
name: otel-agent
47-
spec:
48-
minReadySeconds: 5
49-
selector:
50-
matchLabels:
51-
app: otel-agent
52-
app.kubernetes.io/instance: sourcegraph
53-
app.kubernetes.io/name: sourcegraph
54-
template:
55-
metadata:
56-
annotations:
57-
kubectl.kubernetes.io/default-container: otel-agent
58-
labels:
59-
app: otel-agent
60-
app.kubernetes.io/instance: sourcegraph
61-
app.kubernetes.io/name: sourcegraph
62-
deploy: sourcegraph
63-
spec:
64-
affinity: null
65-
containers:
66-
- command:
67-
- /bin/otelcol-sourcegraph
68-
- --config=/etc/otel-agent/config.yaml
69-
env: null
70-
image: index.docker.io/sourcegraph/opentelemetry-collector:4.4.2@sha256:f0723c96c973258ad3123ddc479261bb8f5827bbac1d091b6a683fde55334413
71-
imagePullPolicy: IfNotPresent
72-
livenessProbe:
73-
httpGet:
74-
path: /
75-
port: 13133
76-
name: otel-agent
77-
ports:
78-
- containerPort: 55679
79-
hostPort: 55679
80-
name: zpages
81-
- containerPort: 4317
82-
hostPort: 4317
83-
name: otlp-grpc
84-
- containerPort: 4318
85-
hostPort: 4318
86-
name: otlp-http
87-
readinessProbe:
88-
httpGet:
89-
path: /
90-
port: 13133
91-
resources:
92-
limits:
93-
cpu: 500m
94-
memory: 500Mi
95-
requests:
96-
cpu: 100m
97-
memory: 100Mi
98-
terminationMessagePolicy: FallbackToLogsOnError
99-
volumeMounts:
100-
- mountPath: /etc/otel-agent
101-
name: config
102-
nodeSelector: null
103-
serviceAccountName: otel-agent
104-
terminationGracePeriodSeconds: 120
105-
tolerations: null
106-
volumes:
107-
- configMap:
108-
items:
109-
- key: config.yaml
110-
path: config.yaml
111-
name: otel-agent
112-
name: config
113-
should should reference service account when openTelemetry.gateway.serviceAccount.create is true:
114-
1: |
115-
apiVersion: apps/v1
116-
kind: Deployment
117-
metadata:
118-
annotations:
119-
description: Receives, processes, and exports telemetry data.
120-
labels:
121-
app.kubernetes.io/component: otel-collector
122-
app.kubernetes.io/instance: sourcegraph
123-
app.kubernetes.io/managed-by: Helm
124-
app.kubernetes.io/name: sourcegraph
125-
app.kubernetes.io/version: 4.4.2
126-
deploy: sourcegraph
127-
helm.sh/chart: sourcegraph-4.4.2
128-
name: otel-collector
129-
spec:
130-
minReadySeconds: 5
131-
progressDeadlineSeconds: 120
132-
replicas: 1
133-
selector:
134-
matchLabels:
135-
app: otel-collector
136-
app.kubernetes.io/instance: sourcegraph
137-
app.kubernetes.io/name: sourcegraph
138-
template:
139-
metadata:
140-
annotations:
141-
kubectl.kubernetes.io/default-container: otel-collector
142-
labels:
143-
app: otel-collector
144-
app.kubernetes.io/instance: sourcegraph
145-
app.kubernetes.io/name: sourcegraph
146-
deploy: sourcegraph
147-
spec:
148-
affinity: null
149-
containers:
150-
- command:
151-
- /bin/otelcol-sourcegraph
152-
- --config=/etc/otel-collector/configs/logging.yaml
153-
env: null
154-
image: index.docker.io/sourcegraph/opentelemetry-collector:4.4.2@sha256:f0723c96c973258ad3123ddc479261bb8f5827bbac1d091b6a683fde55334413
155-
imagePullPolicy: IfNotPresent
156-
livenessProbe:
157-
httpGet:
158-
path: /
159-
port: 13133
160-
name: otel-collector
161-
ports:
162-
- containerPort: 55679
163-
name: zpages
164-
- containerPort: 4317
165-
name: otlp-grpc
166-
- containerPort: 4318
167-
name: otlp-http
168-
- containerPort: 8888
169-
name: metrics
170-
readinessProbe:
171-
httpGet:
172-
path: /
173-
port: 13133
174-
resources:
175-
limits:
176-
cpu: "3"
177-
memory: 3Gi
178-
requests:
179-
cpu: "1"
180-
memory: 1Gi
181-
terminationMessagePolicy: FallbackToLogsOnError
182-
volumeMounts: null
183-
nodeSelector: null
184-
serviceAccountName: otel-collector
185-
terminationGracePeriodSeconds: 120
186-
tolerations: null
187-
volumes: null

charts/sourcegraph/tests/serviceAccounts_test.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ tests:
2929
- equal:
3030
path: spec.template.spec.serviceAccountName
3131
value: otel-collector
32-
- matchSnapshot: {}
3332

3433
- it: should render service account when openTelemetry.agent.serviceAccount.create is true
3534
set:
@@ -57,7 +56,6 @@ tests:
5756
- equal:
5857
path: spec.template.spec.serviceAccountName
5958
value: otel-agent
60-
- matchSnapshot: {}
6159

6260
- it: should render service account when frontend.serviceAccount.create=true
6361
set:
@@ -71,4 +69,3 @@ tests:
7169
- equal:
7270
path: metadata.name
7371
value: sourcegraph-frontend
74-
- matchSnapshot: {}

0 commit comments

Comments
 (0)