update helm deploy nacos v1.2.1

helm/CHANGELOG.md

@@ -0,0 +1,17 @@
+**Note:** This file is automatically generated. Please see the [developer
+documentation](doc/development/changelog.md) for instructions on adding your own
+entry.
+
+## 0.1.0 (2020-02-31)
+
+### Other (1 change)
+
+- Update helm deploy nacos
+
+
+## 0.1.1 (2020-04-26)
+
+### Other (1 change)
+
+- Update nacos mysql
+

helm/Chart.yaml

@@ -1,7 +1,12 @@
 apiVersion: v1
 appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: nacos
-version: 0.1.0
+description: use helm to deloy nacos cluster.
+home: https://nacos.io/en-us/
+icon: https://nacos.io/img/nacos.png
 maintainers:
-- name: arrowfeng
+- email: [email protected]
+  name: arrowfeng
+name: nacos
+sources:
+- https://github.com/nacos-group/nacos-k8s
+version: 0.1.1

helm/README.md

@@ -9,19 +9,44 @@ This project is based on the Helm Chart packaged by [nacos-k8s](https://github.c
 ## Prerequisites
 
  - Kubernetes 1.10+ 
- - Helm v3 
+ - Helm v2+ 
  - PV provisioner support in the underlying infrastructure
 
 ## Installing the Chart
 
+To install nfs-client-provisioner,Must have NFS server first:
+
+```shell
+$ helm repo add stable https://kubernetes-charts.storage.googleapis.com
+$ helm repo update
+$ helm install --namespace kube-system  \
+--set nfs.server=192.168.1.2 --set nfs.path=/k8s-data --set storageClass.reclaimPolicy=Retain \
+--set storageClass.defaultClass=true,storageClass.name=nfs \
+--name nfs-client-provisioner stable/nfs-client-provisioner --version=1.2.8
+```
+
+
+
 To install the chart with `release name`:
 
 ```shell
-$ helm install `release name` ./nacos
+$ helm repo update
+$ helm dependency update
+$ helm install --namespace `name` --set global.mode=cluster --name `release name` ./nacos
 ```
 
 The command deploys Nacos on the Kubernetes cluster in the default configuration. It will run without a mysql chart and persistent volume. The [configuration](#configuration) section lists the parameters that can be configured during installation. 
 
+Update nacos to the latest version
+
+```shell
+$ helm upgrade `release name` \
+--set mysql.image=nacos/nacos-mysq,mysql.imageTag=latest \
+--set image.repository=nacos/nacos-server,image.tag=latest \
+--set plugins.repository=nacos/nacos-peer-finder-plugin,plugins.tag=latest \
+./nacos
+```
+
 ### Service & Configuration Management
 
 #### Service registration
@@ -145,5 +170,5 @@ $ kubectl scale sts `release name`-nacos --replicas=3
 ![img](../images/cluster2.png)
 
  * Use kubectl exec to get the cluster config of the Pods in the nacos StatefulSet after scale StatefulSets
- 
+
 ![img](../images/cluster3.png)

helm/requirements.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: mysql
+  repository: https://kubernetes-charts.storage.googleapis.com
+  version: 1.6.3
+digest: sha256:15c35804b0f493351f12c6fe039a3837e9e02d2ac9cf62a0b6fa85e26044b96e
+generated: "2020-04-25T21:45:10.90741954+08:00"

helm/requirements.yaml

@@ -0,0 +1,6 @@
+dependencies:
+- name: mysql
+  version: 1.6.3
+  repository: https://kubernetes-charts.storage.googleapis.com
+  condition: mysql.install
+  alias: mysql

helm/templates/NOTES.txt

@@ -23,4 +23,4 @@
 2. MODE: 
    quickstart: you need to modify replicaCount in the values.yaml, .Values.replicaCount=1
    standalone: you need to modify replicaCount in the values.yaml, .Values.replicaCount=1
-   cluster: kubectl scale sts {{ .Release.Namespace }}-nacos --replicas=3
+   cluster: kubectl -n {{ .Release.Namespace }} scale sts {{ include "nacos.fullname" . }} --replicas=3

helm/templates/deployment.yaml → helm/templates/StatefulSet.yaml

@@ -24,8 +24,8 @@ spec:
 {{- if eq .Values.global.mode "cluster" }}
       initContainers:
         - name: peer-finder-plugin-install
-          image: nacos/nacos-peer-finder-plugin:1.0
-          imagePullPolicy: Always
+          image: "{{ .Values.plugins.repository }}:{{ .Values.plugins.tag}}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             - mountPath: /home/nacos/plugins/peer-finder
               name: plugindir
@@ -91,7 +91,7 @@ spec:
           - name: SERVICE_NAME
             value: "nacos-hs"
           - name: DOMAIN_NAME
-            value: {{ .Values.env.domainNmae | quote }}
+            value: {{ .Values.env.domainName | quote }}
           - name: POD_NAMESPACE
             valueFrom:
               fieldRef:

helm/templates/configmap.yaml

@@ -5,9 +5,9 @@ metadata:
   name: nacos-cm
 data:
   {{- with .Values.mysql }}
-  mysql.db.name: {{ .database }}
+  mysql.db.name: {{ .mysqlDatabase }}
   mysql.port: "3306"
-  mysql.user: {{ .user }}
-  mysql.password: {{ .password }}
+  mysql.user: {{ .mysqlUser }}
+  mysql.password: {{ .mysqlPassword }}
   {{- end }}
 {{- end }}

helm/templates/ingress.yaml

@@ -1,6 +1,11 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "nacos.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -30,7 +35,7 @@ spec:
           - path: {{ . }}
             backend:
               serviceName: nacos-cs
-              servicePort: http
+              servicePort: {{ $svcPort }}
         {{- end }}
   {{- end }}
 {{- end }}