feat: support nacos storage #796
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| {{- if .Values.nacos.enabled }} | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: {{ .Values.nacos.name }}-service | ||
| namespace: {{ .Release.Namespace }} | ||
| spec: | ||
| type: {{ .Values.nacos.service.type }} | ||
| ports: | ||
| - port: {{ .Values.nacos.service.port }} | ||
| targetPort: {{ .Values.nacos.service.port }} | ||
| protocol: TCP | ||
| name: http | ||
| - port: {{ add .Values.nacos.service.port 1000}} | ||
| name: client-rpc | ||
| targetPort: {{add .Values.nacos.service.port 1000}} | ||
| - port: {{add .Values.nacos.service.port 1001}} | ||
| name: raft-rpc | ||
| targetPort: {{add .Values.nacos.service.port 1001}} | ||
| - port: 7848 | ||
| name: old-raft-rpc | ||
| targetPort: 7848 | ||
| protocol: TCP | ||
| {{- if eq .Values.nacos.service.type "NodePort" }} | ||
| nodePort: {{ .Values.nacos.service.nodePort }} | ||
| {{- end }} | ||
| selector: | ||
| app.kubernetes.io/name: {{ .Values.nacos.name }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| {{- end}} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| {{- if .Values.nacos.enabled }} | ||
| apiVersion: apps/v1 | ||
| kind: StatefulSet | ||
| metadata: | ||
| name: {{ .Values.nacos.name }} | ||
| namespace: {{ .Release.Namespace }} | ||
| annotations: | ||
| {{- toYaml .Values.nacos.annotations | indent 4 }} | ||
| spec: | ||
| serviceName: {{ .Values.nacos.name }}-service | ||
| replicas: {{ .Values.nacos.replica }} | ||
| {{- if .Values.nacos.podManagementPolicy }} | ||
| podManagementPolicy: {{ .Values.nacos.podManagementPolicy }} | ||
| {{- else}} | ||
| podManagementPolicy: OrderedReady | ||
| {{- end }} | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/name: {{ .Values.nacos.name }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: {{ .Values.nacos.name }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| spec: | ||
| {{- with .Values.nacos.nodeSelector }} | ||
| nodeSelector: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.nacos.affinity }} | ||
| affinity: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.nacos.tolerations }} | ||
| tolerations: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| containers: | ||
| - name: {{ .Values.nacos.name }} | ||
| image: "{{ .Values.nacos.hub }}:{{ .Values.nacos.tag }}" | ||
| imagePullPolicy: {{ .Values.nacos.pullPolicy }} | ||
| startupProbe: | ||
| initialDelaySeconds: 180 | ||
| periodSeconds: 5 | ||
| timeoutSeconds: 10 | ||
| httpGet: | ||
| scheme: HTTP | ||
| port: {{ .Values.nacos.service.port }} | ||
| path: /nacos/v1/console/health/readiness | ||
| livenessProbe: | ||
| initialDelaySeconds: 10 | ||
| periodSeconds: 5 | ||
| timeoutSeconds: 10 | ||
| httpGet: | ||
| scheme: HTTP | ||
| port: {{ .Values.nacos.service.port }} | ||
| path: /nacos/v1/console/health/liveness | ||
| ports: | ||
| - name: http | ||
| containerPort: {{ .Values.nacos.service.port }} | ||
| protocol: TCP | ||
| - containerPort: {{ add .Values.nacos.service.port 1000}} | ||
| name: client-rpc | ||
| - containerPort: {{ add .Values.nacos.service.port 1001 }} | ||
| name: raft-rpc | ||
| - containerPort: 7848 | ||
| name: old-raft-rpc | ||
| resources: | ||
| {{- toYaml .Values.nacos.resources | nindent 12 }} | ||
| env: | ||
| - name: NACOS_SERVER_PORT | ||
| value: {{ .Values.nacos.service.port | quote }} | ||
| - name: NACOS_APPLICATION_PORT | ||
| value: {{ .Values.nacos.service.port | quote }} | ||
| - name: PREFER_HOST_MODE | ||
| value: {{ .Values.nacos.preferHostMode | quote }} | ||
| - name: MODE | ||
| value: "standalone" | ||
| - name: EMBEDDED_STORAGE | ||
| value: embedded | ||
| volumeMounts: | ||
| - name: data | ||
| mountPath: /home/nacos/plugins/peer-finder | ||
| subPath: peer-finder | ||
| - name: data | ||
| mountPath: /home/nacos/data | ||
| subPath: data | ||
| - name: data | ||
| mountPath: /home/nacos/logs | ||
| subPath: logs | ||
| {{- if not .Values.nacos.persistence.enabled }} | ||
| volumes: | ||
| - name: data | ||
| emptyDir: { } | ||
| {{- end }} | ||
| {{- if .Values.nacos.persistence.enabled }} | ||
| volumeClaimTemplates: | ||
| - metadata: | ||
| name: data | ||
| spec: | ||
| {{- toYaml .Values.nacos.persistence.data | nindent 8 }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -651,7 +651,7 @@ apiserver: | |
| imagePullPolicy: IfNotPresent | ||
| securePort: 8443 | ||
| storage: nacos | ||
| serverAddr: http://higress-nacos-service.higress-system.svc.cluster.local:8848 | ||
|
There was a problem hiding this comment. serverAddr 建议改名为 storageAddr，否则容易误解。 There was a problem hiding this comment. 我觉得可以的。之前也考虑过能不能让 nacos 直接支持这种配置方式。短时间可以在生成配置的时候处理一下。 There was a problem hiding this comment. 只让用户配置 There was a problem hiding this comment. 或者直接让用户配置 |
||
| username: "" | ||
| password: "" | ||
| namespaceID: "" | ||
|
|
@@ -663,3 +663,35 @@ skywalking: | |
| service: | ||
| address: ~ | ||
| port: 11800 | ||
|
|
||
| # nacos config settings | ||
| nacos: | ||
| name: "higress-nacos" | ||
| enabled: false | ||
| hub: nacos/nacos-server | ||
| tag: latest | ||
| pullPolicy: IfNotPresent | ||
| replica: 1 | ||
| podManagementPolicy: Parallel | ||
| nodeSelector: { } | ||
| affinity: { } | ||
| tolerations: [ ] | ||
| persistence: | ||
| enabled: false | ||
| data: | ||
| accessModes: | ||
| - ReadWriteOnce | ||
| storageClassName: manual | ||
| resources: | ||
| requests: | ||
| storage: 5Gi | ||
| service: | ||
| port: 8848 | ||
| type: NodePort | ||
| nodePort: 30000 | ||
|
There was a problem hiding this comment. 不需要的，也可以改成clusterip，我给改一下 |
||
| annotations: {} | ||
| preferHostMode: hostname | ||
| resources: | ||
| requests: | ||
| cpu: 500m | ||
| memory: 2Gi | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里格式处理一下吧。另外，什么情况下需要用到 NodePort 呢，还只有 7848？