Skip to content

Commit 0a1459b

Browse files
hvaghani221hvaghani221
authored
1.5.0 (#798)
1 parent 561dff0 commit 0a1459b

File tree

65 files changed

+348
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+348
-113
lines changed

‎PLUGIN_VERSIONS.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
FLUENTD_HEC_VERSION=1.2.13
3-
K8S_METRICS_VERISION=1.1.12
4-
K8S_METRICS_AGGR_VERSION=1.1.12
5-
KUBE_OBJECT_VERSION=1.1.12
2+
FLUENTD_HEC_VERSION=1.3.0
3+
K8S_METRICS_VERISION=1.2.0
4+
K8S_METRICS_AGGR_VERSION=1.2.0
5+
KUBE_OBJECT_VERSION=1.2.0

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.15
1+
1.5.0

‎ci_scripts/deploy_connector.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ else
99
helm delete $(helm ls --short)
1010
fi
1111
echo "Deploying k8s-connect with latest changes"
12-
helm install ci-sck --set global.splunk.hec.token=$CI_SPLUNK_HEC_TOKEN \
12+
helm install --create-namespace ci-sck --set global.splunk.hec.token=$CI_SPLUNK_HEC_TOKEN \
1313
--set global.splunk.hec.host=$CI_SPLUNK_HOST \
1414
--set kubelet.serviceMonitor.https=true \
1515
-f ci_scripts/sck_values.yml helm-artifacts/splunk-connect-for-kubernetes*.tgz
1616
#wait for deployment to finish
1717
# 2 logging, 2 metrics, 1 aggregator, 1 object
1818
until kubectl get pod | grep Running | [[ $(wc -l) == 7 ]]; do
1919
sleep 5;
20-
done
20+
done

‎docs/index.yaml‎

Lines changed: 53 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,48 @@
11
apiVersion: v1
22
entries:
33
splunk-connect-for-kubernetes:
4+
- apiVersion: v1
5+
appVersion: 1.5.0
6+
created: "2022-08-16T18:44:10.203682+05:30"
7+
dependencies:
8+
- condition: splunk-kubernetes-logging.enabled
9+
name: splunk-kubernetes-logging
10+
repository: https://splunk.github.io/splunk-connect-for-kubernetes/
11+
version: 1.5.0
12+
- condition: splunk-kubernetes-objects.enabled
13+
name: splunk-kubernetes-objects
14+
repository: https://splunk.github.io/splunk-connect-for-kubernetes/
15+
version: 1.5.0
16+
- condition: splunk-kubernetes-metrics.enabled
17+
name: splunk-kubernetes-metrics
18+
repository: https://splunk.github.io/splunk-connect-for-kubernetes/
19+
version: 1.5.0
20+
description: Collect logs, objects (metadata), and metrics with Splunk.
21+
digest: 1fc36d19f98ae62b5400f3f4cb3e015bd9022021aa95c40227e9c560991cd83d
22+
home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/main/helm-chart
23+
keywords:
24+
- splunk
25+
- monitoring
26+
- logging
27+
- metrics
28+
- metadata
29+
- objects
30+
maintainers:
31+
- email: DataEdge@splunk.com
32+
name: Splunk Inc.
33+
name: splunk-connect-for-kubernetes
34+
sources:
35+
- https://github.com/splunk/splunk-connect-for-kubernetes/tree/main/helm-chart
36+
- https://github.com/splunk/fluent-plugin-splunk-hec
37+
- https://github.com/splunk/fluent-plugin-kubernetes-metrics
38+
- https://github.com/splunk/fluent-plugin-k8s-metrics-agg
39+
- https://github.com/splunk/fluent-plugin-kubernetes-objects
40+
urls:
41+
- splunk-connect-for-kubernetes-1.5.0.tgz
42+
version: 1.5.0
443
- apiVersion: v1
544
appVersion: 1.4.15
6-
created: "2022-04-29T15:32:19.048979+05:30"
45+
created: "2022-08-16T18:44:10.129152+05:30"
746
dependencies:
847
- condition: splunk-kubernetes-logging.enabled
948
name: splunk-kubernetes-logging
@@ -42,7 +81,7 @@ entries:
4281
version: 1.4.15
4382
- apiVersion: v1
4483
appVersion: 1.4.14
45-
created: "2022-04-29T15:32:19.042004+05:30"
84+
created: "2022-08-16T18:44:10.122055+05:30"
4685
dependencies:
4786
- condition: splunk-kubernetes-logging.enabled
4887
name: splunk-kubernetes-logging
@@ -81,7 +120,7 @@ entries:
81120
version: 1.4.14
82121
- apiVersion: v1
83122
appVersion: 1.4.13
84-
created: "2022-04-29T15:32:19.036166+05:30"
123+
created: "2022-08-16T18:44:10.114754+05:30"
85124
dependencies:
86125
- condition: splunk-kubernetes-logging.enabled
87126
name: splunk-kubernetes-logging
@@ -120,7 +159,7 @@ entries:
120159
version: 1.4.13
121160
- apiVersion: v1
122161
appVersion: 1.4.12
123-
created: "2022-04-29T15:32:19.028495+05:30"
162+
created: "2022-08-16T18:44:10.108047+05:30"
124163
dependencies:
125164
- condition: splunk-kubernetes-logging.enabled
126165
name: splunk-kubernetes-logging
@@ -159,7 +198,7 @@ entries:
159198
version: 1.4.12
160199
- apiVersion: v1
161200
appVersion: 1.4.11
162-
created: "2022-04-29T15:32:19.021086+05:30"
201+
created: "2022-08-16T18:44:10.08817+05:30"
163202
dependencies:
164203
- condition: splunk-kubernetes-logging.enabled
165204
name: splunk-kubernetes-logging
@@ -198,7 +237,7 @@ entries:
198237
version: 1.4.11
199238
- apiVersion: v1
200239
appVersion: 1.4.10
201-
created: "2022-04-29T15:32:19.011303+05:30"
240+
created: "2022-08-16T18:44:10.044157+05:30"
202241
dependencies:
203242
- condition: splunk-kubernetes-logging.enabled
204243
name: splunk-kubernetes-logging
@@ -237,7 +276,7 @@ entries:
237276
version: 1.4.10
238277
- apiVersion: v1
239278
appVersion: 1.4.9
240-
created: "2022-04-29T15:32:19.091094+05:30"
279+
created: "2022-08-16T18:44:10.197987+05:30"
241280
dependencies:
242281
- condition: splunk-kubernetes-logging.enabled
243282
name: splunk-kubernetes-logging
@@ -276,7 +315,7 @@ entries:
276315
version: 1.4.9
277316
- apiVersion: v1
278317
appVersion: 1.4.8
279-
created: "2022-04-29T15:32:19.085369+05:30"
318+
created: "2022-08-16T18:44:10.191822+05:30"
280319
dependencies:
281320
- condition: splunk-kubernetes-logging.enabled
282321
name: splunk-kubernetes-logging
@@ -315,7 +354,7 @@ entries:
315354
version: 1.4.8
316355
- apiVersion: v1
317356
appVersion: 1.4.7
318-
created: "2022-04-29T15:32:19.080154+05:30"
357+
created: "2022-08-16T18:44:10.185504+05:30"
319358
dependencies:
320359
- condition: splunk-kubernetes-logging.enabled
321360
name: splunk-kubernetes-logging
@@ -354,7 +393,7 @@ entries:
354393
version: 1.4.7
355394
- apiVersion: v1
356395
appVersion: 1.4.6
357-
created: "2022-04-29T15:32:19.074159+05:30"
396+
created: "2022-08-16T18:44:10.165633+05:30"
358397
dependencies:
359398
- condition: splunk-kubernetes-logging.enabled
360399
name: splunk-kubernetes-logging
@@ -393,7 +432,7 @@ entries:
393432
version: 1.4.6
394433
- apiVersion: v1
395434
appVersion: 1.4.5
396-
created: "2022-04-29T15:32:19.067809+05:30"
435+
created: "2022-08-16T18:44:10.146481+05:30"
397436
dependencies:
398437
- condition: splunk-kubernetes-logging.enabled
399438
name: splunk-kubernetes-logging
@@ -432,7 +471,7 @@ entries:
432471
version: 1.4.5
433472
- apiVersion: v1
434473
appVersion: 1.4.4
435-
created: "2022-04-29T15:32:19.061272+05:30"
474+
created: "2022-08-16T18:44:10.140971+05:30"
436475
dependencies:
437476
- condition: splunk-kubernetes-logging.enabled
438477
name: splunk-kubernetes-logging
@@ -471,7 +510,7 @@ entries:
471510
version: 1.4.4
472511
- apiVersion: v1
473512
appVersion: 1.4.3
474-
created: "2022-04-29T15:32:19.054386+05:30"
513+
created: "2022-08-16T18:44:10.134822+05:30"
475514
dependencies:
476515
- condition: splunk-kubernetes-logging.enabled
477516
name: splunk-kubernetes-logging
@@ -508,4 +547,4 @@ entries:
508547
urls:
509548
- splunk-connect-for-kubernetes-1.4.3.tgz
510549
version: 1.4.3
511-
generated: "2022-04-29T15:32:19.00179+05:30"
550+
generated: "2022-08-16T18:44:09.998934+05:30"

‎docs/splunk-connect-for-kubernetes-1.5.0.tgz‎

48.3 KB
Binary file not shown.

‎helm-chart/splunk-connect-for-kubernetes/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: splunk-connect-for-kubernetes
3-
version: 1.4.15
4-
appVersion: 1.4.15
3+
version: 1.5.0
4+
appVersion: 1.5.0
55
description: Collect logs, objects (metadata), and metrics with Splunk.
66
home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/main/helm-chart
77
sources:

‎helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
2-
version: 1.4.15
3-
appVersion: 1.4.15
2+
version: 1.5.0
3+
appVersion: 1.5.0
44
name: splunk-kubernetes-logging
55
description: Collect logs with Splunk.
66
home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/main/helm-chart/charts/splunk-kubernetes-logging

‎helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/_helpers.tpl‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,17 @@ Create chart name and version as used by the chart label.
3131
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
3232
{{- end -}}
3333

34+
{{/*
35+
Get namespace to deploy to.
36+
*/}}
37+
{{- define "splunk-kubernetes-logging.namespace" -}}
38+
{{- if .Values.namespace -}}
39+
{{- .Values.namespace -}}
40+
{{- else -}}
41+
{{- .Release.Namespace -}}
42+
{{- end -}}
43+
{{- end -}}
44+
3445
{{/*
3546
Create chart name and version as used by the chart label.
3647
*/}}
@@ -155,8 +166,12 @@ Create the name of the service account to use
155166
Create the image name
156167
*/}}
157168
{{- define "splunk-kubernetes-logging.image" -}}
169+
{{- if contains .Values.image.tag "sha256" -}}
170+
{{- printf "%s/%s@%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
171+
{{- else -}}
158172
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
159173
{{- end -}}
174+
{{- end -}}
160175

161176
{{/* evaluate field consume_chunk_on_4xx_errors */}}
162177
{{- define "splunk-kubernetes-logging.should_consume_chunk_on_4xx_errors" -}}
@@ -167,4 +182,4 @@ Create the image name
167182
{{- else -}}
168183
{{- print true -}}
169184
{{- end -}}
170-
{{- end -}}
185+
{{- end -}}

‎helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/configMap.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: v1
22
kind: ConfigMap
33
metadata:
44
name: {{ template "splunk-kubernetes-logging.fullname" . }}
5+
namespace: {{ template "splunk-kubernetes-logging.namespace" . }}
56
labels:
67
app: {{ template "splunk-kubernetes-logging.name" . }}
78
chart: {{ template "splunk-kubernetes-logging.chart" . }}
@@ -383,6 +384,9 @@ data:
383384
{{- with or .Values.splunk.hec.port .Values.global.splunk.hec.port }}
384385
hec_port {{ . }}
385386
{{- end }}
387+
{{- with or .Values.splunk.hec.gzip_compression .Values.global.splunk.hec.gzip_compression }}
388+
gzip_compression {{ . }}
389+
{{- end }}
386390
hec_token "#{ENV['SPLUNK_HEC_TOKEN']}"
387391
index_key splunk_index
388392
insecure_ssl {{ or .Values.splunk.hec.insecureSSL .Values.global.splunk.hec.insecureSSL | default false }}

‎helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/daemonset.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apps/v1
22
kind: DaemonSet
33
metadata:
44
name: {{ template "splunk-kubernetes-logging.fullname" . }}
5+
namespace: {{ template "splunk-kubernetes-logging.namespace" . }}
56
labels:
67
app: {{ template "splunk-kubernetes-logging.name" . }}
78
chart: {{ template "splunk-kubernetes-logging.chart" . }}
@@ -14,6 +15,10 @@ metadata:
1415
spec:
1516
updateStrategy:
1617
type: RollingUpdate
18+
{{- if .Values.rollingUpdate }}
19+
rollingUpdate:
20+
{{ toYaml .Values.rollingUpdate | indent 6 }}
21+
{{- end }}
1722
selector:
1823
matchLabels:
1924
app: {{ template "splunk-kubernetes-logging.name" . }}

0 commit comments

Comments
 (0)