Skip to content

Commit

Permalink
EVEREST-287 Drop DBaaS (#2510)
Browse files Browse the repository at this point in the history
  • Loading branch information
gen1us2k authored Sep 28, 2023
1 parent bbb794f commit bf2a099
Show file tree
Hide file tree
Showing 222 changed files with 471 additions and 118,185 deletions.
2 changes: 0 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
/agent/runner/ @artemgavrilov @percona/pmm-review-be
/api/ @BupycHuk @percona/pmm-review-be
/managed/services/checks/ @idoqo @percona/pmm-review-be
/managed/services/dbaas @gen1us2k @recharte @percona/pmm-review-be
/managed/services/management/dbaas @gen1us2k @recharte @percona/pmm-review-be
/update/ @BupycHuk @talhabinrizwan @percona/pmm-review-be
**/go.mod @percona/pmm-review-dependency @percona/pmm-review-be
**/Dockerfile @percona/pmm-review-dependency @percona/pmm-review-be
Expand Down
3 changes: 0 additions & 3 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ header:
- "**/amclient/**"
- "**/ammodels/**"
- "qan-api2/migrations/**"
- "managed/services/dbaas/kubernetes/client/kubeclient_interface.go"
- "managed/services/dbaas/olm/operator_service_interface.go"
- "managed/services/dbaas/kubernetes/operator_service_interface.go"
license:
spdx-id: AGPL-3.0-or-later
copyright-owner: Percona LLC
Expand Down
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@ This project is built from several repositories:

* [percona/pmm](https://github.com/percona/pmm/tree/main/api)
* [percona-platform/saas](https://github.com/percona-platform/saas)
* [percona-platform/dbaas-api](https://github.com/percona-platform/dbaas-api)

### PMM Server

#### Backends

* [percona/pmm-managed](https://github.com/percona/pmm/tree/main/managed) manages configuration of PMM server components (VictoriaMetrics, Grafana, etc.) and exposes API for that. APIs are used by [pmm-admin](https://github.com/percona/pmm/tree/main/admin)
* [percona-platform/dbaas-controller](https://github.com/percona-platform/dbaas-controller) exposes a simplified API for managing Percona Kubernetes Operators.
* [percona/qan-api](https://github.com/percona/pmm/tree/main/qan-api2) query analytics API
* [percona/pmm-update](https://github.com/percona/pmm/tree/main/update) is a tool for updating packages and OS configuration for PMM

Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,3 @@ TARGET ?= _bash
env: ## Run `make TARGET` in devcontainer (`make env TARGET=help`); TARGET defaults to bash
COMPOSE_PROFILES=$(PROFILES) \
docker exec -it --workdir=/root/go/src/github.com/percona/pmm pmm-server make $(TARGET)

update-dbaas-catalog: ## Update the DBaaS catalog from the latest production branch (percona-platform).
wget https://raw.githubusercontent.com/percona/dbaas-catalog/percona-platform/percona-dbaas-catalog.yaml -O managed/data/crds/olm/percona-dbaas-catalog.yaml
11 changes: 3 additions & 8 deletions Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ help: ## Display this help message
@grep -h '^[a-zA-Z]' $(MAKEFILE_LIST) | \
awk -F ':.*?## ' 'NF==2 {printf " %-26s%s\n", $$1, $$2}'
@echo
@echo "To test DBaaS components with minikube:"
@echo "Start minikube: minikube start --cpus=2 --nodes=3 --kubernetes-version=v1.20.0"
@echo "ENABLE_DBAAS=1 NETWORK=minikube make env-up"
@echo "DBAAS_ALLOW_UNSUPPORTED_OPERATORS=1 DBAAS_PXC_OP_CHANNEL=fast-v1 ENABLE_DBAAS=1 NETWORK=minikube make env-up"
@echo Check the docker-compose.yml file to see which environment variables are available.
@echo Check the docker-compose.yml file to see which environment variables are available.

init: ## Install tools
rm -rf bin/*
Expand Down Expand Up @@ -47,7 +43,7 @@ gen-api: ## Generate PMM API

bin/buf generate -v api

for API in api/agentlocalpb api/serverpb api/inventorypb api/managementpb api/managementpb/dbaas api/managementpb/ia api/managementpb/alerting api/managementpb/backup api/managementpb/azure api/managementpb/role api/qanpb api/managementpb/agent api/managementpb/node api/managementpb/service api/platformpb api/userpb; do \
for API in api/agentlocalpb api/serverpb api/inventorypb api/managementpb api/managementpb/ia api/managementpb/alerting api/managementpb/backup api/managementpb/azure api/managementpb/role api/qanpb api/managementpb/agent api/managementpb/node api/managementpb/service api/platformpb api/userpb; do \
set -x ; \
bin/swagger mixin $$API/json/header.json $$API/*.swagger.json --output=$$API/json/$$(basename $$API).json --keep-spec-order; \
bin/swagger flatten --with-flatten=expand --with-flatten=remove-unused $$API/json/$$(basename $$API).json --output=$$API/json/$$(basename $$API).json ; \
Expand Down Expand Up @@ -87,7 +83,6 @@ gen-api: ## Generate PMM API
api/userpb/json/userpb.json \
api/inventorypb/json/inventorypb.json \
api/managementpb/json/managementpb.json \
api/managementpb/dbaas/json/dbaas.json \
api/managementpb/ia/json/ia.json \
api/managementpb/alerting/json/alerting.json \
api/managementpb/backup/json/backup.json \
Expand Down Expand Up @@ -127,7 +122,7 @@ clean: clean_swagger ## Remove generated files
find api -name '*.pb.gw.go' -print -delete
find api -name '*.validate.go' -print -delete

for API in api/agentlocalpb api/serverpb api/inventorypb api/managementpb api/managementpb/dbaas api/managementpb/ia api/managementpb/alerting api/managementpb/backup api/managementpb/role api/managementpb/agent api/managementpb/node api/managementpb/service api/qanpb api/platformpb ; do \
for API in api/agentlocalpb api/serverpb api/inventorypb api/managementpb api/managementpb/ia api/managementpb/alerting api/managementpb/backup api/managementpb/role api/managementpb/agent api/managementpb/node api/managementpb/service api/qanpb api/platformpb ; do \
rm -fr $$API/json/client $$API/json/models $$API/json/$$(basename $$API).json ; \
done
rm -f api/swagger/swagger.json api/swagger/swagger-dev.json
Expand Down
2 changes: 0 additions & 2 deletions api-tests/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import (
inventoryClient "github.com/percona/pmm/api/inventorypb/json/client"
alertingClient "github.com/percona/pmm/api/managementpb/alerting/json/client"
backupsClient "github.com/percona/pmm/api/managementpb/backup/json/client"
dbaasClient "github.com/percona/pmm/api/managementpb/dbaas/json/client"
iaClient "github.com/percona/pmm/api/managementpb/ia/json/client"
managementClient "github.com/percona/pmm/api/managementpb/json/client"
platformClient "github.com/percona/pmm/api/platformpb/json/client"
Expand Down Expand Up @@ -220,7 +219,6 @@ func init() {
transport.Consumers["application/zip"] = runtime.ByteStreamConsumer()
inventoryClient.Default = inventoryClient.New(transport, nil)
managementClient.Default = managementClient.New(transport, nil)
dbaasClient.Default = dbaasClient.New(transport, nil)
serverClient.Default = serverClient.New(transport, nil)
amclient.Default = amclient.New(alertmanagerTransport, nil)
iaClient.Default = iaClient.New(transport, nil)
Expand Down
55 changes: 0 additions & 55 deletions api-tests/management/dbaas/helpers.go

This file was deleted.

Loading

0 comments on commit bf2a099

Please sign in to comment.