Skip to content

Commit cf92044

Browse files
author
lijianguo
committed
chore(passport): use common affinity template
1 parent 1f62830 commit cf92044

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

.drone/drone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ steps:
118118
commands:
119119
- IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo \"${DRONE_TAG:1}\" || echo \"canary\")
120120
- sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/passport/values.yaml
121-
- helm package charts/passport --version ${DRONE_TAG:-v1.0.0}
121+
- helm package -u charts/passport --version ${DRONE_TAG:-v1.0.0}
122122
- curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@passport-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
123123
environment:
124124
CHARTMUSEUM_USERNAME:

charts/passport/Chart.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
name: passport
22
home: https://github.com/drycc/passport
3-
version: v1.0.0
3+
apiVersion: v2
4+
dependencies:
5+
- name: common
6+
repository: https://charts.drycc.cc/stable
7+
version: 1.x.x
48
description: Drycc Workflow passport (API).
59
maintainers:
610
- name: Drycc Team
711
email: engineering@drycc.com
12+
version: v1.0.0

charts/passport/templates/passport-deployment.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ spec:
2222
labels:
2323
app: drycc-passport
2424
spec:
25-
{{- if .Values.global.common }}
26-
{{- include "common.affinity" (dict "key" "app" "values" (list "drycc-passport")) | indent 6 }}
27-
{{- end }}
25+
{{- include "common.affinities.nodes.soft" (dict "key" "app" "values" (list "drycc-passport")) | indent 6 }}
2826
serviceAccount: drycc-passport
2927
initContainers:
3028
- name: drycc-passport-init

0 commit comments

Comments
 (0)