From de4d5197736ea929e783b9ff0dd216ea937f67c3 Mon Sep 17 00:00:00 2001
From: Tristan <tristan@mangadex.org>
Date: Sun, 25 Dec 2022 20:07:22 +0100
Subject: [PATCH] Cleanup debian patch list and resources overrides

---
 .gitlab-ci.yml                | 8 ++------
 haproxy/debian/patches/series | 1 -
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd42fd1..3f4a98c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,10 +31,6 @@ variables: &default-variables
   KUBERNETES_MEMORY_REQUEST: 2Gi
   KUBERNETES_MEMORY_LIMIT: 2Gi
 
-.build-resources-l: &build-resources-l
-  KUBERNETES_MEMORY_REQUEST: 3Gi
-  KUBERNETES_MEMORY_LIMIT: 3Gi
-
 .haproxy_stable: &haproxy-stable
   HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.7.git"
   HAPROXY_VERSION: 2.7.1
@@ -347,7 +343,7 @@ debian:stable:
   <<: *haproxy-debian
   variables:
     <<: *default-variables
-    <<: *build-resources-l
+    <<: *build-resources-m
     <<: *haproxy-stable
   needs:
     - *needs-dependencies
@@ -358,7 +354,7 @@ debian:dev:
   <<: *haproxy-debian
   variables:
     <<: *default-variables
-    <<: *build-resources-l
+    <<: *build-resources-m
     <<: *haproxy-dev
   needs:
     - *needs-dependencies
diff --git a/haproxy/debian/patches/series b/haproxy/debian/patches/series
index 83412a7..9babcce 100644
--- a/haproxy/debian/patches/series
+++ b/haproxy/debian/patches/series
@@ -1,4 +1,3 @@
 haproxy.service-start-after-syslog.patch
 haproxy.service-add-documentation.patch
 haproxy.service-make-systemd-bind-dev-log-inside-chroot.patch
-reproducible.patch