Skip to content

Commit

Permalink
Remove verbose mode
Browse files Browse the repository at this point in the history
Signed-off-by: Mario Fernandez <mariofer@redhat.com>
  • Loading branch information
marioferh committed Jun 14, 2023
1 parent df96bf8 commit cf6388a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
5 changes: 0 additions & 5 deletions assets/prometheus-k8s/kube-rbac-proxy-secret.yaml
Expand Up @@ -20,9 +20,4 @@ stringData:
"user":
"name": "system:serviceaccount:openshift-monitoring:prometheus-k8s"
"verb": "get"
- "path": "/federate"
"resourceRequest": false
"user":
"name": "system:serviceaccount:openshift-monitoring:telemeter-client"
"verb": "get"
type: Opaque
15 changes: 12 additions & 3 deletions assets/telemeter-client/deployment.yaml
Expand Up @@ -29,18 +29,21 @@ spec:
- /usr/bin/telemeter-client
- --id=$(ID)
- --from=$(FROM)
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
- --from-ca-file=/etc/serving-certs-ca-bundle/service-ca.crt
- --from-token-file=/var/run/secrets/kubernetes.io/serviceaccount/token
- --to=$(TO)
- --to-token-file=/etc/telemeter/token
- --listen=localhost:8080
- --anonymize-salt-file=/etc/telemeter/salt
- --anonymize-labels=$(ANONYMIZE_LABELS)
- --log-level=debug
- -v
env:
- name: ANONYMIZE_LABELS
value: ""
- name: FROM
value: https://prometheus-k8s.openshift-monitoring.svc:9091
value: https://prometheus-k8s.openshift-monitoring.svc:9092
- name: ID
value: ""
- name: TO
Expand All @@ -51,7 +54,7 @@ spec:
value: ""
- name: NO_PROXY
value: ""
image: quay.io/openshift/origin-telemeter:v4.0
image: quay.io/mariofer/origin-telemeter:new_cert_v3
name: telemeter-client
ports:
- containerPort: 8080
Expand All @@ -67,6 +70,9 @@ spec:
- mountPath: /etc/telemeter
name: secret-telemeter-client
readOnly: false
- mountPath: /etc/tls/private
name: federate-client-tls
readOnly: false
- args:
- --reload-url=http://localhost:8080/-/reload
- --watched-dir=/etc/serving-certs-ca-bundle
Expand Down Expand Up @@ -127,3 +133,6 @@ spec:
- configMap:
name: metrics-client-ca
name: metrics-client-ca
- name: federate-client-tls
secret:
secretName: federate-client-certs
1 change: 0 additions & 1 deletion jsonnet/components/prometheus.libsonnet
Expand Up @@ -432,7 +432,6 @@ function(params)
'--client-ca-file=/etc/tls/client/client-ca.crt',
'--tls-cipher-suites=' + cfg.tlsCipherSuites,
'--logtostderr=true',
'--v=10',
],
terminationMessagePolicy: 'FallbackToLogsOnError',
volumeMounts: [
Expand Down

0 comments on commit cf6388a

Please sign in to comment.