feat: support nacos storage

Makefile.core.mk

@@ -186,8 +186,8 @@ install-dev-wasmplugin: build-wasmplugins pre-install
 	helm install higress helm/core -n higress-system --create-namespace --set 'controller.tag=$(TAG)' --set 'gateway.replicas=1' --set 'pilot.tag=$(ISTIO_LATEST_IMAGE_TAG)' --set 'gateway.tag=$(ENVOY_LATEST_IMAGE_TAG)' --set 'global.local=true'  --set 'global.volumeWasmPlugins=true' --set 'global.onlyPushRouteCluster=false'
 install-dev-nacos: pre-install
 	kubectl apply -f tools/hack/conf/nacos.yaml
-	tools/hack/gen-keys.sh
-	helm install higress helm/core -n higress-system --create-namespace --set 'controller.tag=$(TAG)' --set 'gateway.replicas=1' --set 'pilot.tag=$(ISTIO_LATEST_IMAGE_TAG)' --set 'gateway.tag=$(ENVOY_LATEST_IMAGE_TAG)' --set 'global.local=true' --set 'apiserver.enabled=true' --set 'apiserver.serverAddr="http://nacos-service.higress-system.svc.cluster.local:8848"'
+	tools/hack/gen-secret-configmap.sh
+	helm install higress helm/core -n higress-system --set 'controller.tag=$(TAG)' --set 'gateway.replicas=1' --set 'pilot.tag=$(ISTIO_LATEST_IMAGE_TAG)' --set 'gateway.tag=$(ENVOY_LATEST_IMAGE_TAG)' --set 'global.local=true' --set 'apiserver.enabled=true' --set 'apiserver.serverAddr="http://nacos-service.higress-system.svc.cluster.local:8848"'
 
 uninstall:
 	helm uninstall higress -n higress-system

helm/core/templates/controller-deployment.yaml

@@ -361,8 +361,18 @@ spec:
       {{- end }}
       {{- if not .Values.global.enableHigressIstio }}
       - name: config
+        {{- if not .Values.apiserver.enabled }}
         configMap:
           name: higress-config
+        {{- end }}
+        {{- if .Values.apiserver.enabled }}
+        projected:
+          sources:
+          - configMap:
+              name: higress-config
+          - configMap:
+              name: higress-apiserver
+        {{- end }}
       # Technically not needed on this pod - but it helps debugging/testing SDS
       # Should be removed after everything works.
       - emptyDir:

tools/hack/gen-secret-configmap.sh

@@ -19,6 +19,7 @@ RSA_KEY_LENGTH=4096
 NAMESPACE="${NAMESPACE:-higress-system}"
 CLUSTER_NAME="${CLUSTER_NAME:-higress}"
 APISERVER_ADDRESS="${APISERVER_ADDRESS:-https://127.0.0.1:8443}"
+SECRET_NAME="${SECRET_NAME:-higress-apiserver}"
 
 initializeApiServer() {
   echo "Initializing API server configurations..."
@@ -78,8 +79,8 @@ applySecretConfigmap() {
 apiVersion: v1
 kind: Secret
 metadata:
-  name: higress-apiserver
-  namespace: higress-system
+  name: $SECRET_NAME
+  namespace: $NAMESPACE
 data:
   ca.crt: $(cat $VOLUMES_ROOT/api/ca.crt | base64 -w 0)
   ca.key: $(cat $VOLUMES_ROOT/api/ca.key | base64 -w 0)
@@ -94,7 +95,7 @@ EOF
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: higress-config
+  name: higress-apiserver
   namespace: $NAMESPACE
 data:
   kubeconfig: |