Skip to content

Commit

Permalink
Merged changes from main
Browse files Browse the repository at this point in the history
  • Loading branch information
sbylica-splunk committed Dec 4, 2023
2 parents 3beef4e + 79312ca commit b5610ea
Show file tree
Hide file tree
Showing 279 changed files with 409 additions and 704 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update_collector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ jobs:
branch: "update-collector"
# The "Skip Changelog" label is applied because the ci_scripts/chloggen-update.sh script
# will automatically add information about the collector when a release is created.
labels: ["Skip Changelog"]
labels: Skip Changelog
base: main
delete-branch: true
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
component: otel-collector-agent
chart: splunk-otel-collector-0.88.0
Expand All @@ -31,7 +31,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 7a5f2fb13129f1d3cba220ba7e9432909aeafe10d805d7d96d4208f0a582e836
checksum/config: 46c8776094c22cf8f60598bb9069910465d828a412b0099b0d290d80dc058b9c
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand All @@ -47,7 +47,7 @@ spec:
key: node-role.kubernetes.io/control-plane
initContainers:
- name: migrate-checkpoint
image: quay.io/signalfx/splunk-otel-collector:0.88.0
image: quay.io/signalfx/splunk-otel-collector:0.89.0
imagePullPolicy: IfNotPresent
command: ["/migratecheckpoint"]
securityContext:
Expand Down Expand Up @@ -120,7 +120,7 @@ spec:
containerPort: 9411
hostPort: 9411
protocol: TCP
image: quay.io/signalfx/splunk-otel-collector:0.88.0
image: quay.io/signalfx/splunk-otel-collector:0.89.0
imagePullPolicy: IfNotPresent
securityContext:
runAsUser: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.88.0
Expand All @@ -30,7 +30,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 4827f2dfe21b0126f00129bf4f2f3ae4d3d7baa8dbc9daeda15a2ad34a7ca1bf
checksum/config: b8db287faad50b645d649c5fcc2d6be4601eae56a2921d5ecc186646505b99b5
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand All @@ -40,7 +40,7 @@ spec:
command:
- /otelcol
- --config=/conf/relay.yaml
image: quay.io/signalfx/splunk-otel-collector:0.88.0
image: quay.io/signalfx/splunk-otel-collector:0.89.0
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
component: otel-collector-agent
chart: splunk-otel-collector-0.88.0
Expand All @@ -31,7 +31,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 80591c9be59a05b98fedadf7f30acf512158b00866e1a985c8a5f1106886bed8
checksum/config: a70bf6c522e43122ba87a20565dc4e59f485bef948eecc71f470f1a7d02671e7
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand All @@ -47,7 +47,7 @@ spec:
key: node-role.kubernetes.io/control-plane
initContainers:
- name: migrate-checkpoint
image: quay.io/signalfx/splunk-otel-collector:0.88.0
image: quay.io/signalfx/splunk-otel-collector:0.89.0
imagePullPolicy: IfNotPresent
command: ["/migratecheckpoint"]
securityContext:
Expand Down Expand Up @@ -120,7 +120,7 @@ spec:
containerPort: 9411
hostPort: 9411
protocol: TCP
image: quay.io/signalfx/splunk-otel-collector:0.88.0
image: quay.io/signalfx/splunk-otel-collector:0.89.0
imagePullPolicy: IfNotPresent
securityContext:
runAsUser: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.88.0
Expand All @@ -30,7 +30,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 4827f2dfe21b0126f00129bf4f2f3ae4d3d7baa8dbc9daeda15a2ad34a7ca1bf
checksum/config: b8db287faad50b645d649c5fcc2d6be4601eae56a2921d5ecc186646505b99b5
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand All @@ -40,7 +40,7 @@ spec:
command:
- /otelcol
- --config=/conf/relay.yaml
image: quay.io/signalfx/splunk-otel-collector:0.88.0
image: quay.io/signalfx/splunk-otel-collector:0.89.0
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
component: otel-collector-agent
chart: splunk-otel-collector-0.88.0
Expand All @@ -31,7 +31,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 15fc9d8627f623127b01a1f03a7590b10acd4a660a00a514eb164e58af3589dd
checksum/config: e38d6e52d26452f6bd1c179d0d01f47f571777e627e145b970ac4e8cd66e3a3e
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down Expand Up @@ -81,7 +81,7 @@ spec:
containerPort: 9411
hostPort: 9411
protocol: TCP
image: quay.io/signalfx/splunk-otel-collector:0.88.0
image: quay.io/signalfx/splunk-otel-collector:0.89.0
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.88.0
Expand All @@ -30,7 +30,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 4827f2dfe21b0126f00129bf4f2f3ae4d3d7baa8dbc9daeda15a2ad34a7ca1bf
checksum/config: b8db287faad50b645d649c5fcc2d6be4601eae56a2921d5ecc186646505b99b5
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand All @@ -40,7 +40,7 @@ spec:
command:
- /otelcol
- --config=/conf/relay.yaml
image: quay.io/signalfx/splunk-otel-collector:0.88.0
image: quay.io/signalfx/splunk-otel-collector:0.89.0
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
2 changes: 1 addition & 1 deletion examples/add-sampler/rendered_manifests/clusterRole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.88.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.88.0"
app.kubernetes.io/version: "0.89.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.88.0
release: default
Expand Down
Loading

0 comments on commit b5610ea

Please sign in to comment.