RoutingManager struct {
BaseUrl string
}
-/* Kubernetes struct {
+ Kubernetes struct {
ConfigPath string
- Namespace string
- }*/
+ KubeNamespace string
+ }
NotificationResponseBuffer int
BigRedButtonTimeoutSec int
MaxRnibConnectionAttempts int
config.populateHttpConfig(viper.Sub("http"))
config.populateLoggingConfig(viper.Sub("logging"))
config.populateRoutingManagerConfig(viper.Sub("routingManager"))
- //config.populateKubernetesConfig(viper.Sub("kubernetes"))
+ config.populateKubernetesConfig(viper.Sub("kubernetes"))
config.NotificationResponseBuffer = viper.GetInt("notificationResponseBuffer")
config.BigRedButtonTimeoutSec = viper.GetInt("bigRedButtonTimeoutSec")
config.MaxRnibConnectionAttempts = viper.GetInt("maxRnibConnectionAttempts")
c.RoutingManager.BaseUrl = rmConfig.GetString("baseUrl")
}
-/*func (c *Configuration) populateKubernetesConfig(rmConfig *viper.Viper) {
+func (c *Configuration) populateKubernetesConfig(rmConfig *viper.Viper) {
if rmConfig == nil {
panic(fmt.Sprintf("#configuration.populateKubernetesConfig - failed to populate Kubernetes configuration: The entry 'kubernetes' not found\n"))
}
c.Kubernetes.ConfigPath = rmConfig.GetString("configPath")
- c.Kubernetes.Namespace = rmConfig.GetString("namespace")
-}*/
+ c.Kubernetes.KubeNamespace = rmConfig.GetString("kubeNamespace")
+}
func (c *Configuration) populateGlobalRicIdConfig(globalRicIdConfig *viper.Viper) {
if globalRicIdConfig == nil {
return fmt.Sprintf("{logging.logLevel: %s, http.port: %d, rmr: { port: %d, maxMsgSize: %d}, routingManager.baseUrl: %s, "+
"notificationResponseBuffer: %d, bigRedButtonTimeoutSec: %d, maxRnibConnectionAttempts: %d, "+
"rnibRetryIntervalMs: %d, keepAliveResponseTimeoutMs: %d, keepAliveDelayMs: %d, e2tInstanceDeletionTimeoutMs: %d, "+
- "globalRicId: { plmnId: %s, ricNearRtId: %s}}",//, kubernetes: {configPath: %s, namespace: %s}}",
+ "globalRicId: { plmnId: %s, ricNearRtId: %s, kubernetes: {configPath: %s, kubeNamespace: %s}}",
c.Logging.LogLevel,
c.Http.Port,
c.Rmr.Port,
c.E2TInstanceDeletionTimeoutMs,
c.GlobalRicId.PlmnId,
c.GlobalRicId.RicNearRtId,
- // c.Kubernetes.ConfigPath,
- //c.Kubernetes.Namespace,
+ c.Kubernetes.ConfigPath,
+ c.Kubernetes.KubeNamespace,
)
}