Merge pull request #10 from jianxiaoguo/main

chore(redis): use common affinity template

Author: duanhongyi

.drone/drone.yml

@@ -116,7 +116,7 @@ steps:
   commands:
   - IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo \"${DRONE_TAG:1}\" || echo \"canary\")
   - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/redis/values.yaml
-  - helm package charts/redis --version ${DRONE_TAG:-v1.0.0}
+  - helm package -u charts/redis --version ${DRONE_TAG:-v1.0.0}
   - curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@redis-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
   environment:
     CHARTMUSEUM_USERNAME:

charts/redis/Chart.yaml

@@ -1,7 +1,12 @@
 name: redis
 home: https://github.com/drycc/redis
-version: v1.0.0
+apiVersion: v2
+dependencies:
+  - name: common
+    repository: https://charts.drycc.cc/stable
+    version: 1.x.x
 description: A Redis database for use inside a Kubernetes cluster.
 maintainers:
   - name: Drycc Team
     email: engineering@drycc.com
+version: v1.0.0

charts/redis/templates/redis-statefulset.yaml

@@ -18,9 +18,7 @@ spec:
       labels:
         app: drycc-redis
     spec:
-      {{- if .Values.global.common }}
-      {{- include "common.affinity" (dict "key" "app" "values" (list "drycc-redis")) | indent 6 }}
-      {{- end }}
+      {{- include "common.affinities.nodes.soft" (dict "key" "app" "values" (list "drycc-redis")) | indent 6 }}
       containers:
       - name: drycc-redis
         image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/redis:{{ .Values.imageTag }}