Skip to content

Commit aac2a88

Browse files
simonswinesimonswine
authored
chore: Deploy tenant-settings and adhoc-profiles microservices (#3417)
* chore: Deploy tenant-settings and adhoc-profiles microservices They were so far not exposed in the values.yaml Also adding them to ingress routes * Do not run the super linter recursively * Switch from StatefulSet to Deployment
1 parent a9ae4a9 commit aac2a88

File tree

5 files changed

+399
-1
lines changed

5 files changed

+399
-1
lines changed

Diff for: ‎.github/workflows/helm-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
call-lint:
77
uses: grafana/helm-charts/.github/workflows/linter.yml@main
88
with:
9-
filter_regex_include: .*operations/pyroscope/helm/.*
9+
filter_regex_include: operations/pyroscope/helm/pyroscope/templates/.*
1010

1111
call-lint-test:
1212
uses: grafana/helm-charts/.github/workflows/lint-test.yaml@main

Diff for: ‎operations/pyroscope/helm/pyroscope/rendered/micro-services.yaml

+332
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@
22
# Source: pyroscope/templates/deployments-statefulsets.yaml
33
apiVersion: policy/v1
44
kind: PodDisruptionBudget
5+
metadata:
6+
name: pyroscope-dev-ad-hoc-profiles
7+
namespace: default
8+
labels:
9+
helm.sh/chart: pyroscope-1.6.1
10+
app.kubernetes.io/name: pyroscope
11+
app.kubernetes.io/instance: pyroscope-dev
12+
app.kubernetes.io/version: "1.6.1"
13+
app.kubernetes.io/managed-by: Helm
14+
app.kubernetes.io/component: "ad-hoc-profiles"
15+
spec:
16+
maxUnavailable: 1
17+
selector:
18+
matchLabels:
19+
app.kubernetes.io/name: pyroscope
20+
app.kubernetes.io/instance: pyroscope-dev
21+
app.kubernetes.io/component: "ad-hoc-profiles"
22+
---
23+
# Source: pyroscope/templates/deployments-statefulsets.yaml
24+
apiVersion: policy/v1
25+
kind: PodDisruptionBudget
526
metadata:
627
name: pyroscope-dev-compactor
728
namespace: default
@@ -146,6 +167,27 @@ spec:
146167
app.kubernetes.io/instance: pyroscope-dev
147168
app.kubernetes.io/component: "store-gateway"
148169
---
170+
# Source: pyroscope/templates/deployments-statefulsets.yaml
171+
apiVersion: policy/v1
172+
kind: PodDisruptionBudget
173+
metadata:
174+
name: pyroscope-dev-tenant-settings
175+
namespace: default
176+
labels:
177+
helm.sh/chart: pyroscope-1.6.1
178+
app.kubernetes.io/name: pyroscope
179+
app.kubernetes.io/instance: pyroscope-dev
180+
app.kubernetes.io/version: "1.6.1"
181+
app.kubernetes.io/managed-by: Helm
182+
app.kubernetes.io/component: "tenant-settings"
183+
spec:
184+
maxUnavailable: 1
185+
selector:
186+
matchLabels:
187+
app.kubernetes.io/name: pyroscope
188+
app.kubernetes.io/instance: pyroscope-dev
189+
app.kubernetes.io/component: "tenant-settings"
190+
---
149191
# Source: pyroscope/charts/alloy/templates/serviceaccount.yaml
150192
apiVersion: v1
151193
kind: ServiceAccount
@@ -1723,6 +1765,57 @@ spec:
17231765
# Source: pyroscope/templates/services.yaml
17241766
apiVersion: v1
17251767
kind: Service
1768+
metadata:
1769+
name: pyroscope-dev-ad-hoc-profiles
1770+
namespace: default
1771+
labels:
1772+
helm.sh/chart: pyroscope-1.6.1
1773+
app.kubernetes.io/name: pyroscope
1774+
app.kubernetes.io/instance: pyroscope-dev
1775+
app.kubernetes.io/version: "1.6.1"
1776+
app.kubernetes.io/managed-by: Helm
1777+
app.kubernetes.io/component: "ad-hoc-profiles"
1778+
spec:
1779+
type: ClusterIP
1780+
ports:
1781+
- port: 4040
1782+
targetPort: http2
1783+
protocol: TCP
1784+
name: http2
1785+
selector:
1786+
app.kubernetes.io/name: pyroscope
1787+
app.kubernetes.io/instance: pyroscope-dev
1788+
app.kubernetes.io/component: "ad-hoc-profiles"
1789+
---
1790+
# Source: pyroscope/templates/services.yaml
1791+
apiVersion: v1
1792+
kind: Service
1793+
metadata:
1794+
name: pyroscope-dev-ad-hoc-profiles-headless
1795+
namespace: default
1796+
labels:
1797+
helm.sh/chart: pyroscope-1.6.1
1798+
app.kubernetes.io/name: pyroscope
1799+
app.kubernetes.io/instance: pyroscope-dev
1800+
app.kubernetes.io/version: "1.6.1"
1801+
app.kubernetes.io/managed-by: Helm
1802+
app.kubernetes.io/component: "ad-hoc-profiles"
1803+
spec:
1804+
type: ClusterIP
1805+
clusterIP: None
1806+
ports:
1807+
- port: 4040
1808+
targetPort: http2
1809+
protocol: TCP
1810+
name: http2
1811+
selector:
1812+
app.kubernetes.io/name: pyroscope
1813+
app.kubernetes.io/instance: pyroscope-dev
1814+
app.kubernetes.io/component: "ad-hoc-profiles"
1815+
---
1816+
# Source: pyroscope/templates/services.yaml
1817+
apiVersion: v1
1818+
kind: Service
17261819
metadata:
17271820
name: pyroscope-dev-compactor
17281821
namespace: default
@@ -2077,6 +2170,151 @@ spec:
20772170
app.kubernetes.io/instance: pyroscope-dev
20782171
app.kubernetes.io/component: "store-gateway"
20792172
---
2173+
# Source: pyroscope/templates/services.yaml
2174+
apiVersion: v1
2175+
kind: Service
2176+
metadata:
2177+
name: pyroscope-dev-tenant-settings
2178+
namespace: default
2179+
labels:
2180+
helm.sh/chart: pyroscope-1.6.1
2181+
app.kubernetes.io/name: pyroscope
2182+
app.kubernetes.io/instance: pyroscope-dev
2183+
app.kubernetes.io/version: "1.6.1"
2184+
app.kubernetes.io/managed-by: Helm
2185+
app.kubernetes.io/component: "tenant-settings"
2186+
spec:
2187+
type: ClusterIP
2188+
ports:
2189+
- port: 4040
2190+
targetPort: http2
2191+
protocol: TCP
2192+
name: http2
2193+
selector:
2194+
app.kubernetes.io/name: pyroscope
2195+
app.kubernetes.io/instance: pyroscope-dev
2196+
app.kubernetes.io/component: "tenant-settings"
2197+
---
2198+
# Source: pyroscope/templates/services.yaml
2199+
apiVersion: v1
2200+
kind: Service
2201+
metadata:
2202+
name: pyroscope-dev-tenant-settings-headless
2203+
namespace: default
2204+
labels:
2205+
helm.sh/chart: pyroscope-1.6.1
2206+
app.kubernetes.io/name: pyroscope
2207+
app.kubernetes.io/instance: pyroscope-dev
2208+
app.kubernetes.io/version: "1.6.1"
2209+
app.kubernetes.io/managed-by: Helm
2210+
app.kubernetes.io/component: "tenant-settings"
2211+
spec:
2212+
type: ClusterIP
2213+
clusterIP: None
2214+
ports:
2215+
- port: 4040
2216+
targetPort: http2
2217+
protocol: TCP
2218+
name: http2
2219+
selector:
2220+
app.kubernetes.io/name: pyroscope
2221+
app.kubernetes.io/instance: pyroscope-dev
2222+
app.kubernetes.io/component: "tenant-settings"
2223+
---
2224+
# Source: pyroscope/templates/deployments-statefulsets.yaml
2225+
apiVersion: apps/v1
2226+
kind: Deployment
2227+
metadata:
2228+
name: pyroscope-dev-ad-hoc-profiles
2229+
namespace: default
2230+
labels:
2231+
helm.sh/chart: pyroscope-1.6.1
2232+
app.kubernetes.io/name: pyroscope
2233+
app.kubernetes.io/instance: pyroscope-dev
2234+
app.kubernetes.io/version: "1.6.1"
2235+
app.kubernetes.io/managed-by: Helm
2236+
app.kubernetes.io/component: "ad-hoc-profiles"
2237+
spec:
2238+
replicas: 1
2239+
selector:
2240+
matchLabels:
2241+
app.kubernetes.io/name: pyroscope
2242+
app.kubernetes.io/instance: pyroscope-dev
2243+
app.kubernetes.io/component: "ad-hoc-profiles"
2244+
template:
2245+
metadata:
2246+
annotations:
2247+
checksum/config: dde1479a6b672fba848d9db186796ead0de4454310cf8fdf8185339c47b35812
2248+
profiles.grafana.com/cpu.port_name: http2
2249+
profiles.grafana.com/cpu.scrape: "true"
2250+
profiles.grafana.com/goroutine.port_name: http2
2251+
profiles.grafana.com/goroutine.scrape: "true"
2252+
profiles.grafana.com/memory.port_name: http2
2253+
profiles.grafana.com/memory.scrape: "true"
2254+
labels:
2255+
app.kubernetes.io/name: pyroscope
2256+
app.kubernetes.io/instance: pyroscope-dev
2257+
app.kubernetes.io/component: "ad-hoc-profiles"
2258+
name: "ad-hoc-profiles"
2259+
spec:
2260+
serviceAccountName: pyroscope-dev
2261+
securityContext:
2262+
fsGroup: 10001
2263+
runAsNonRoot: true
2264+
runAsUser: 10001
2265+
dnsPolicy: ClusterFirst
2266+
containers:
2267+
- name: "ad-hoc-profiles"
2268+
securityContext:
2269+
{}
2270+
image: "grafana/pyroscope:1.6.1"
2271+
imagePullPolicy: IfNotPresent
2272+
args:
2273+
- "-target=ad-hoc-profiles"
2274+
- "-self-profiling.disable-push=true"
2275+
- "-server.http-listen-port=4040"
2276+
- "-memberlist.cluster-label=default-pyroscope-dev"
2277+
- "-memberlist.join=dns+pyroscope-dev-memberlist.default.svc.cluster.local.:7946"
2278+
- "-config.file=/etc/pyroscope/config.yaml"
2279+
- "-runtime-config.file=/etc/pyroscope/overrides/overrides.yaml"
2280+
- "-log.level=debug"
2281+
- "-store-gateway.sharding-ring.replication-factor=3"
2282+
ports:
2283+
- name: http2
2284+
containerPort: 4040
2285+
protocol: TCP
2286+
- name: memberlist
2287+
containerPort: 7946
2288+
protocol: TCP
2289+
readinessProbe:
2290+
httpGet:
2291+
path: /ready
2292+
port: http2
2293+
scheme: HTTP
2294+
volumeMounts:
2295+
- name: config
2296+
mountPath: /etc/pyroscope/config.yaml
2297+
subPath: config.yaml
2298+
- name: overrides-config
2299+
mountPath: /etc/pyroscope/overrides/
2300+
- name: data
2301+
mountPath: /data
2302+
resources:
2303+
limits:
2304+
memory: 4Gi
2305+
requests:
2306+
cpu: 0.1
2307+
memory: 16Mi
2308+
volumes:
2309+
- name: config
2310+
configMap:
2311+
name: pyroscope-dev-config
2312+
- name: overrides-config
2313+
configMap:
2314+
name: pyroscope-dev-overrides-config
2315+
- name: data
2316+
emptyDir: {}
2317+
---
20802318
# Source: pyroscope/templates/deployments-statefulsets.yaml
20812319
apiVersion: apps/v1
20822320
kind: Deployment
@@ -2453,6 +2691,100 @@ spec:
24532691
- name: data
24542692
emptyDir: {}
24552693
---
2694+
# Source: pyroscope/templates/deployments-statefulsets.yaml
2695+
apiVersion: apps/v1
2696+
kind: Deployment
2697+
metadata:
2698+
name: pyroscope-dev-tenant-settings
2699+
namespace: default
2700+
labels:
2701+
helm.sh/chart: pyroscope-1.6.1
2702+
app.kubernetes.io/name: pyroscope
2703+
app.kubernetes.io/instance: pyroscope-dev
2704+
app.kubernetes.io/version: "1.6.1"
2705+
app.kubernetes.io/managed-by: Helm
2706+
app.kubernetes.io/component: "tenant-settings"
2707+
spec:
2708+
replicas: 1
2709+
selector:
2710+
matchLabels:
2711+
app.kubernetes.io/name: pyroscope
2712+
app.kubernetes.io/instance: pyroscope-dev
2713+
app.kubernetes.io/component: "tenant-settings"
2714+
template:
2715+
metadata:
2716+
annotations:
2717+
checksum/config: dde1479a6b672fba848d9db186796ead0de4454310cf8fdf8185339c47b35812
2718+
profiles.grafana.com/cpu.port_name: http2
2719+
profiles.grafana.com/cpu.scrape: "true"
2720+
profiles.grafana.com/goroutine.port_name: http2
2721+
profiles.grafana.com/goroutine.scrape: "true"
2722+
profiles.grafana.com/memory.port_name: http2
2723+
profiles.grafana.com/memory.scrape: "true"
2724+
labels:
2725+
app.kubernetes.io/name: pyroscope
2726+
app.kubernetes.io/instance: pyroscope-dev
2727+
app.kubernetes.io/component: "tenant-settings"
2728+
name: "tenant-settings"
2729+
spec:
2730+
serviceAccountName: pyroscope-dev
2731+
securityContext:
2732+
fsGroup: 10001
2733+
runAsNonRoot: true
2734+
runAsUser: 10001
2735+
dnsPolicy: ClusterFirst
2736+
containers:
2737+
- name: "tenant-settings"
2738+
securityContext:
2739+
{}
2740+
image: "grafana/pyroscope:1.6.1"
2741+
imagePullPolicy: IfNotPresent
2742+
args:
2743+
- "-target=tenant-settings"
2744+
- "-self-profiling.disable-push=true"
2745+
- "-server.http-listen-port=4040"
2746+
- "-memberlist.cluster-label=default-pyroscope-dev"
2747+
- "-memberlist.join=dns+pyroscope-dev-memberlist.default.svc.cluster.local.:7946"
2748+
- "-config.file=/etc/pyroscope/config.yaml"
2749+
- "-runtime-config.file=/etc/pyroscope/overrides/overrides.yaml"
2750+
- "-log.level=debug"
2751+
- "-store-gateway.sharding-ring.replication-factor=3"
2752+
ports:
2753+
- name: http2
2754+
containerPort: 4040
2755+
protocol: TCP
2756+
- name: memberlist
2757+
containerPort: 7946
2758+
protocol: TCP
2759+
readinessProbe:
2760+
httpGet:
2761+
path: /ready
2762+
port: http2
2763+
scheme: HTTP
2764+
volumeMounts:
2765+
- name: config
2766+
mountPath: /etc/pyroscope/config.yaml
2767+
subPath: config.yaml
2768+
- name: overrides-config
2769+
mountPath: /etc/pyroscope/overrides/
2770+
- name: data
2771+
mountPath: /data
2772+
resources:
2773+
limits:
2774+
memory: 4Gi
2775+
requests:
2776+
cpu: 0.1
2777+
memory: 16Mi
2778+
volumes:
2779+
- name: config
2780+
configMap:
2781+
name: pyroscope-dev-config
2782+
- name: overrides-config
2783+
configMap:
2784+
name: pyroscope-dev-overrides-config
2785+
- name: data
2786+
emptyDir: {}
2787+
---
24562788
# Source: pyroscope/charts/alloy/templates/controllers/statefulset.yaml
24572789
apiVersion: apps/v1
24582790
kind: StatefulSet

0 commit comments

Comments
 (0)