Skip to content

Commit

Permalink
Remove previous implementation of parca manifests (#570)
Browse files Browse the repository at this point in the history
* remove previous parca manifests

* remove parca in makefile

* remove parca in launch.sh script referring to old manifest

* remove parca from bundler

* update launch.sh and ci_test.sh

* remove unused env var in launch.sh

* update launch.sh file
  • Loading branch information
coleenquadros authored Aug 2, 2023
1 parent 9592c60 commit 469a134
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 920 deletions.
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,11 @@ migrate-vendor:

.PHONY: manifests
manifests: migrate-vendor format $(JSONNET_VENDOR_DIR)
manifests: resources/services/telemeter-template.yaml resources/services/rhelemeter-template.yaml resources/services/jaeger-template.yaml resources/services/parca-template.yaml tests/deploy/manifests/minio-template.yaml tests/deploy/manifests/dex-template.yaml
manifests: resources/services/telemeter-template.yaml resources/services/rhelemeter-template.yaml resources/services/jaeger-template.yaml tests/deploy/manifests/minio-template.yaml tests/deploy/manifests/dex-template.yaml
manifests: resources/services/observatorium-template.yaml resources/services/observatorium-metrics-template.yaml resources/services/observatorium-logs-template.yaml resources/services/observatorium-traces-subscriptions-template.yaml resources/services/observatorium-traces-template.yaml resources/crds/observatorium-logs-crds-template.yaml
manifests: resources/services/metric-federation-rule-template.yaml
$(MAKE) clean

resources/services/parca-template.yaml: $(JSONNET) $(GOJSONTOYAML) $(JSONNETFMT)
resources/services/parca-template.yaml: $(wildcard services/parca-*)
@echo ">>>>> Running parca-template"
$(JSONNET) -J "$(JSONNET_VENDOR_DIR)" -m resources/services services/parca-template.jsonnet | $(XARGS) -I{} sh -c 'cat {} | $(GOJSONTOYAML) > {}.yaml' -- {}

resources/services/jaeger-template.yaml: $(wildcard services/jaeger-*) $(JSONNET) $(GOJSONTOYAML) $(JSONNETFMT)
@echo ">>>>> Running jaeger-template"
$(JSONNET) -J "$(JSONNET_VENDOR_DIR)" services/jaeger-template.jsonnet | $(GOJSONTOYAML) > $@
Expand Down
9 changes: 0 additions & 9 deletions jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,6 @@
},
"version": "master"
},
{
"source": {
"git": {
"remote": "https://github.com/parca-dev/parca.git",
"subdir": "deploy/lib/parca"
}
},
"version": "main"
},
{
"source": {
"git": {
Expand Down
10 changes: 0 additions & 10 deletions jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,16 +306,6 @@
"version": "76213272326b432a504dd59db593b94890541342",
"sum": "h+pIb5Vnc+Dcpu1awzb9HLTHa+Hv1q6OAoIqbgxgHsk="
},
{
"source": {
"git": {
"remote": "https://github.com/parca-dev/parca.git",
"subdir": "deploy/lib/parca"
}
},
"version": "bc35eaf54ea6b9d7ea46b6c0fe2194084962765b",
"sum": "aK56fC0SsHbSg0WZfRiDTntO72QJqftVgORDae2ilyg="
},
{
"source": {
"git": {
Expand Down
215 changes: 0 additions & 215 deletions resources/services/parca-observatorium-remote-ns-rbac-template.yaml

This file was deleted.

Loading

0 comments on commit 469a134

Please sign in to comment.