issue fixes for cluster delete and adding bootstrap addr to agent config

This commit is contained in:
niravparikh05
2022-04-14 13:10:38 +05:30
parent a6268da716
commit e7d436a232
3 changed files with 6 additions and 2 deletions
+1 -1
View File
@@ -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
}
+3
View File
@@ -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)
@@ -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;