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

Release v0.0.5 #205

Merged
merged 3 commits into from
Oct 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
fail-fast: false
matrix:
kube-version:
- "1.22"
- "1.23"
- "1.24"
- "1.25"

steps:

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ The Splunk OpenTelemetry Collector Operator *might* work on versions outside of
|------------|----------------------|
| v0.0.3 | v1.20 to v1.23 |
| v0.0.4 | v1.23 to v1.25 |
| v0.0.5 | v1.23 to v1.25 |

## License

Expand Down
4 changes: 2 additions & 2 deletions apis/otel/v1alpha1/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ processors:
- from: pod
key: splunk.com/index
tag_name: com.splunk.index
labels:
labels:
- key: app
metadata:
metadata:
- k8s.namespace.name
- k8s.node.name
- k8s.pod.name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
capabilities: Basic Install
operators.operatorframework.io/builder: operator-sdk-v1.23.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
name: splunk-otel-collector-operator.v0.0.4
name: splunk-otel-collector-operator.v0.0.5
namespace: splunk-otel-operator-system
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -399,7 +399,7 @@ spec:
- --leader-elect
command:
- /manager
image: jvsplk/splunk-otel-collector-operator:v0.0.4
image: jvsplk/splunk-otel-collector-operator:v0.0.5
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -506,7 +506,7 @@ spec:
provider:
name: Splunk Inc
url: github.com/signalfx/splunk-otel-collector-operator
version: 0.0.4
version: 0.0.5
webhookdefinitions:
- admissionReviewVersions:
- v1
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: jvsplk/splunk-otel-collector-operator
newTag: v0.0.4
newTag: v0.0.5
5 changes: 0 additions & 5 deletions kind-1.22.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions kind-1.25.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
image: kindest/node:v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace
7 changes: 7 additions & 0 deletions tests/e2e/config-injection/01-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ spec:
realm: my-splunk-realm
agent:
enabled: true
resources:
limits:
cpu: 200m
memory: 200Mi
requests:
memory: 100Mi
cpu: 100m
clusterReceiver:
enabled: false
gateway:
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/custom_all/01-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ data:
- from: pod
key: splunk.com/index
tag_name: com.splunk.index
labels:
labels:
- key: app
metadata:
metadata:
- k8s.namespace.name
- k8s.node.name
- k8s.pod.name
Expand Down
49 changes: 24 additions & 25 deletions tests/e2e/custom_all/01-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ spec:
scrapers:
cpu: null
disk: null
filesystem: null
load: null
memory: null
network: null
Expand Down Expand Up @@ -92,30 +91,30 @@ spec:
k8sattributes:
extract:
annotations:
- from: pod
key: splunk.com/sourcetype
- from: namespace
key: splunk.com/exclude
tag_name: splunk.com/exclude
- from: pod
key: splunk.com/exclude
tag_name: splunk.com/exclude
- from: namespace
key: splunk.com/index
tag_name: com.splunk.index
- from: pod
key: splunk.com/index
tag_name: com.splunk.index
labels:
- from: pod
key: splunk.com/sourcetype
- from: namespace
key: splunk.com/exclude
tag_name: splunk.com/exclude
- from: pod
key: splunk.com/exclude
tag_name: splunk.com/exclude
- from: namespace
key: splunk.com/index
tag_name: com.splunk.index
- from: pod
key: splunk.com/index
tag_name: com.splunk.index
labels:
- key: app
metadata:
- k8s.namespace.name
- k8s.node.name
- k8s.pod.name
- k8s.pod.uid
- container.id
- container.image.name
- container.image.tag
metadata:
- k8s.namespace.name
- k8s.node.name
- k8s.pod.name
- k8s.pod.uid
- container.id
- container.image.name
- container.image.tag
filter:
node: '${MY_NODE_NAME}'
batch: null
Expand Down Expand Up @@ -164,7 +163,7 @@ spec:
- jaeger
- zipkin
processors:
- k8s_tagger
- k8sattributes
- batch
- resource
- resourcedetection
Expand Down
12 changes: 6 additions & 6 deletions tests/e2e/smoke-default/01-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ data:
- from: pod
key: splunk.com/index
tag_name: com.splunk.index
labels:
labels:
- key: app
metadata:
metadata:
- k8s.namespace.name
- k8s.node.name
- k8s.pod.name
Expand Down Expand Up @@ -490,17 +490,17 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
- name: SPLUNK_MEMORY_TOTAL_MIB
value: "500"
value: "200"
image: quay.io/signalfx/splunk-otel-collector:0.61.0
imagePullPolicy: IfNotPresent
name: otc-container
resources:
limits:
cpu: 200m
memory: 500Mi
memory: 200Mi
requests:
cpu: 200m
memory: 500Mi
memory: 100Mi
cpu: 100m
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down
10 changes: 9 additions & 1 deletion tests/e2e/smoke-default/01-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,12 @@ metadata:
name: test-default
spec:
clusterName: test-cluster
realm: my-splunk-realm
realm: my-splunk-realm
agent:
resources:
limits:
cpu: 200m
memory: 200Mi
requests:
memory: 100Mi
cpu: 100m
2 changes: 1 addition & 1 deletion versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
splunk-otel-collector=0.61.0

# Represents the current release of the OpenTelemetry Operator.
operator=0.0.4
operator=0.0.5