diff --git a/.env b/.env index 9487cac..487ddd6 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ REGISTRY_PREFIX=harbor.sheldan.dev/oneplus-bot/ ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/ VERSION=1.6.34 -ABSTRACTO_VERSION=1.5.51 \ No newline at end of file +ABSTRACTO_VERSION=1.5.57 \ No newline at end of file diff --git a/deployment/helm/oneplus-bot/templates/api-keys.yaml b/deployment/helm/oneplus-bot/templates/api-keys.yaml index 7c7dd30..ea3c3b3 100644 --- a/deployment/helm/oneplus-bot/templates/api-keys.yaml +++ b/deployment/helm/oneplus-bot/templates/api-keys.yaml @@ -4,4 +4,5 @@ metadata: name: api-keys data: discordToken: {{ $.Values.apiKeys.discord.token | b64enc }} # b64enc is needed, because a stringData secret field cannot hold numeric values - youtubeApiKey: {{ $.Values.apiKeys.youtube.apiKey | b64enc }} \ No newline at end of file + youtubeApiKey: {{ $.Values.apiKeys.youtube.apiKey | b64enc }} + freeCurrencyApiApiKey: {{ $.Values.apiKeys.freeCurrencyApi.apiKey | b64enc }} \ No newline at end of file diff --git a/deployment/helm/oneplus-bot/templates/deployment.yaml b/deployment/helm/oneplus-bot/templates/deployment.yaml index 404d6cb..13f4715 100644 --- a/deployment/helm/oneplus-bot/templates/deployment.yaml +++ b/deployment/helm/oneplus-bot/templates/deployment.yaml @@ -75,6 +75,11 @@ spec: key: youtubeApiKey - name: PRIVATE_REST_API_HOST value: "{{ .Values.privateRestApi.service.name }}.{{ .Release.Namespace }}.svc.cluster.local" + - name: FREE_CURRENCY_API_API_KEY + valueFrom: + secretKeyRef: + name: api-keys + key: freeCurrencyApiApiKey - name: PRIVATE_REST_API_PORT value: "{{ .Values.privateRestApi.service.targetPort }}" - name: FRONTEND_BASE diff --git a/deployment/helm/oneplus-bot/values.yaml b/deployment/helm/oneplus-bot/values.yaml index 874bbbe..f1e8ffe 100644 --- a/deployment/helm/oneplus-bot/values.yaml +++ b/deployment/helm/oneplus-bot/values.yaml @@ -22,7 +22,7 @@ templateDeployment: repository: harbor.sheldan.dev/abstracto pullPolicy: Always image: abstracto-template-deployment - tag: 1.5.51 + tag: 1.5.57 templateDeploymentData: repository: harbor.sheldan.dev/oneplus-bot pullPolicy: Always @@ -33,7 +33,7 @@ dbConfigDeployment: repository: harbor.sheldan.dev/abstracto pullPolicy: Always image: abstracto-db-deployment - tag: 1.5.51 + tag: 1.5.57 dbConfigDeploymentData: repository: harbor.sheldan.dev/oneplus-bot pullPolicy: Always @@ -138,6 +138,8 @@ apiKeys: twitch: secret: null clientId: null + freeCurrencyApi: + apiKey: null imagePullSecrets: null nameOverride: '' fullnameOverride: '' diff --git a/pom.xml b/pom.xml index f1aa897..a0aeb72 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ 17 17 - 1.5.51 - 1.4.46 + 1.5.57 + 1.4.49 diff --git a/templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/commands/ban/ban_notification_text.ftl b/templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/default/commands/ban/ban_notification_text.ftl similarity index 100% rename from templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/commands/ban/ban_notification_text.ftl rename to templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/default/commands/ban/ban_notification_text.ftl