refactor: rename wsj-standup to wsj-drink (safe to do, this is a fork)

- forked
- renamed the helm chart

.gitlab-ci.yml

@@ -22,6 +22,6 @@ deploy:prod:
   environment:
     name: prod
   script:
-    - 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
+    - helm upgrade --install wsj-drink ./deploy/charts/wsj-drink --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"'

deploy/charts/wsj-drink/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: wsj-standup
+name: wsj-drink
 description: A Helm chart for Kubernetes
 type: application
 # SemVer

deploy/charts/wsj-drink/templates/_helpers.tpl

@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "wsj-standup.name" -}}
+{{- define "wsj-drink.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "wsj-standup.fullname" -}}
+{{- define "wsj-drink.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "wsj-standup.chart" -}}
+{{- define "wsj-drink.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "wsj-standup.labels" -}}
-helm.sh/chart: {{ include "wsj-standup.chart" . }}
-{{ include "wsj-standup.selectorLabels" . }}
+{{- define "wsj-drink.labels" -}}
+helm.sh/chart: {{ include "wsj-drink.chart" . }}
+{{ include "wsj-drink.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "wsj-standup.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "wsj-standup.name" . }}
+{{- define "wsj-drink.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "wsj-drink.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "wsj-standup.serviceAccountName" -}}
+{{- define "wsj-drink.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "wsj-standup.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "wsj-drink.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}

deploy/charts/wsj-drink/templates/configmap.yml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "wsj-standup.fullname" . }}-config
+  name: {{ include "wsj-drink.fullname" . }}-config
 data:
   WEBHOOK_URL: {{ .Values.app.WEBHOOK_URL }}
   SENTRY_DSN: {{ .Values.app.SENTRY_DSN }}

deploy/charts/wsj-drink/templates/job.yaml

@@ -1,9 +1,9 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: {{ include "wsj-standup.fullname" . }}-job
+  name: {{ include "wsj-drink.fullname" . }}-job
 spec:
-  schedule: "0 8 * * 1"
+  schedule: "0 7-21 * * *"
   jobTemplate:
     spec:
       backoffLimit: 4
@@ -13,9 +13,9 @@ spec:
         spec:
           {{- if .Values.image.pullSecretBase64 }}
           imagePullSecrets:
-            - name: {{ include "wsj-standup.fullname" . }}-registry-credentials
+            - name: {{ include "wsj-drink.fullname" . }}-registry-credentials
           {{- end }}
-          serviceAccountName: {{ include "wsj-standup.serviceAccountName" . }}
+          serviceAccountName: {{ include "wsj-drink.serviceAccountName" . }}
           containers:
           - name: {{ .Chart.Name }}
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -24,5 +24,5 @@ spec:
               {{- toYaml .Values.resources | nindent 14 }}
             envFrom:
             - configMapRef:
-                name: {{ include "wsj-standup.fullname" . }}-config
+                name: {{ include "wsj-drink.fullname" . }}-config
           restartPolicy: OnFailure

deploy/charts/wsj-drink/templates/registry-secret.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "wsj-standup.fullname" . }}-registry-credentials
+  name: {{ include "wsj-drink.fullname" . }}-registry-credentials
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ .Values.image.pullSecretBase64 }}

deploy/charts/wsj-drink/templates/serviceaccount.yaml

@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "wsj-standup.serviceAccountName" . }}
+  name: {{ include "wsj-drink.serviceAccountName" . }}
   labels:
-    {{- include "wsj-standup.labels" . | nindent 4 }}
+    {{- include "wsj-drink.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

deploy/charts/wsj-drink/values.yaml

@@ -1,5 +1,5 @@
 image:
-  repository: registry.mareshq.com/skaut/wsj/standup-discord-notification
+  repository: registry.mareshq.com/skaut/wsj/drink-notification
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""