feat: support nacos storage

Makefile.core.mk

@@ -187,10 +187,7 @@ install-dev-wasmplugin: build-wasmplugins pre-install
 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 --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"'
-
-create-nacos:
-	kubectl apply -f tools/hack/conf/nacos.yaml
+	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"'
 
 uninstall:
 	helm uninstall higress -n higress-system
@@ -265,18 +262,18 @@ delete-cluster: $(tools/kind) ## Delete kind cluster.
 .PHONY: kube-load-image
 kube-load-image: $(tools/kind) ## Install the Higress image to a kind cluster using the provided $IMAGE and $TAG.
 	tools/hack/kind-load-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/higress $(TAG)
-	#tools/hack/docker-pull-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/dubbo-provider-demo 0.0.3-x86
-	#tools/hack/docker-pull-image.sh docker.io/alihigress/nacos-standlone-rc3 1.0.0-RC3
-	#tools/hack/docker-pull-image.sh docker.io/hashicorp/consul 1.16.0
-	#tools/hack/docker-pull-image.sh docker.io/charlie1380/eureka-registry-provider v0.3.0
-	#tools/hack/docker-pull-image.sh docker.io/bitinit/eureka latest
-	#tools/hack/docker-pull-image.sh docker.io/alihigress/httpbin 1.0.2
-	#tools/hack/kind-load-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/dubbo-provider-demo 0.0.3-x86
-	#tools/hack/kind-load-image.sh docker.io/alihigress/nacos-standlone-rc3 1.0.0-RC3
-	#tools/hack/kind-load-image.sh docker.io/hashicorp/consul 1.16.0
-	#tools/hack/kind-load-image.sh docker.io/alihigress/httpbin 1.0.2
-	#tools/hack/kind-load-image.sh docker.io/charlie1380/eureka-registry-provider v0.3.0
-	#tools/hack/kind-load-image.sh docker.io/bitinit/eureka latest
+	tools/hack/docker-pull-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/dubbo-provider-demo 0.0.3-x86
+	tools/hack/docker-pull-image.sh docker.io/swsk33/nacos-standalone 2.2.3
+	tools/hack/docker-pull-image.sh docker.io/hashicorp/consul 1.16.0
+	tools/hack/docker-pull-image.sh docker.io/charlie1380/eureka-registry-provider v0.3.0
+	tools/hack/docker-pull-image.sh docker.io/bitinit/eureka latest
+	tools/hack/docker-pull-image.sh docker.io/alihigress/httpbin 1.0.2
+	tools/hack/kind-load-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/dubbo-provider-demo 0.0.3-x86
+	tools/hack/kind-load-image.sh docker.io/swsk33/nacos-standalone 2.2.3
+	tools/hack/kind-load-image.sh docker.io/hashicorp/consul 1.16.0
+	tools/hack/kind-load-image.sh docker.io/alihigress/httpbin 1.0.2
+	tools/hack/kind-load-image.sh docker.io/charlie1380/eureka-registry-provider v0.3.0
+	tools/hack/kind-load-image.sh docker.io/bitinit/eureka latest
 # run-higress-e2e-test starts to run ingress e2e tests.
 .PHONY: run-higress-e2e-test
 run-higress-e2e-test:

docker/Dockerfile.higress

@@ -16,8 +16,7 @@ COPY ${TARGETARCH:-amd64}/higress /usr/local/bin/higress
 COPY wait-for-apiserver.sh /usr/local/bin/wait-for-apiserver.sh
 COPY run-higress.sh /usr/local/bin/run-higress.sh
 
-RUN chmod +x /usr/local/bin/wait-for-apiserver.sh
-RUN chmod +x /usr/local/bin/run-higress.sh
+RUN chmod +x /usr/local/bin/*.sh
 
 USER 1337:1337
 

helm/core/templates/configmap.yaml

@@ -110,7 +110,7 @@ data:
     apiVersion: v1
     kind: Config
     clusters:
-      - name: {{ .Release.Namespace }}
+      - name: {{ .Values.clusterName | default "higress" }}
         cluster:
           server: https://{{ .Values.apiserver.addr }}:{{ .Values.apiserver.securePort }}
           insecure-skip-tls-verify: true

helm/core/templates/controller-service.yaml

@@ -25,7 +25,7 @@ spec:
       protocol: TCP
     {{- if .Values.apiserver.enabled }}
     - port: {{ .Values.apiserver.securePort }}
-      name: https-apiserver # mTLS with k8s-signed cert
+      name: https-apiserver
       protocol: TCP
       targetPort: {{ .Values.apiserver.securePort }}
     {{- end }}

helm/core/values.yaml

@@ -632,7 +632,6 @@ apiserver:
   password: ""
   namespaceID: ""
   rsaKeyLength: 4096
-  serviceName: "higress-controller"
 
 # Skywalking config settings
 skywalking:

test/e2e/conformance/base/nacos.yaml

@@ -31,9 +31,10 @@ metadata:
 spec:
   containers:
   - name: nacos-standlone-rc3
-    image: registry.cn-hangzhou.aliyuncs.com/hinsteny/nacos-standlone-rc3:1.0.0-RC3 
+    image: swsk33/nacos-standalone:2.2.3
     ports:
     - containerPort: 8848
+    - containerPort: 9848
 ---
 apiVersion: v1
 kind: Service
@@ -47,3 +48,5 @@ spec:
   ports:
   - name: foo # name is not required for single-port Services
     port: 8848
+  - name: bar
+    port: 9848