Merge pull request 'Fix ingress root values' (#20) from develop into master

Reviewed-on: #20

.gitea/workflows/build-and-push.yml

@@ -2,13 +2,8 @@ name: Build and Push Docker Image
 
 on:
   push:
-    branches:
-      - master
     tags:
       - 'build_*'
-  pull_request:
-    branches:
-      - master
 
 env:
   REGISTRY: rgy.angels-dev.fr

deploy/Chart.yaml

@@ -6,7 +6,7 @@ name: bot_tamiseur
 
 # Version du chart : doit changer si l'application change ou si la configuration du chart change
 #version: 1
-version: "1"
+version: "1.1.0"
 
 # icon (optionnel) mais génère un warning avec "helm lint"
 icon: https://helm.sh/img/helm-logo.svg

deploy/templates/ingress.yaml

@@ -1,32 +1,48 @@
-{{- if .Values.ingress.enabled }}
+{{- $ingress := .Values.ingress -}}
+{{- if $ingress.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ $.Release.Name }}
+  {{- with $ingress.annotations }}
   annotations:
-    external-dns.alpha.kubernetes.io/target: omegamaestro.{{ .Values.ingress.domain }}
-    cert-manager.io/cluster-issuer: {{ .Values.ingress.issuer }}
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
-    {{- if .Values.ingress.geoip }}
-    nginx.ingress.kubernetes.io/server-snippet: |
-      if ($lan = yes) { set $allowed_country yes; }
-      if ($allowed_country = no) { return 451; }
+    {{- range $key, $value := . }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+  labels:
+    {{- range $key, $value := $ingress.labels }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
     {{- end }}
 spec:
-  ingressClassName: {{ .Values.ingress.class }}
+  {{- if $ingress.ingressClassName }}
+  ingressClassName: {{ $ingress.ingressClassName }}
+  {{- end }}
+  {{- if $ingress.tls }}
   tls:
-  - hosts:
-    - {{ .Values.ingress.subdomain }}.{{ .Values.ingress.domain }}
-    secretName: {{ .Release.Name }}-tls
+    {{- range $ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ tpl . $ | quote }}
+      {{- end }}
+      {{- with .secretName }}
+      secretName: {{ tpl . $ }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
   rules:
-  - host: "{{ .Values.ingress.subdomain }}.{{ .Values.ingress.domain }}"
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: "{{ .Release.Name }}-{{ .Values.service.name }}"
-            port:
-              name: {{ .Values.service.name }}
-{{- end }}
+    {{- range $ingress.rules }}
+    - host: {{ tpl .host $ | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ tpl .path $ | quote }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: "{{ $.Release.Name }}-{{ $.Values.service.name }}"
+                port:
+                  name: {{ $.Values.service.name }}
+          {{- end }}
+    {{- end }}
+{{- end -}}

deploy/values.yaml

@@ -3,7 +3,7 @@ deployment:
   strategy: RollingUpdate
   image:
     repository: "rgy.angels-dev.fr/prod/bot_tamiseur"
-    tag: "build_2025-06-10_01h49"
+    tag: "build_2025-08-19_22h46"
     pullPolicy: IfNotPresent
   env:
     NODE_ENV: "production"
@@ -23,9 +23,25 @@ service:
   name: twurple
 
 ingress:
-  enabled: true
-  class: nginx
-  subdomain: dcb-chantier.prd
-  domain: angels-dev.fr
-  issuer: letsencrypt-prod
-  geoip: false
+  # If `true`, an Ingress is created
+  enabled: false
+  # The name of the Ingress Class associated with this ingress
+  ingressClassName: ""
+  # Ingress annotations
+  annotations: {}
+  # Additional Ingress labels
+  labels: {}
+  # List of rules for the Ingress
+  rules:
+    -
+      # Ingress host
+      host: discord.example.com
+      # Paths for the host
+      paths:
+        - path: /
+          pathType: Prefix
+  # TLS configuration
+  tls: []
+  #  - hosts:
+  #      - discord.example.com
+  #    secretName: ""

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "bot_tamiseur",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "bot_tamiseur",
-			"version": "4.0.0",
+			"version": "4.0.1",
 			"dependencies": {
 				"@discord-player/extractor": "^7.1.0",
 				"@discordjs/voice": "^0.18.0",

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "bot_tamiseur",
 	"description": "Listen to music and use fun commands with your friends!",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"author": {
 		"name": "Zachary Guénot"
 	},

src/commands/player/play.ts

@@ -83,6 +83,7 @@ export async function execute(interaction: ChatInputCommandInteraction) {
 	const result = await player.search(query, { requestedBy: interaction.user })
 	if (!result.hasTracks()) return interaction.followUp({ content: t(interaction.locale, "player.no_track_found", { query }), flags: MessageFlags.Ephemeral })
 	const track = result.tracks[0]
+	if (process.env.NODE_ENV === "development") console.log(query, result, track)
 
 	const entry = queue.tasksQueue.acquire()
 	await entry.getTask()
@@ -106,6 +107,7 @@ export async function autocompleteRun(interaction: AutocompleteInteraction) {
 
 	const resultsSpotify = await player.search(query, { searchEngine: `ext:${SpotifyExtractor.identifier}` })
 	const resultsYouTube = await player.search(query, { searchEngine: `ext:${YoutubeiExtractor.identifier}` })
+	if (process.env.NODE_ENV === "development") console.log(resultsSpotify, resultsYouTube)
 
 	const tracksSpotify = resultsSpotify.tracks.slice(0, 5).map(t => ({
 		name: `Spotify: ${`${t.title} - ${t.author} (${t.duration})`.length > 75 ? `${`${t.title} - ${t.author}`.substring(0, 75)}... (${t.duration})` : `${t.title} - ${t.author} (${t.duration})`}`,

src/events/client/ready.ts

@@ -27,7 +27,6 @@ export async function execute(client: Client) {
 	const mongo_url = `mongodb://${process.env.MONGOOSE_USER}:${process.env.MONGOOSE_PASSWORD}@${process.env.MONGOOSE_HOST}/${process.env.MONGOOSE_DATABASE}`
 	await connect(mongo_url).catch(console.error)
 
-	if (process.env.NODE_ENV === "development") await twitchClient.eventSub.deleteAllSubscriptions()
 	const streamerIds: string[] = []
 
 	await Promise.all(client.guilds.cache.map(async guild => {
@@ -71,6 +70,10 @@ export async function execute(client: Client) {
 			if (!user) { logConsole('twitch', 'ready.user_not_found', { guild: guild.name, userId: streamer.twitchUserId }); return }
 
 			const userSubs = await twitchClient.eventSub.getSubscriptionsForUser(streamer.twitchUserId)
+			if (process.env.NODE_ENV === "development") {
+				console.log(userSubs)
+				userSubs.data.forEach(sub => { console.log(sub) })
+			}
 			if (!userSubs.data.find(sub => sub.transportMethod === "webhook" && sub.type === "stream.online")) {
 				// eslint-disable-next-line @typescript-eslint/no-misused-promises
 				listener.onStreamOnline(streamer.twitchUserId, onlineSub)
@@ -106,8 +109,6 @@ export async function execute(client: Client) {
 				logConsole('twitch', 'ready.stream_offline_cleanup', { guild: guild.name, userName: user.name })
 				await cleanupMessageId(guildProfile, streamer.twitchUserId)
 			}
-
-			logConsole('twitch', 'user_operational', { name: user.name, id: streamer.twitchUserId })
 		}))
 	}))