Merge 1ef560d into 1011fab

Author: percona-csalguero

go.mod

@@ -35,7 +35,7 @@ require (
 	github.com/hashicorp/go-version v1.5.0
 	github.com/lib/pq v1.10.6
 	github.com/minio/minio-go/v7 v7.0.27
-	github.com/percona-platform/dbaas-api v0.0.0-20220110092915-5aacd784d472
+	github.com/percona-platform/dbaas-api v0.0.0-20220525210215-cc4aa3b918e0
 	github.com/percona-platform/saas v0.0.0-20220427162947-f9d246ad0f16
 	github.com/percona/pmm v0.0.0-20220609163826-96fb5593d69b
 	github.com/percona/promconfig v0.2.4-0.20211110115058-98687f586f54

go.sum

@@ -465,6 +465,8 @@ github.com/percona-lab/crypto v0.0.0-20220413143500-70ef7e9f1813 h1:Jb/t6zDMQMwt
 github.com/percona-lab/crypto v0.0.0-20220413143500-70ef7e9f1813/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 github.com/percona-platform/dbaas-api v0.0.0-20220110092915-5aacd784d472 h1:Henk22VMEBX2jwxAW/pHmiJ9s/w8uwRD4ErPidAS9Vs=
 github.com/percona-platform/dbaas-api v0.0.0-20220110092915-5aacd784d472/go.mod h1:WZZ3Hi+lAWCaGWmsrfkkvRQPkIa8n1OZ0s8Su+vbgus=
+github.com/percona-platform/dbaas-api v0.0.0-20220525210215-cc4aa3b918e0 h1:R5bHvc6hHCV6bNUl26Yt8Th75ThPpv9JaWZHSLkl+0E=
+github.com/percona-platform/dbaas-api v0.0.0-20220525210215-cc4aa3b918e0/go.mod h1:VsQuyV8PabFGg0gkc40vmBcnmxrkl/PCvuissmlztJM=
 github.com/percona-platform/saas v0.0.0-20220427162947-f9d246ad0f16 h1:0fx16uGtl4MwrBwm9/VSoNEhjL0cXYxS0quEhLthGcc=
 github.com/percona-platform/saas v0.0.0-20220427162947-f9d246ad0f16/go.mod h1:gFUwaFp6Ugu5qsBwiOVJYbDlzgZ77tmXdXGO7tG5xVI=
 github.com/percona/pmm v0.0.0-20220609163826-96fb5593d69b h1:b3MUqjYU1L85FExBgewV9xFluJEFRO129pRHskgxW+0=

services/dbaas/dbaas_client.go

@@ -237,3 +237,10 @@ func (c *Client) StartMonitoring(ctx context.Context, in *controllerv1beta1.Star
 	defer c.connM.RUnlock()
 	return c.kubernetesClient.StartMonitoring(ctx, in, opts...)
 }
+
+// StopMonitoring removes victoria metrics operator from the kubernetes cluster.
+func (c *Client) StopMonitoring(ctx context.Context, in *controllerv1beta1.StopMonitoringRequest, opts ...grpc.CallOption) (*controllerv1beta1.StopMonitoringResponse, error) {
+	c.connM.RLock()
+	defer c.connM.RUnlock()
+	return c.kubernetesClient.StopMonitoring(ctx, in, opts...)
+}

services/management/dbaas/deps.go

@@ -66,6 +66,8 @@ type dbaasClient interface {
 	InstallPSMDBOperator(ctx context.Context, in *controllerv1beta1.InstallPSMDBOperatorRequest, opts ...grpc.CallOption) (*controllerv1beta1.InstallPSMDBOperatorResponse, error)
 	// StartMonitoring sets up victoria metrics operator to monitor kubernetes cluster.
 	StartMonitoring(ctx context.Context, in *controllerv1beta1.StartMonitoringRequest, opts ...grpc.CallOption) (*controllerv1beta1.StartMonitoringResponse, error)
+	// StopMonitoring removes victoria metrics operator from the cluster.
+	StopMonitoring(ctx context.Context, in *controllerv1beta1.StopMonitoringRequest, opts ...grpc.CallOption) (*controllerv1beta1.StopMonitoringResponse, error)
 }
 
 type versionService interface {

services/management/dbaas/kubernetes_server.go

@@ -357,6 +357,16 @@ func (k kubernetesServer) UnregisterKubernetesCluster(ctx context.Context, req *
 			return models.RemoveKubernetesCluster(t.Querier, req.KubernetesClusterName)
 		}
 
+		_, err = k.dbaasClient.StopMonitoring(ctx, &dbaascontrollerv1beta1.StopMonitoringRequest{
+			KubeAuth: &dbaascontrollerv1beta1.KubeAuth{
+				Kubeconfig: kubernetesCluster.KubeConfig,
+			},
+		})
+
+		if err != nil {
+			k.l.Warnf("cannot stop monitoring: %s", err)
+		}
+
 		pxcClusters, err := k.dbaasClient.ListPXCClusters(ctx,
 			&dbaascontrollerv1beta1.ListPXCClustersRequest{
 				KubeAuth: &dbaascontrollerv1beta1.KubeAuth{

services/management/dbaas/kubernetes_server_test.go

@@ -76,6 +76,8 @@ func TestKubernetesServer(t *testing.T) {
 
 		dc.On("InstallPXCOperator", mock.Anything, mock.Anything).Return(&controllerv1beta1.InstallPXCOperatorResponse{}, nil)
 
+		dc.On("StopMonitoring", mock.Anything, mock.Anything).Return(&controllerv1beta1.StopMonitoringResponse{}, nil)
+
 		kubernetesClusterName := "test-cluster"
 		registerKubernetesClusterResponse, err := ks.RegisterKubernetesCluster(ctx, &dbaasv1beta1.RegisterKubernetesClusterRequest{
 			KubernetesClusterName: kubernetesClusterName,