github/paralus
1
0
Fork 0
mirror of https://github.com/paralus/paralus.git synced 2026-08-24 15:47:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #57 from RafaySystems/deployment-udpate

Browse Source 
Clean up env variables
This commit is contained in:
nirav-rafay
2022-03-16 16:57:39 +05:30
committed by GitHub
parent 8d2049ba53 9f260950af
commit 9bb6285453
2 changed files with 135 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
env.example
+32 -5
View File
@@ -1,8 +1,35 @@
# application
RPC_PORT=10000
API_PORT=11000
DEBUG_PORT=12000
API_ADDR=localhost:11000
DEV=true
# db
DB_ADDR=localhost:5432
DB_NAME=admindb
DB_USER=admindbuser
DB_PASSWORD=admindbpassword
DB_PORT=5432
DB_HOST=localhost
DB_ADDR=localhost:5432
KRATOS_PUBLIC_URL=http://127.0.0.1:4433/
APP_HOST_HTTP=https://127.0.0.1:8000/
DB_PORT=5432 # used in docker-compose
# relay
SENTRY_PEERING_HOST='peering.sentry.rafay.local:10001'
CORE_RELAY_CONNECTOR_HOST='*.core-connector.relay.rafay.local:10002'
CORE_RELAY_USER_HOST='*.user.relay.rafay.local:10002'
BOOTSTRAP_KEK='rafay'
RELAY_IMAGE='registry.rafay-edge.net/rafay/rafay-relay-agent:r1.10.0-24'
# audit
ES_END_POINT='http://127.0.0.1:9200'
ES_INDEX_PREFIX='auditlog-system'
RELAY_AUDITS_ES_INDEX_PREFIX='auditlog-relay'
RELAY_COMMANDS_ES_INDEX_PREFIX='auditlog-commands'
# cd relay
CORE_CD_RELAY_USER_HOST='*.user.cdrelay.rafay.local:10012'
CORE_CD_RELAY_CONNECTOR_HOST='*.core-connector.cdrelay.rafay.local:10012'
SCHEDULER_NAMESPACE='rafay-system'
# Kratos
KRATOS_ADDR='http://localhost:4433'
main.go
+103 -86
View File
@@ -49,88 +49,65 @@ import (
)
const (
rpcPortEnv = "RPC_PORT"
apiPortEnv = "API_PORT"
debugPortEnv = "DEBUG_PORT"
dbAddrEnv = "DB_ADDR"
dbNameEnv = "DB_NAME"
dbUserEnv = "DB_USER"
dbPasswordEnv = "DB_PASSWORD"
devEnv = "DEV"
apiAddrEnv = "API_ADDR"
// application
rpcPortEnv = "RPC_PORT"
apiPortEnv = "API_PORT"
debugPortEnv = "DEBUG_PORT"
apiAddrEnv = "API_ADDR"
devEnv = "DEV"
// db
dbAddrEnv = "DB_ADDR"
dbNameEnv = "DB_NAME"
dbUserEnv = "DB_USER"
dbPasswordEnv = "DB_PASSWORD"
// relay
sentryPeeringHostEnv = "SENTRY_PEERING_HOST"
coreRelayConnectorHostEnv = "CORE_RELAY_CONNECTOR_HOST"
coreRelayUserHostEnv = "CORE_RELAY_USER_HOST"
bootstrapKEKEnv = "BOOTSTRAP_KEK"
authAddrEnv = "AUTH_ADDR"
sentryBootstrapEnv = "SENTRY_BOOTSTRAP_ADDR"
relayImageEnv = "RELAY_IMAGE"
controlAddrEnv = "CONTROL_ADDR"
// audit
esEndPointEnv = "ES_END_POINT"
esIndexPrefixEnv = "ES_INDEX_PREFIX"
relayAuditESIndexPrefixEnv = "RELAY_AUDITS_ES_INDEX_PREFIX"
relayCommandESIndexPrefix = "RELAY_COMMANDS_ES_INDEX_PREFIX"
RpcPort = "AUDIT_RPC_PORT"
ApiPort = "AUDIT_API_PORT"
// cd relay
coreCDRelayUserHostEnv = "CORE_CD_RELAY_USER_HOST"
coreCDRelayConnectorHostEnv = "CORE_CD_RELAY_CONNECTOR_HOST"
schedulerNamespaceEnv = "SCHEDULER_NAMESPACE"
kratosSchemeEnv = "KRATOS_SCHEME"
kratosAddrEnv = "KRATOS_ADDR"
// kratos
kratosAddrEnv = "KRATOS_ADDR"
)
var (
rpcPort int
apiPort int
debugPort int
rpcRelayPeeringPort int
dbAddr string
dbName string
dbUser string
dbPassword string
apiAddr string
dev bool
db *bun.DB
gormDb *gorm.DB
kratosScheme string
kratosAddr string
kc *kclient.APIClient
ps service.PartnerService
os service.OrganizationService
pps service.ProjectService
bs service.BootstrapService
aps service.AccountPermissionService
gps service.GroupPermissionService
krs service.KubeconfigRevocationService
kss service.KubeconfigSettingService
kcs service.KubectlClusterSettingsService
as service.AuthzService
cs service.ClusterService
ms service.MetroService
us service.UserService
ks service.ApiKeyService
gs service.GroupService
rs service.RoleService
rrs service.RolepermissionService
is service.IdpService
oidcs service.OIDCProviderService
aus *service.AuditLogService
ras *service.RelayAuditService
rcs *service.AuditLogService
_log = log.GetLogger()
schedulerPool schedulerrpc.SchedulerPool
schedulerAddr string
bootstrapKEK string
// application
rpcPort int
apiPort int
debugPort int
apiAddr string
dev bool
rpcRelayPeeringPort int
_log = log.GetLogger()
// db
dbAddr string
dbName string
dbUser string
dbPassword string
db *bun.DB
gormDb *gorm.DB
// relay
sentryPeeringHost string
coreRelayConnectorHost string
coreRelayUserHost string
downloadData *common.DownloadData
controlAddr string
bootstrapKEK string
relayImage string
// audit
elasticSearchUrl string
@@ -143,6 +120,38 @@ var (
coreCDRelayConnectorHost string
schedulerNamespace string
// kratos
kratosAddr string
kc *kclient.APIClient
// services
ps service.PartnerService
os service.OrganizationService
pps service.ProjectService
bs service.BootstrapService
aps service.AccountPermissionService
gps service.GroupPermissionService
krs service.KubeconfigRevocationService
kss service.KubeconfigSettingService
kcs service.KubectlClusterSettingsService
as service.AuthzService
cs service.ClusterService
ms service.MetroService
us service.UserService
ks service.ApiKeyService
gs service.GroupService
rs service.RoleService
rrs service.RolepermissionService
is service.IdpService
oidcs service.OIDCProviderService
aus *service.AuditLogService
ras *service.RelayAuditService
rcs *service.AuditLogService
schedulerPool schedulerrpc.SchedulerPool
schedulerAddr string
downloadData *common.DownloadData
kekFunc = func() ([]byte, error) {
if len(bootstrapKEK) == 0 {
return nil, errors.New("empty KEK")
@@ -152,55 +161,62 @@ var (
)
func setup() {
// application
viper.SetDefault(rpcPortEnv, 10000)
viper.SetDefault(apiPortEnv, 11000)
viper.SetDefault(debugPortEnv, 12000)
viper.SetDefault(apiAddrEnv, "localhost:11000")
viper.SetDefault(devEnv, true)
// db
viper.SetDefault(dbAddrEnv, "localhost:5432")
viper.SetDefault(dbNameEnv, "admindb")
viper.SetDefault(dbUserEnv, "admindbuser")
viper.SetDefault(dbPasswordEnv, "admindbpassword")
viper.SetDefault(devEnv, true)
viper.SetDefault(apiAddrEnv, "localhost:11000")
viper.SetDefault(kratosSchemeEnv, "http")
viper.SetDefault(kratosAddrEnv, "localhost:4433")
// relay
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(bootstrapKEKEnv, "rafay")
viper.SetDefault(authAddrEnv, "authsrv.rcloud-admin.svc.cluster.local:50011")
viper.SetDefault(coreCDRelayUserHostEnv, "*.user.cdrelay.rafay.local:10012")
viper.SetDefault(coreCDRelayConnectorHostEnv, "*.core-connector.cdrelay.rafay.local:10012")
viper.SetDefault(sentryBootstrapEnv, "console.rafay.dev:443")
viper.SetDefault(relayImageEnv, "registry.rafay-edge.net/rafay/rafay-relay-agent:r1.10.0-24")
viper.SetDefault(controlAddrEnv, "localhost:5002")
viper.SetDefault(schedulerNamespaceEnv, "rafay-system")
// audit
viper.SetDefault(esEndPointEnv, "http://127.0.0.1:9200")
viper.SetDefault(esIndexPrefixEnv, "auditlog-system")
viper.SetDefault(relayAuditESIndexPrefixEnv, "auditlog-relay")
viper.SetDefault(relayCommandESIndexPrefix, "auditlog-commands")
// cd relay
viper.SetDefault(coreCDRelayUserHostEnv, "*.user.cdrelay.rafay.local:10012")
viper.SetDefault(coreCDRelayConnectorHostEnv, "*.core-connector.cdrelay.rafay.local:10012")
viper.SetDefault(schedulerNamespaceEnv, "rafay-system")
// kratos
viper.SetDefault(kratosAddrEnv, "http://localhost:4433")
viper.BindEnv(rpcPortEnv)
viper.BindEnv(apiPortEnv)
viper.BindEnv(debugPortEnv)
viper.BindEnv(apiAddrEnv)
viper.BindEnv(devEnv)
viper.BindEnv(dbAddrEnv)
viper.BindEnv(dbNameEnv)
viper.BindEnv(dbUserEnv)
viper.BindEnv(dbPasswordEnv)
viper.BindEnv(devEnv)
viper.BindEnv(apiAddrEnv)
viper.BindEnv(kratosSchemeEnv)
viper.BindEnv(kratosAddrEnv)
viper.BindEnv(bootstrapKEKEnv)
viper.BindEnv(authAddrEnv)
viper.BindEnv(sentryPeeringHostEnv)
viper.BindEnv(coreRelayConnectorHostEnv)
viper.BindEnv(coreRelayUserHostEnv)
viper.BindEnv(bootstrapKEKEnv)
viper.BindEnv(coreCDRelayConnectorHostEnv)
viper.BindEnv(coreCDRelayUserHostEnv)
viper.BindEnv(sentryBootstrapEnv)
viper.BindEnv(relayImageEnv)
viper.BindEnv(controlAddrEnv)
viper.BindEnv(schedulerNamespaceEnv)
viper.BindEnv(esEndPointEnv)
viper.BindEnv(esIndexPrefixEnv)
viper.BindEnv(relayAuditESIndexPrefixEnv)
@@ -209,22 +225,25 @@ func setup() {
rpcPort = viper.GetInt(rpcPortEnv)
apiPort = viper.GetInt(apiPortEnv)
debugPort = viper.GetInt(debugPortEnv)
apiAddr = viper.GetString(apiAddrEnv)
dev = viper.GetBool(devEnv)
dbAddr = viper.GetString(dbAddrEnv)
dbName = viper.GetString(dbNameEnv)
dbUser = viper.GetString(dbUserEnv)
dbPassword = viper.GetString(dbPasswordEnv)
apiAddr = viper.GetString(apiAddrEnv)
dev = viper.GetBool(devEnv)
kratosScheme = viper.GetString(kratosSchemeEnv)
kratosAddr = viper.GetString(kratosAddrEnv)
bootstrapKEK = viper.GetString(bootstrapKEKEnv)
sentryPeeringHost = viper.GetString(sentryPeeringHostEnv)
coreRelayConnectorHost = viper.GetString(coreRelayConnectorHostEnv)
coreRelayUserHost = viper.GetString(coreRelayUserHostEnv)
coreCDRelayConnectorHost = viper.GetString(coreCDRelayConnectorHostEnv)
coreCDRelayUserHost = viper.GetString(coreCDRelayUserHostEnv)
controlAddr = viper.GetString(controlAddrEnv)
relayImage = viper.GetString(relayImageEnv)
schedulerNamespace = viper.GetString(schedulerNamespaceEnv)
elasticSearchUrl = viper.GetString(esEndPointEnv)
esIndexPrefix = viper.GetString(esIndexPrefixEnv)
relayAuditsESIndexPrefix = viper.GetString(relayAuditESIndexPrefixEnv)
@@ -234,12 +253,11 @@ func setup() {
// Kratos client setup
kratosConfig := kclient.NewConfiguration()
kratosUrl := kratosScheme + "://" + kratosAddr
kratosConfig.Servers[0].URL = kratosUrl
kratosConfig.Servers[0].URL = kratosAddr
kc = kclient.NewAPIClient(kratosConfig)
// db setup
dsn := "postgres://" + dbUser + ":" + dbPassword + "@" + dbAddr + "/" + dbName + "?sslmode=disable"
dsn := fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=disable", dbUser, dbPassword, dbAddr, dbName)
sqldb := sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(dsn)))
db = bun.NewDB(sqldb, pgdialect.New())
@@ -289,7 +307,7 @@ func setup() {
rs = service.NewRoleService(db, as)
rrs = service.NewRolepermissionService(db)
is = service.NewIdpService(db, apiAddr)
oidcs = service.NewOIDCProviderService(db, kratosUrl)
oidcs = service.NewOIDCProviderService(db, kratosAddr)
//sentry related services
bs = service.NewBootstrapService(db)
@@ -331,9 +349,8 @@ func setup() {
// cluster bootstrap
downloadData = &common.DownloadData{
ControlAddr: controlAddr,
APIAddr: apiAddr,
RelayAgentImage: relayImageEnv,
RelayAgentImage: relayImage,
}
cs = service.NewClusterService(db, downloadData, bs)