Skip to content

Commit b62fda5

Browse files
authored
Helm: Remove misleading annotations for minio (#3752)
* helm: Remove misleading annotations for minion * Minio cannot be profiles without authentication * phlare.grafana.com annotations were invalid for a while Slightly related: #3523 * Rename phlare to pyroscope in some comments
1 parent de17ff2 commit b62fda5

File tree

5 files changed

+5
-14
lines changed

5 files changed

+5
-14
lines changed

operations/pyroscope/helm/pyroscope/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
| alloy | object | `{"alloy":{"clustering":{"enabled":true},"configMap":{"create":false,"name":"alloy-config-pyroscope"},"stabilityLevel":"public-preview"},"controller":{"podAnnotations":{"profiles.grafana.com/cpu.port_name":"http-metrics","profiles.grafana.com/cpu.scrape":"true","profiles.grafana.com/goroutine.port_name":"http-metrics","profiles.grafana.com/goroutine.scrape":"true","profiles.grafana.com/memory.port_name":"http-metrics","profiles.grafana.com/memory.scrape":"true"},"replicas":1,"type":"statefulset"},"enabled":true}` | ----------------------------------- |
2828
| ingress.className | string | `""` | |
2929
| ingress.enabled | bool | `false` | |
30-
| minio | object | `{"buckets":[{"name":"grafana-pyroscope-data","policy":"none","purge":false}],"drivesPerNode":2,"enabled":false,"persistence":{"size":"5Gi"},"podAnnotations":{"phlare.grafana.com/port":"9000","phlare.grafana.com/scrape":"true"},"replicas":1,"resources":{"requests":{"cpu":"100m","memory":"128Mi"}},"rootPassword":"supersecret","rootUser":"grafana-pyroscope"}` | ----------------------------------- |
30+
| minio | object | `{"buckets":[{"name":"grafana-pyroscope-data","policy":"none","purge":false}],"drivesPerNode":2,"enabled":false,"persistence":{"size":"5Gi"},"podAnnotations":{},"replicas":1,"resources":{"requests":{"cpu":"100m","memory":"128Mi"}},"rootPassword":"supersecret","rootUser":"grafana-pyroscope"}` | ----------------------------------- |
3131
| pyroscope.affinity | object | `{}` | |
3232
| pyroscope.cluster_domain | string | `".cluster.local."` | Kubernetes cluster domain suffix for DNS discovery |
3333
| pyroscope.components | object | `{}` | |

operations/pyroscope/helm/pyroscope/rendered/micro-services-hpa.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2713,8 +2713,6 @@ spec:
27132713
annotations:
27142714
checksum/secrets: 2e760de5dbcac8daf468cd56713bca0aac7d7adc4445e2488b352dbb2b529507
27152715
checksum/config: 925d78a7321daaaa06a6dc4ee47dbaf5b8952be192bdbb57f13805ad472ce4e1
2716-
phlare.grafana.com/port: "9000"
2717-
phlare.grafana.com/scrape: "true"
27182716
spec:
27192717
securityContext:
27202718
runAsUser: 1000

operations/pyroscope/helm/pyroscope/rendered/micro-services.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2948,8 +2948,6 @@ spec:
29482948
annotations:
29492949
checksum/secrets: 2e760de5dbcac8daf468cd56713bca0aac7d7adc4445e2488b352dbb2b529507
29502950
checksum/config: 925d78a7321daaaa06a6dc4ee47dbaf5b8952be192bdbb57f13805ad472ce4e1
2951-
phlare.grafana.com/port: "9000"
2952-
phlare.grafana.com/scrape: "true"
29532951
spec:
29542952
securityContext:
29552953
runAsUser: 1000

operations/pyroscope/helm/pyroscope/values.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pyroscope:
115115

116116
## ref: https://kubernetes.io/docs/concepts/storage/persistent-volumes/
117117
## If you set enabled as "True", you need :
118-
## - create a pv which above 10Gi and has same namespace with phlare
118+
## - create a pv which above 10Gi and has same namespace with pyroscope
119119
## - keep storageClassName same with below setting
120120
persistence:
121121
enabled: false
@@ -125,7 +125,7 @@ pyroscope:
125125
annotations: {}
126126
# selector:
127127
# matchLabels:
128-
# app.kubernetes.io/name: phlare
128+
# app.kubernetes.io/name: pyroscope
129129
# subPath: ""
130130
# existingClaim:
131131

@@ -243,9 +243,7 @@ minio:
243243
requests:
244244
cpu: 100m
245245
memory: 128Mi
246-
podAnnotations:
247-
phlare.grafana.com/scrape: "true"
248-
phlare.grafana.com/port: "9000"
246+
podAnnotations: {}
249247

250248
ingress:
251249
enabled: false

operations/pyroscope/jsonnet/values.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,7 @@
6565
"persistence": {
6666
"size": "5Gi"
6767
},
68-
"podAnnotations": {
69-
"phlare.grafana.com/port": "9000",
70-
"phlare.grafana.com/scrape": "true"
71-
},
68+
"podAnnotations": {},
7269
"replicas": 1,
7370
"resources": {
7471
"requests": {

0 commit comments

Comments
 (0)