Skip to content

Commit 3080181

Browse files
committed
remove thanos proxy env
Signed-off-by: Mario Fernandez <[email protected]>
1 parent 3fdf3b9 commit 3080181

File tree

3 files changed

+0
-24
lines changed

3 files changed

+0
-24
lines changed

assets/thanos-ruler/thanos-ruler.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ spec:
2424
key: alertmanagers.yaml
2525
name: thanos-ruler-alertmanagers-config
2626
containers:
27-
- env:
28-
- name: HTTP_PROXY
29-
value: ""
30-
- name: HTTPS_PROXY
31-
value: ""
32-
- name: NO_PROXY
33-
value: ""
34-
name: thanos-ruler
35-
terminationMessagePolicy: FallbackToLogsOnError
3627
- name: thanos-ruler
3728
securityContext:
3829
allowPrivilegeEscalation: false

jsonnet/components/thanos-ruler.libsonnet

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -431,19 +431,6 @@ function(params)
431431
serviceAccountName: tr.config.name,
432432
priorityClassName: 'openshift-user-critical',
433433
containers: [
434-
{
435-
name: 'thanos-ruler',
436-
env: [{
437-
name: 'HTTP_PROXY',
438-
value: '',
439-
}, {
440-
name: 'HTTPS_PROXY',
441-
value: '',
442-
}, {
443-
name: 'NO_PROXY',
444-
value: '',
445-
}],
446-
},
447434
{
448435
// Note: this is performing strategic-merge-patch for thanos-ruler
449436
// container. the rest of the container configuration is managed by

pkg/manifests/amcfg.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,6 @@ func (f *Factory) ConvertToThanosAlertmanagerConfiguration(ta []AdditionalAlertm
196196
result[i] = cfg
197197
}
198198

199-
// todo mariofer proxyURL
200-
201199
return result, nil
202200
}
203201

0 commit comments

Comments
 (0)