Skip to content
This repository has been archived by the owner on Jul 19, 2023. It is now read-only.

Fix kind local cluster single binary deploy #661

Merged
merged 2 commits into from
Apr 28, 2023
+9 −7
Merged

Fix kind local cluster single binary deploy #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb6f9f6
fix-single-binary-deploy
simonswine Apr 27, 2023
ee62bd1
Make dashboards work for single-binary phlare
simonswine Apr 27, 2023
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
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ define deploy
--set phlare.podAnnotations."profiles\.grafana\.com\/memory\.port_name"=http-metrics \
--set phlare.podAnnotations."profiles\.grafana\.com\/cpu\.port_name"=http-metrics \
--set phlare.podAnnotations."profiles\.grafana\.com\/goroutine\.port_name"=http-metrics \
--set phlare.components.querier.resources=null --set phlare.components.distributor.resources=null --set phlare.components.ingester.resources=null
--set phlare.extraEnvVars.JAEGER_AGENT_HOST=jaeger.monitoring.svc.cluster.local.
endef

.PHONY: docker-image/phlare/build-debug
Expand Down Expand Up @@ -342,11 +342,13 @@ helm/check: $(BIN)/kubeconform $(BIN)/helm

.PHONY: deploy
deploy: $(BIN)/kind $(BIN)/helm docker-image/phlare/build
$(call deploy,phlare-dev,--set=phlare.extraEnvVars.JAEGER_AGENT_HOST=jaeger.monitoring.svc.cluster.local.)
$(call deploy,phlare-dev,)
# Create a service to provide the same endpoint as micro-services
echo '{"kind":"Service","apiVersion":"v1","metadata":{"name":"phlare-micro-services-query-frontend"},"spec":{"ports":[{"name":"phlare","port":4100,"targetPort":4100}],"selector":{"app.kubernetes.io/component":"all","app.kubernetes.io/instance":"phlare-dev"},"type":"ClusterIP"}}' | kubectl apply -f -

.PHONY: deploy-micro-services
deploy-micro-services: $(BIN)/kind $(BIN)/helm docker-image/phlare/build
$(call deploy,phlare-micro-services,--values=operations/phlare/helm/phlare/values-micro-services.yaml --set=phlare.extraEnvVars.JAEGER_AGENT_HOST=jaeger.monitoring.svc.cluster.local.)
$(call deploy,phlare-micro-services,--values=operations/phlare/helm/phlare/values-micro-services.yaml --set phlare.components.querier.resources=null --set phlare.components.distributor.resources=null --set phlare.components.ingester.resources=null)

.PHONY: deploy-monitoring
deploy-monitoring: $(BIN)/tk $(BIN)/kind tools/monitoring/environments/default/spec.json
Expand Down
4 changes: 2 additions & 2 deletions operations/phlare/jsonnet/phlare-mixin/phlare-mixin/dashboards/phlare-reads.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
[],

matchers:: {
querier: [utils.selector.re('job', '($namespace)/querier')],
ingester: [utils.selector.re('job', '($namespace)/ingester')],
querier: [utils.selector.re('job', '($namespace)/(phlare|querier)')],
ingester: [utils.selector.re('job', '($namespace)/(phlare|ingester)')],
},

local selector(matcherId) =
Expand Down
4 changes: 2 additions & 2 deletions operations/phlare/jsonnet/phlare-mixin/phlare-mixin/dashboards/phlare-writes.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
[],

matchers:: {
distributor: [utils.selector.re('job', '($namespace)/distributor')],
ingester: [utils.selector.re('job', '($namespace)/ingester')],
distributor: [utils.selector.re('job', '($namespace)/(phlare|distributor)')],
ingester: [utils.selector.re('job', '($namespace)/(phlare|ingester)')],
},

local selector(matcherId) =
Expand Down