From e7d436a2327cbdec8f31699263df7f6f56ae99fc Mon Sep 17 00:00:00 2001 From: niravparikh05 Date: Thu, 14 Apr 2022 13:10:38 +0530 Subject: [PATCH] issue fixes for cluster delete and adding bootstrap addr to agent config --- internal/cluster/dao/projectcluster.go | 2 +- main.go | 3 +++ .../migrations/admindb/000035_cluster_project_cluster.up.sql | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/cluster/dao/projectcluster.go b/internal/cluster/dao/projectcluster.go index 88c7b4f..98a08f7 100644 --- a/internal/cluster/dao/projectcluster.go +++ b/internal/cluster/dao/projectcluster.go @@ -21,7 +21,7 @@ func CreateProjectCluster(ctx context.Context, db bun.IDB, pc *models.ProjectClu func GetProjectsForCluster(ctx context.Context, db bun.IDB, clusterID uuid.UUID) ([]models.ProjectCluster, error) { var projectClusters []models.ProjectCluster - err := db.NewSelect().Model(&projectClusters).Where("cluster_id = ?", clusterID).Scan(ctx) + err := db.NewSelect().Model(&projectClusters).Where("cluster_id = ?", clusterID).Where("trash = ?", false).Scan(ctx) if err != nil { return nil, err } diff --git a/main.go b/main.go index d692250..d3f0271 100644 --- a/main.go +++ b/main.go @@ -65,6 +65,7 @@ const ( sentryPeeringHostEnv = "SENTRY_PEERING_HOST" coreRelayConnectorHostEnv = "CORE_RELAY_CONNECTOR_HOST" coreRelayUserHostEnv = "CORE_RELAY_USER_HOST" + sentryBootstrapEnv = "SENTRY_BOOTSTRAP_ADDR" bootstrapKEKEnv = "BOOTSTRAP_KEK" relayImageEnv = "RELAY_IMAGE" @@ -179,6 +180,7 @@ func setup() { viper.SetDefault(sentryPeeringHostEnv, "peering.sentry.rafay.local:10001") viper.SetDefault(coreRelayConnectorHostEnv, "*.core-connector.relay.rafay.local:10002") viper.SetDefault(coreRelayUserHostEnv, "*.user.relay.rafay.local:10002") + viper.SetDefault(sentryBootstrapEnv, "console.rafay.dev:443") viper.SetDefault(bootstrapKEKEnv, "rafay") viper.SetDefault(relayImageEnv, "registry.rafay-edge.net/rafay/rafay-relay-agent:r1.10.0-24") @@ -213,6 +215,7 @@ func setup() { viper.BindEnv(sentryPeeringHostEnv) viper.BindEnv(coreRelayConnectorHostEnv) viper.BindEnv(coreRelayUserHostEnv) + viper.BindEnv(sentryBootstrapEnv) viper.BindEnv(bootstrapKEKEnv) viper.BindEnv(coreCDRelayConnectorHostEnv) viper.BindEnv(coreCDRelayUserHostEnv) diff --git a/persistence/migrations/admindb/000035_cluster_project_cluster.up.sql b/persistence/migrations/admindb/000035_cluster_project_cluster.up.sql index 13a01e8..c747231 100644 --- a/persistence/migrations/admindb/000035_cluster_project_cluster.up.sql +++ b/persistence/migrations/admindb/000035_cluster_project_cluster.up.sql @@ -1,6 +1,7 @@ CREATE TABLE IF NOT EXISTS cluster_project_cluster ( project_id uuid NOT NULL, - cluster_id uuid NOT NULL + cluster_id uuid NOT NULL, + trash boolean NOT NULL default false ); ALTER TABLE cluster_project_cluster OWNER TO admindbuser;