Skip to content

Commit

Permalink
Bump Telegraf image to 1.22 (#96)
Browse files Browse the repository at this point in the history 
* Bump Telegraf image to 1.22

Co-authored-by: Pawel Zak <Pawel Zak>
  • Loading branch information
@zak-pawel
zak-pawel authored May 13, 2022
1 parent d0d2b4b commit 0ecfeeb
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
14 changes: 7 additions & 7 deletions handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func Test_podInjector_Handle(t *testing.T) {
Patches: []string{
`{"op":"add","path":"/metadata/creationTimestamp"}`,
`{"op":"add","path":"/spec/containers/0/resources","value":{}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.19","name":"telegraf","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-config"}]}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.22","name":"telegraf","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-config"}]}}`,
`{"op":"add","path":"/spec/volumes","value":[{"name":"telegraf-config","secret":{"secretName":"telegraf-config-simple"}}]}`,
`{"op":"add","path":"/status","value":{}}`,
},
Expand Down Expand Up @@ -377,7 +377,7 @@ func Test_podInjector_Handle(t *testing.T) {
Patches: []string{
`{"op":"add","path":"/metadata/creationTimestamp"}`,
`{"op":"add","path":"/spec/containers/0/resources","value":{}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.19","name":"telegraf","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-config"}]}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.22","name":"telegraf","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-config"}]}}`,
`{"op":"add","path":"/spec/volumes","value":[{"name":"telegraf-config","secret":{"secretName":"telegraf-config-simple"}}]}`,
`{"op":"add","path":"/status","value":{}}`,
},
Expand Down Expand Up @@ -492,7 +492,7 @@ func Test_podInjector_Handle(t *testing.T) {
Patches: []string{
`{"op":"add","path":"/metadata/creationTimestamp"}`,
`{"op":"add","path":"/spec/containers/0/resources","value":{}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.19","name":"telegraf","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-config"}]}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.22","name":"telegraf","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-config"}]}}`,
`{"op":"add","path":"/spec/volumes","value":[{"name":"telegraf-config","secret":{"secretName":"telegraf-config-simple"}}]}`,
`{"op":"add","path":"/status","value":{}}`,
},
Expand Down Expand Up @@ -543,7 +543,7 @@ func Test_podInjector_Handle(t *testing.T) {
Patches: []string{
`{"op":"add","path":"/metadata/creationTimestamp"}`,
`{"op":"add","path":"/spec/containers/0/resources","value":{}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.19","name":"telegraf","resources":{"limits":{"cpu":"750m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-config"}]}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.22","name":"telegraf","resources":{"limits":{"cpu":"750m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-config"}]}}`,
`{"op":"add","path":"/spec/volumes","value":[{"name":"telegraf-config","secret":{"secretName":"telegraf-config-simple"}}]}`,
`{"op":"add","path":"/status","value":{}}`,
},
Expand Down Expand Up @@ -636,7 +636,7 @@ func Test_podInjector_Handle(t *testing.T) {
Patches: []string{
`{"op":"add","path":"/metadata/creationTimestamp"}`,
`{"op":"add","path":"/spec/containers/0/resources","value":{}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.19","name":"telegraf-istio","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-istio-config"}]}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.22","name":"telegraf-istio","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-istio-config"}]}}`,
`{"op":"add","path":"/spec/volumes","value":[{"name":"telegraf-istio-config","secret":{"secretName":"telegraf-istio-config-simple"}}]}`,
`{"op":"add","path":"/status","value":{}}`,
},
Expand Down Expand Up @@ -693,8 +693,8 @@ func Test_podInjector_Handle(t *testing.T) {
Patches: []string{
`{"op":"add","path":"/metadata/creationTimestamp"}`,
`{"op":"add","path":"/spec/containers/0/resources","value":{}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.19","name":"telegraf","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-config"}]}}`,
`{"op":"add","path":"/spec/containers/2","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.19","name":"telegraf-istio","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-istio-config"}]}}`,
`{"op":"add","path":"/spec/containers/1","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.22","name":"telegraf","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-config"}]}}`,
`{"op":"add","path":"/spec/containers/2","value":{"command":["telegraf","--config","/etc/telegraf/telegraf.conf"],"env":[{"name":"NODENAME","valueFrom":{"fieldRef":{"fieldPath":"spec.nodeName"}}}],"image":"docker.io/library/telegraf:1.22","name":"telegraf-istio","resources":{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"10m","memory":"10Mi"}},"volumeMounts":[{"mountPath":"/etc/telegraf","name":"telegraf-istio-config"}]}}`,
`{"op":"add","path":"/spec/volumes","value":[{"name":"telegraf-config","secret":{"secretName":"telegraf-config-simple"}},{"name":"telegraf-istio-config","secret":{"secretName":"telegraf-istio-config-simple"}}]}`,
`{"op":"add","path":"/status","value":{}}`,
},
Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var (
)

const (
defaultTelegrafImage = "docker.io/library/telegraf:1.19"
defaultTelegrafImage = "docker.io/library/telegraf:1.22"
defaultRequestsCPU = "10m"
defaultRequestsMemory = "10Mi"
defaultLimitsCPU = "200m"
Expand Down
28 changes: 14 additions & 14 deletions sidecar_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources:
limits:
Expand Down Expand Up @@ -576,7 +576,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources:
limits:
Expand Down Expand Up @@ -623,7 +623,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources:
limits:
Expand Down Expand Up @@ -670,7 +670,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources:
limits:
Expand Down Expand Up @@ -768,7 +768,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf-istio
resources:
limits:
Expand Down Expand Up @@ -898,7 +898,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources:
limits:
Expand All @@ -919,7 +919,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf-istio
resources:
limits:
Expand Down Expand Up @@ -972,7 +972,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources:
limits:
Expand Down Expand Up @@ -1021,7 +1021,7 @@ spec:
- secretRef:
name: mysecret
optional: true
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources:
limits:
Expand Down Expand Up @@ -1070,7 +1070,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources:
limits:
Expand Down Expand Up @@ -1117,7 +1117,7 @@ spec:
fieldPath: spec.nodeName
- name: STACK_VERSION
value: "1.0"
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources:
limits:
Expand Down Expand Up @@ -1167,7 +1167,7 @@ spec:
configMapKeyRef:
key: application.version
name: configmap-name
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources:
limits:
Expand Down Expand Up @@ -1217,7 +1217,7 @@ spec:
secretKeyRef:
key: user.password
name: app-secret
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources:
limits:
Expand Down Expand Up @@ -1270,7 +1270,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: docker.io/library/telegraf:1.19
image: docker.io/library/telegraf:1.22
name: telegraf
resources: {}
volumeMounts:
Expand Down

0 comments on commit 0ecfeeb

Please sign in to comment.