Skip to content
This repository was archived by the owner on Oct 11, 2024. It is now read-only.

Commit 4ef5f95

Browse files
jvoravongjvoravong
authored
Release v0.0.5 (#205)
* Update the e2e tests so they run successfully * Update the used Kubernetes versions to match the supported versions for the next release * release v0.0.5
1 parent ecc1714 commit 4ef5f95

File tree

13 files changed

+62
-47
lines changed

13 files changed

+62
-47
lines changed

‎.github/workflows/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
kube-version:
16-
- "1.22"
1716
- "1.23"
1817
- "1.24"
18+
- "1.25"
1919

2020
steps:
2121

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ The Splunk OpenTelemetry Collector Operator *might* work on versions outside of
143143
|------------|----------------------|
144144
| v0.0.3 | v1.20 to v1.23 |
145145
| v0.0.4 | v1.23 to v1.25 |
146+
| v0.0.5 | v1.23 to v1.25 |
146147

147148
## License
148149

‎apis/otel/v1alpha1/defaults.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ processors:
136136
- from: pod
137137
key: splunk.com/index
138138
tag_name: com.splunk.index
139-
labels:
139+
labels:
140140
- key: app
141-
metadata:
141+
metadata:
142142
- k8s.namespace.name
143143
- k8s.node.name
144144
- k8s.pod.name

‎bundle/manifests/splunk-otel-collector-operator.clusterserviceversion.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ metadata:
1616
capabilities: Basic Install
1717
operators.operatorframework.io/builder: operator-sdk-v1.23.0
1818
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
19-
name: splunk-otel-collector-operator.v0.0.4
19+
name: splunk-otel-collector-operator.v0.0.5
2020
namespace: splunk-otel-operator-system
2121
spec:
2222
apiservicedefinitions: {}
@@ -399,7 +399,7 @@ spec:
399399
- --leader-elect
400400
command:
401401
- /manager
402-
image: jvsplk/splunk-otel-collector-operator:v0.0.4
402+
image: jvsplk/splunk-otel-collector-operator:v0.0.5
403403
livenessProbe:
404404
httpGet:
405405
path: /healthz
@@ -506,7 +506,7 @@ spec:
506506
provider:
507507
name: Splunk Inc
508508
url: github.com/signalfx/splunk-otel-collector-operator
509-
version: 0.0.4
509+
version: 0.0.5
510510
webhookdefinitions:
511511
- admissionReviewVersions:
512512
- v1

‎config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ kind: Kustomization
1313
images:
1414
- name: controller
1515
newName: jvsplk/splunk-otel-collector-operator
16-
newTag: v0.0.4
16+
newTag: v0.0.5

‎kind-1.22.yaml

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

‎kind-1.25.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
kind: Cluster
2+
apiVersion: kind.x-k8s.io/v1alpha4
3+
nodes:
4+
- role: control-plane
5+
image: kindest/node:v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace

‎tests/e2e/config-injection/01-install.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ spec:
77
realm: my-splunk-realm
88
agent:
99
enabled: true
10+
resources:
11+
limits:
12+
cpu: 200m
13+
memory: 200Mi
14+
requests:
15+
memory: 100Mi
16+
cpu: 100m
1017
clusterReceiver:
1118
enabled: false
1219
gateway:

‎tests/e2e/custom_all/01-assert.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ data:
104104
- from: pod
105105
key: splunk.com/index
106106
tag_name: com.splunk.index
107-
labels:
107+
labels:
108108
- key: app
109-
metadata:
109+
metadata:
110110
- k8s.namespace.name
111111
- k8s.node.name
112112
- k8s.pod.name

‎tests/e2e/custom_all/01-install.yaml

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ spec:
4545
scrapers:
4646
cpu: null
4747
disk: null
48-
filesystem: null
4948
load: null
5049
memory: null
5150
network: null
@@ -92,30 +91,30 @@ spec:
9291
k8sattributes:
9392
extract:
9493
annotations:
95-
- from: pod
96-
key: splunk.com/sourcetype
97-
- from: namespace
98-
key: splunk.com/exclude
99-
tag_name: splunk.com/exclude
100-
- from: pod
101-
key: splunk.com/exclude
102-
tag_name: splunk.com/exclude
103-
- from: namespace
104-
key: splunk.com/index
105-
tag_name: com.splunk.index
106-
- from: pod
107-
key: splunk.com/index
108-
tag_name: com.splunk.index
109-
labels:
94+
- from: pod
95+
key: splunk.com/sourcetype
96+
- from: namespace
97+
key: splunk.com/exclude
98+
tag_name: splunk.com/exclude
99+
- from: pod
100+
key: splunk.com/exclude
101+
tag_name: splunk.com/exclude
102+
- from: namespace
103+
key: splunk.com/index
104+
tag_name: com.splunk.index
105+
- from: pod
106+
key: splunk.com/index
107+
tag_name: com.splunk.index
108+
labels:
110109
- key: app
111-
metadata:
112-
- k8s.namespace.name
113-
- k8s.node.name
114-
- k8s.pod.name
115-
- k8s.pod.uid
116-
- container.id
117-
- container.image.name
118-
- container.image.tag
110+
metadata:
111+
- k8s.namespace.name
112+
- k8s.node.name
113+
- k8s.pod.name
114+
- k8s.pod.uid
115+
- container.id
116+
- container.image.name
117+
- container.image.tag
119118
filter:
120119
node: '${MY_NODE_NAME}'
121120
batch: null
@@ -164,7 +163,7 @@ spec:
164163
- jaeger
165164
- zipkin
166165
processors:
167-
- k8s_tagger
166+
- k8sattributes
168167
- batch
169168
- resource
170169
- resourcedetection

‎tests/e2e/smoke-default/01-assert.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ data:
111111
- from: pod
112112
key: splunk.com/index
113113
tag_name: com.splunk.index
114-
labels:
114+
labels:
115115
- key: app
116-
metadata:
116+
metadata:
117117
- k8s.namespace.name
118118
- k8s.node.name
119119
- k8s.pod.name
@@ -490,17 +490,17 @@ spec:
490490
apiVersion: v1
491491
fieldPath: metadata.namespace
492492
- name: SPLUNK_MEMORY_TOTAL_MIB
493-
value: "500"
493+
value: "200"
494494
image: quay.io/signalfx/splunk-otel-collector:0.61.0
495495
imagePullPolicy: IfNotPresent
496496
name: otc-container
497497
resources:
498498
limits:
499499
cpu: 200m
500-
memory: 500Mi
500+
memory: 200Mi
501501
requests:
502-
cpu: 200m
503-
memory: 500Mi
502+
memory: 100Mi
503+
cpu: 100m
504504
terminationMessagePath: /dev/termination-log
505505
terminationMessagePolicy: File
506506
volumeMounts:

‎tests/e2e/smoke-default/01-install.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,12 @@ metadata:
44
name: test-default
55
spec:
66
clusterName: test-cluster
7-
realm: my-splunk-realm
7+
realm: my-splunk-realm
8+
agent:
9+
resources:
10+
limits:
11+
cpu: 200m
12+
memory: 200Mi
13+
requests:
14+
memory: 100Mi
15+
cpu: 100m

‎versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
splunk-otel-collector=0.61.0
66

77
# Represents the current release of the OpenTelemetry Operator.
8-
operator=0.0.4
8+
operator=0.0.5

0 commit comments

Comments
 (0)