Skip to content

Added values file for demo #3813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+137 −31
Open

Added values file for demo #3813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb58000
Added values file for demo
xogoodnow Jan 3, 2025
c0bbbb4
Merge branch 'main' into large-small
xogoodnow Jan 3, 2025
8b6b815
ran helm check
xogoodnow Jan 6, 2025
b051e27
Merge branch 'main' into large-small
xogoodnow Jan 6, 2025
83c7e4d
rerun pipeline
xogoodnow Jan 6, 2025
977dc3e
ran helm docs
xogoodnow Jan 8, 2025
d305e89
Merge branch 'main' into large-small
xogoodnow May 7, 2025
3ad1842
Merge branch 'main' into large-small
xogoodnow May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,13 +403,13 @@ helm/check: $(BIN)/kubeconform $(BIN)/helm
$(BIN)/helm template -n default --kube-version "1.23.0" pyroscope-dev ./operations/pyroscope/helm/pyroscope/ \
| tee ./operations/pyroscope/helm/pyroscope/rendered/single-binary.yaml \
| $(BIN)/kubeconform --summary --strict --kubernetes-version 1.23.0
$(BIN)/helm template -n default --kube-version "1.23.0" pyroscope-dev ./operations/pyroscope/helm/pyroscope/ --values operations/pyroscope/helm/pyroscope/values-micro-services.yaml \
$(BIN)/helm template -n default --kube-version "1.23.0" pyroscope-dev ./operations/pyroscope/helm/pyroscope/ --values operations/pyroscope/helm/pyroscope/values-micro-services-small.yaml\
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we replaced the rendered values-micro-services.yaml file, instead of creating a new one for -small. Could you restore the original line here and add a new helm template call for the -small file?

| tee ./operations/pyroscope/helm/pyroscope/rendered/micro-services.yaml \
| $(BIN)/kubeconform --summary --strict --kubernetes-version 1.23.0
$(BIN)/helm template -n default --kube-version "1.23.0" pyroscope-dev ./operations/pyroscope/helm/pyroscope/ --values operations/pyroscope/helm/pyroscope/values-micro-services-hpa.yaml \
| tee ./operations/pyroscope/helm/pyroscope/rendered/micro-services-hpa.yaml \
| $(BIN)/kubeconform --summary --strict --kubernetes-version 1.23.0
cat operations/pyroscope/helm/pyroscope/values-micro-services.yaml \
cat operations/pyroscope/helm/pyroscope/values-micro-services-small.yaml\
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This causes the values of -small to be rendered in the default json (values-micro-services.json). Lets revert this line and add a brand new call that creates a new values-micro-services-small.json from the -small yaml.

| go run ./tools/yaml-to-json \
> ./operations/pyroscope/jsonnet/values-micro-services.json
cat operations/pyroscope/helm/pyroscope/values-micro-services-hpa.yaml \
Expand All @@ -429,7 +429,7 @@ deploy: $(BIN)/kind $(BIN)/helm docker-image/pyroscope/build
deploy-micro-services: $(BIN)/kind $(BIN)/helm docker-image/pyroscope/build
# Ensure to delete existing service, that has been created manually by the deploy target
kubectl delete svc --field-selector metadata.name=pyroscope-micro-services-query-frontend -l app.kubernetes.io/managed-by!=Helm || true
$(call deploy,pyroscope-micro-services,--values=operations/pyroscope/helm/pyroscope/values-micro-services.yaml --set pyroscope.components.querier.resources=null --set pyroscope.components.distributor.resources=null --set pyroscope.components.ingester.resources=null --set pyroscope.components.store-gateway.resources=null --set pyroscope.components.compactor.resources=null)
$(call deploy,pyroscope-micro-services,--values=operations/pyroscope/helm/pyroscope/values-micro-services-small.yaml--set pyroscope.components.querier.resources=null --set pyroscope.components.distributor.resources=null --set pyroscope.components.ingester.resources=null --set pyroscope.components.store-gateway.resources=null --set pyroscope.components.compactor.resources=null)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like we are missing a space here before the first --set


.PHONY: deploy-monitoring
deploy-monitoring: $(BIN)/tk $(BIN)/kind tools/monitoring/environments/default/spec.json
Expand Down
28 changes: 14 additions & 14 deletions operations/pyroscope/helm/pyroscope/rendered/micro-services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2279,10 +2279,10 @@ spec:
mountPath: /data
resources:
limits:
memory: 4Gi
memory: 1Gi
requests:
cpu: 0.1
memory: 16Mi
cpu: 100m
memory: 256Mi
volumes:
- name: config
configMap:
Expand Down Expand Up @@ -2796,8 +2796,8 @@ spec:
limits:
memory: 4Gi
requests:
cpu: 0.1
memory: 16Mi
cpu: 100m
memory: 256Mi
volumes:
- name: config
configMap:
Expand Down Expand Up @@ -3086,10 +3086,10 @@ spec:
subPath: compactor
resources:
limits:
memory: 16Gi
memory: 2Gi
requests:
cpu: 1
memory: 8Gi
cpu: 200m
memory: 512Mi
terminationGracePeriodSeconds: 1200
volumes:
- name: config
Expand Down Expand Up @@ -3192,10 +3192,10 @@ spec:
mountPath: /data
resources:
limits:
memory: 16Gi
memory: 2Gi
requests:
cpu: 1
memory: 8Gi
cpu: 200m
memory: 512Mi
terminationGracePeriodSeconds: 600
volumes:
- name: config
Expand Down Expand Up @@ -3299,10 +3299,10 @@ spec:
mountPath: /data
resources:
limits:
memory: 16Gi
memory: 2Gi
requests:
cpu: 1
memory: 8Gi
cpu: 200m
memory: 512Mi
volumes:
- name: config
configMap:
Expand Down
106 changes: 106 additions & 0 deletions operations/pyroscope/helm/pyroscope/values-micro-services-small.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
# Default values for pyroscope.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

pyroscope:
extraArgs:
store-gateway.sharding-ring.replication-factor: "3"
components:
querier:
kind: Deployment
replicaCount: 3
resources:
limits:
memory: 1Gi
requests:
memory: 256Mi
cpu: 1
query-frontend:
kind: Deployment
replicaCount: 2
resources:
limits:
memory: 1Gi
requests:
memory: 256Mi
cpu: 100m
query-scheduler:
kind: Deployment
replicaCount: 2
resources:
limits:
memory: 1Gi
requests:
memory: 256Mi
cpu: 100m
distributor:
kind: Deployment
replicaCount: 2
resources:
limits:
memory: 1Gi
requests:
memory: 256Mi
cpu: 500m
ingester:
kind: StatefulSet
replicaCount: 3
terminationGracePeriodSeconds: 600
resources:
limits:
memory: 2Gi
requests:
memory: 512Mi
cpu: 200m
compactor:
kind: StatefulSet
replicaCount: 3
terminationGracePeriodSeconds: 1200
persistence:
enabled: false
resources:
limits:
memory: 2Gi
requests:
memory: 512Mi
cpu: 200m
store-gateway:
kind: StatefulSet
replicaCount: 3
persistence:
# The store-gateway needs not need persistent storage, but we still run it as a StatefulSet
# This is to avoid having blocks of data being
enabled: false
resources:
limits:
memory: 2Gi
requests:
memory: 512Mi
cpu: 200m
readinessProbe:
# The store gateway can be configured to wait on startup for ring stability to be reached before it becomes
# ready. See the `store-gateway.sharding-ring.wait-stability-min-duration` server argument for more information.
#
# Depending on this flag and the number of tenants + blocks that need to be synced on startup, pods can take
# some time to become ready. This value can be used to ensure Kubernetes waits long enough and reduce errors.
initialDelaySeconds: 60
tenant-settings:
kind: Deployment
replicaCount: 1
resources:
limits:
memory: 4Gi
requests:
memory: 256Mi
cpu: 100m
ad-hoc-profiles:
kind: Deployment
replicaCount: 1
resources:
limits:
memory: 1Gi
requests:
memory: 256Mi
cpu: 100m
minio:
enabled: true
28 changes: 14 additions & 14 deletions operations/pyroscope/jsonnet/values-micro-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"replicaCount": 1,
"resources": {
"limits": {
"memory": "4Gi"
"memory": "1Gi"
},
"requests": {
"cpu": 0.1,
"memory": "16Mi"
"cpu": "100m",
"memory": "256Mi"
}
}
},
Expand All @@ -25,11 +25,11 @@
"replicaCount": 3,
"resources": {
"limits": {
"memory": "16Gi"
"memory": "2Gi"
},
"requests": {
"cpu": 1,
"memory": "8Gi"
"cpu": "200m",
"memory": "512Mi"
}
},
"terminationGracePeriodSeconds": 1200
Expand All @@ -52,11 +52,11 @@
"replicaCount": 3,
"resources": {
"limits": {
"memory": "16Gi"
"memory": "2Gi"
},
"requests": {
"cpu": 1,
"memory": "8Gi"
"cpu": "200m",
"memory": "512Mi"
}
},
"terminationGracePeriodSeconds": 600
Expand Down Expand Up @@ -111,11 +111,11 @@
"replicaCount": 3,
"resources": {
"limits": {
"memory": "16Gi"
"memory": "2Gi"
},
"requests": {
"cpu": 1,
"memory": "8Gi"
"cpu": "200m",
"memory": "512Mi"
}
}
},
Expand All @@ -127,8 +127,8 @@
"memory": "4Gi"
},
"requests": {
"cpu": 0.1,
"memory": "16Mi"
"cpu": "100m",
"memory": "256Mi"
}
}
}
Expand Down