diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 903c5f2..4642940 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,6 @@ deploy:prod: environment: name: prod script: - - helm --kubeconfig $KUBECONFIG upgrade --install --namespace wsj wsj-standup ./deploy/chart/wsj-standup --set image.tag=$IMAGE_TAG --set=app.WEBHOOK_URL $DISCORD_WEBHOOK_URL --set app.SENTRY_DSN=$SENTRY_DSN --set image.pullSecretBase64=$REGISTRY_PULL_SECRET_BASE64 + - helm upgrade --install wsj-standup ./deploy/charts/wsj-standup --namespace wsj --set image.tag=$IMAGE_TAG --set=app.WEBHOOK_URL=$DISCORD_WEBHOOK_URL --set app.SENTRY_DSN=$SENTRY_DSN --set image.pullSecretBase64=$REGISTRY_PULL_SECRET_BASE64 rules: - if: '$CI_COMMIT_BRANCH == "main"' diff --git a/app.js b/app.js index 897b1cd..ea6895b 100644 --- a/app.js +++ b/app.js @@ -23,13 +23,12 @@ const config = { } const message = { - "content": "**Čas na další standup!**\nAhoj všichni, je pondělí a je tedy čas na další standup!\n\ncc @here", + "content": "**Čas na další standup!**\nAhoj všichni, je pondělí a je tedy čas na další standup!\n\ncc @everyone", "embeds": [ { "title": "HELP: WTF is Standup?", "description": "Krátké sepsání na čem pracujete, třeba v bodech. Co máte hotové z aktuálního sprintu, na čem pracujete, co vás ještě čeká, případné překážky nebo zda s něčím potřebujete pomoc.", - "color": 5814783, - "timestamp": (new Date()).toISOString() // "2022-05-24T22:00:00.000Z" + "color": 5814783 } ], "attachments": [] diff --git a/deploy/chart/wsj-standup/.helmignore b/deploy/charts/wsj-standup/.helmignore similarity index 100% rename from deploy/chart/wsj-standup/.helmignore rename to deploy/charts/wsj-standup/.helmignore diff --git a/deploy/chart/wsj-standup/Chart.yaml b/deploy/charts/wsj-standup/Chart.yaml similarity index 100% rename from deploy/chart/wsj-standup/Chart.yaml rename to deploy/charts/wsj-standup/Chart.yaml diff --git a/deploy/chart/wsj-standup/templates/_helpers.tpl b/deploy/charts/wsj-standup/templates/_helpers.tpl similarity index 100% rename from deploy/chart/wsj-standup/templates/_helpers.tpl rename to deploy/charts/wsj-standup/templates/_helpers.tpl diff --git a/deploy/chart/wsj-standup/templates/configmap.yml b/deploy/charts/wsj-standup/templates/configmap.yml similarity index 100% rename from deploy/chart/wsj-standup/templates/configmap.yml rename to deploy/charts/wsj-standup/templates/configmap.yml diff --git a/deploy/chart/wsj-standup/templates/job.yaml b/deploy/charts/wsj-standup/templates/job.yaml similarity index 91% rename from deploy/chart/wsj-standup/templates/job.yaml rename to deploy/charts/wsj-standup/templates/job.yaml index 17ba4e4..5e95f2c 100644 --- a/deploy/chart/wsj-standup/templates/job.yaml +++ b/deploy/charts/wsj-standup/templates/job.yaml @@ -3,7 +3,7 @@ kind: CronJob metadata: name: {{ include "wsj-standup.fullname" . }}-job spec: - schedule: "* * * * *" + schedule: "0 8 * * 1" jobTemplate: spec: backoffLimit: 4 @@ -11,7 +11,7 @@ spec: ttlSecondsAfterFinished: 300 template: spec: - {{- with .Values.image.pullSecretBase64 }} + {{- if .Values.image.pullSecretBase64 }} imagePullSecrets: - name: {{ include "wsj-standup.fullname" . }}-registry-credentials {{- end }} diff --git a/deploy/chart/wsj-standup/templates/registry-secret.yaml b/deploy/charts/wsj-standup/templates/registry-secret.yaml similarity index 100% rename from deploy/chart/wsj-standup/templates/registry-secret.yaml rename to deploy/charts/wsj-standup/templates/registry-secret.yaml diff --git a/deploy/chart/wsj-standup/templates/serviceaccount.yaml b/deploy/charts/wsj-standup/templates/serviceaccount.yaml similarity index 100% rename from deploy/chart/wsj-standup/templates/serviceaccount.yaml rename to deploy/charts/wsj-standup/templates/serviceaccount.yaml diff --git a/deploy/chart/wsj-standup/values.yaml b/deploy/charts/wsj-standup/values.yaml similarity index 95% rename from deploy/chart/wsj-standup/values.yaml rename to deploy/charts/wsj-standup/values.yaml index af4fcfd..8add9a2 100644 --- a/deploy/chart/wsj-standup/values.yaml +++ b/deploy/charts/wsj-standup/values.yaml @@ -1,6 +1,6 @@ image: repository: registry.mareshq.com/skaut/wsj/standup-discord-notification - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "" pullSecretBase64: null