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
Open

Added values file for demo #3813

Show file tree
Hide file tree
Changes from 5 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 @@ -410,13 +410,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 @@ -436,7 +436,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
2 changes: 1 addition & 1 deletion operations/pyroscope/helm/pyroscope/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: pyroscope
description: 🔥 horizontally-scalable, highly-available, multi-tenant continuous profiling aggregation system
home: https://grafana.com/oss/pyroscope/
type: application
version: 1.11.0
version: 1.11.1
appVersion: 1.11.0
dependencies:
- name: grafana-agent
Expand Down
4 changes: 2 additions & 2 deletions operations/pyroscope/helm/pyroscope/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pyroscope

![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.11.0](https://img.shields.io/badge/AppVersion-1.11.0-informational?style=flat-square)
![Version: 1.11.1](https://img.shields.io/badge/Version-1.11.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.11.0](https://img.shields.io/badge/AppVersion-1.11.0-informational?style=flat-square)

🔥 horizontally-scalable, highly-available, multi-tenant continuous profiling aggregation system

Expand Down Expand Up @@ -94,4 +94,4 @@
| serviceMonitor.tlsConfig | string | `nil` | ServiceMonitor will use these tlsConfig settings to make the health check requests |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1)
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
Copy link
Collaborator

Choose a reason for hiding this comment

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

One last bit to make the linter happy – we should either update the helm-docs version in the makefile or specify it manually here (1.8.1) or just run make helm/docs

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated readme

Loading
Loading