diff --git a/.drone/drone.yml b/.drone/drone.yml index 3c311ad..1ef91a2 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -118,7 +118,7 @@ steps: commands: - IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo \"${DRONE_TAG:1}\" || echo \"canary\") - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/passport/values.yaml - - helm package charts/passport --version ${DRONE_TAG:-v1.0.0} + - helm package -u charts/passport --version ${DRONE_TAG:-v1.0.0} - 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" environment: CHARTMUSEUM_USERNAME: diff --git a/charts/passport/Chart.yaml b/charts/passport/Chart.yaml index 81e3433..40444ca 100644 --- a/charts/passport/Chart.yaml +++ b/charts/passport/Chart.yaml @@ -1,7 +1,12 @@ name: passport home: https://github.com/drycc/passport -version: v1.0.0 +apiVersion: v2 +dependencies: + - name: common + repository: https://charts.drycc.cc/stable + version: 1.x.x description: Drycc Workflow passport (API). maintainers: - name: Drycc Team email: engineering@drycc.com +version: v1.0.0 diff --git a/charts/passport/templates/passport-deployment.yaml b/charts/passport/templates/passport-deployment.yaml index e671c96..80dd754 100644 --- a/charts/passport/templates/passport-deployment.yaml +++ b/charts/passport/templates/passport-deployment.yaml @@ -22,9 +22,7 @@ spec: labels: app: drycc-passport spec: - {{- if .Values.global.common }} - {{- include "common.affinity" (dict "key" "app" "values" (list "drycc-passport")) | indent 6 }} - {{- end }} + {{- include "common.affinities.nodes.soft" (dict "key" "app" "values" (list "drycc-passport")) | indent 6 }} serviceAccount: drycc-passport initContainers: - name: drycc-passport-init