refactor: l4 proxy namespace and frp config map namespace

Author: eball

pkg/apis/settings/v1alpha1/reverseproxyconf.go

@@ -548,7 +548,8 @@ func (conf *ReverseProxyConfig) generateReverseProxyConfigMapData() map[string]s
 }
 
 func GetDefaultReverseProxyConfig(ctx context.Context) (*ReverseProxyConfig, error) {
-	configData, err := k8sutil.GetConfigMapData(ctx, constants.OSSystemNamespace, constants.DefaultReverseProxyConfigMapName)
+	namespace := utils.EnvOrDefault("L4_PROXY_NAMESPACE", constants.OSSystemNamespace)
+	configData, err := k8sutil.GetConfigMapData(ctx, namespace, constants.DefaultReverseProxyConfigMapName)
 	if err != nil {
 		return nil, errors.Wrap(err, "error getting configmap")
 	}

pkg/constants/constants.go

@@ -131,7 +131,7 @@ var (
 	// this port must be used to proxy traffic
 	L4ListenSSLProxyProtocolPort = "444"
 
-	OSSystemNamespace = "os-system" // "kubesphere-system"
+	OSSystemNamespace = "os-network" // "kubesphere-system"
 
 	L4ProxyServiceAccountName = "os-internal" // "kubesphere"
 

pkg/utils/k8sutil/k8sutil.go

@@ -3,11 +3,12 @@ package k8sutil
 import (
 	"context"
 	"fmt"
-	applyCorev1 "k8s.io/client-go/applyconfigurations/core/v1"
-	applyMetav1 "k8s.io/client-go/applyconfigurations/meta/v1"
 	"net"
 	"time"
 
+	applyCorev1 "k8s.io/client-go/applyconfigurations/core/v1"
+	applyMetav1 "k8s.io/client-go/applyconfigurations/meta/v1"
+
 	"bytetrade.io/web3os/bfl/internal/log"
 	"bytetrade.io/web3os/bfl/pkg/apiserver/runtime"
 	"bytetrade.io/web3os/bfl/pkg/constants"
@@ -23,7 +24,8 @@ import (
 )
 
 func GetL4ProxyNodeIP(ctx context.Context, waitTimeout time.Duration) (*string, error) {
-	return GetPodHostIPWithLabelSelector(ctx, waitTimeout, constants.OSSystemNamespace, "app=l4-bfl-proxy")
+	namespace := utils.EnvOrDefault("L4_PROXY_NAMESPACE", constants.OSSystemNamespace)
+	return GetPodHostIPWithLabelSelector(ctx, waitTimeout, namespace, "app=l4-bfl-proxy")
 }
 
 func GetPodHostIPWithLabelSelector(ctx context.Context, waitTimeout time.Duration, namespace, labelSelector string) (*string, error) {