Skip to content

Commit aaf580e

Browse files
committed
trying stuff
Signed-off-by: Valentin Daviot <[email protected]>
1 parent d272304 commit aaf580e

File tree

2 files changed

+52
-8
lines changed

2 files changed

+52
-8
lines changed

charts/kube-prometheus-stack/values.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,15 +1172,15 @@ alertmanager:
11721172
clusterAdvertiseAddress: false
11731173

11741174
## clusterGossipInterval determines interval between gossip attempts.
1175-
## Needs to be specified as GoDuration, a time duration that can be parsed by Gos time.ParseDuration() (e.g. 45ms, 30s, 1m, 1h20m15s)
1175+
## Needs to be specified as GoDuration, a time duration that can be parsed by Go's time.ParseDuration() (e.g. 45ms, 30s, 1m, 1h20m15s)
11761176
clusterGossipInterval: ""
11771177

11781178
## clusterPeerTimeout determines timeout for cluster peering.
1179-
## Needs to be specified as GoDuration, a time duration that can be parsed by Gos time.ParseDuration() (e.g. 45ms, 30s, 1m, 1h20m15s)
1179+
## Needs to be specified as GoDuration, a time duration that can be parsed by Go's time.ParseDuration() (e.g. 45ms, 30s, 1m, 1h20m15s)
11801180
clusterPeerTimeout: ""
11811181

11821182
## clusterPushpullInterval determines interval between pushpull attempts.
1183-
## Needs to be specified as GoDuration, a time duration that can be parsed by Gos time.ParseDuration() (e.g. 45ms, 30s, 1m, 1h20m15s)
1183+
## Needs to be specified as GoDuration, a time duration that can be parsed by Go's time.ParseDuration() (e.g. 45ms, 30s, 1m, 1h20m15s)
11841184
clusterPushpullInterval: ""
11851185

11861186
## clusterLabel defines the identifier that uniquely identifies the Alertmanager cluster.
@@ -2911,7 +2911,7 @@ prometheusOperator:
29112911

29122912
# Use certmanager to generate webhook certs
29132913
certManager:
2914-
enabled: false
2914+
enabled: true
29152915
# self-signed root certificate
29162916
rootCert:
29172917
duration: "" # default to be 5y
@@ -3859,9 +3859,9 @@ prometheus:
38593859
disableCompaction: false
38603860

38613861
## AutomountServiceAccountToken indicates whether a service account token should be automatically mounted in the pod,
3862-
## If the field isnt set, the operator mounts the service account token by default.
3862+
## If the field isn't set, the operator mounts the service account token by default.
38633863
## Warning: be aware that by default, Prometheus requires the service account token for Kubernetes service discovery,
3864-
## It is possible to use strategic merge patch to project the service account token into the prometheus container.
3864+
## It is possible to use strategic merge patch to project the service account token into the 'prometheus' container.
38653865
automountServiceAccountToken: true
38663866

38673867
## APIServerConfig
@@ -4567,7 +4567,7 @@ prometheus:
45674567
hostNetwork: false
45684568

45694569
# HostAlias holds the mapping between IP and hostnames that will be injected
4570-
# as an entry in the pods hosts file.
4570+
# as an entry in the pod's hosts file.
45714571
hostAliases: []
45724572
# - ip: 10.10.0.100
45734573
# hostnames:
@@ -4579,7 +4579,7 @@ prometheus:
45794579
tracingConfig: {}
45804580

45814581
## Defines the service discovery role used to discover targets from ServiceMonitor objects and Alertmanager endpoints.
4582-
## If set, the value should be either Endpoints or EndpointSlice. If unset, the operator assumes the Endpoints role.
4582+
## If set, the value should be either "Endpoints" or "EndpointSlice". If unset, the operator assumes the "Endpoints" role.
45834583
serviceDiscoveryRole: ""
45844584

45854585
## Additional configuration which is not covered by the properties above. (passed through tpl)

salt/metalk8s/addons/prometheus-operator/deployed/chart.sls

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75365,6 +75365,50 @@ spec:
7536575365
operator: Exists
7536675366
version: v0.28.1
7536775367
---
75368+
apiVersion: cert-manager.io/v1
75369+
kind: Certificate
75370+
metadata:
75371+
name: prometheus-operator-root-cert
75372+
namespace: metalk8s-monitoring
75373+
spec:
75374+
commonName: ca.webhook.kube-prometheus-stack
75375+
duration: 43800h0m0s
75376+
isCA: true
75377+
issuerRef:
75378+
name: prometheus-operator-self-signed-issuer
75379+
secretName: prometheus-operator-root-cert
75380+
---
75381+
apiVersion: cert-manager.io/v1
75382+
kind: Certificate
75383+
metadata:
75384+
name: prometheus-operator-admission
75385+
namespace: metalk8s-monitoring
75386+
spec:
75387+
dnsNames:
75388+
- prometheus-operator-operator
75389+
- prometheus-operator-operator.metalk8s-monitoring.svc
75390+
duration: 8760h0m0s
75391+
issuerRef:
75392+
name: prometheus-operator-root-issuer
75393+
secretName: prometheus-operator-admission
75394+
---
75395+
apiVersion: cert-manager.io/v1
75396+
kind: Issuer
75397+
metadata:
75398+
name: prometheus-operator-self-signed-issuer
75399+
namespace: metalk8s-monitoring
75400+
spec:
75401+
selfSigned: {}
75402+
---
75403+
apiVersion: cert-manager.io/v1
75404+
kind: Issuer
75405+
metadata:
75406+
name: prometheus-operator-root-issuer
75407+
namespace: metalk8s-monitoring
75408+
spec:
75409+
ca:
75410+
secretName: prometheus-operator-root-cert
75411+
---
7536875412
apiVersion: monitoring.coreos.com/v1
7536975413
kind: Prometheus
7537075414
metadata:

0 commit comments

Comments
 (0)