From 2c5f2cf48eb37c0fa2cd33f5144b19a710bd8404 Mon Sep 17 00:00:00 2001
From: Jabar Asadi <jasadi@d2iq.com>
Date: Mon, 4 Sep 2023 17:51:18 +0200
Subject: [PATCH] chore: bump gitea to v9.3.0

---
 licenses.d2iq.yaml                                |  2 ++
 services/gitea/{8.2.0 => 9.3.0}/defaults/cm.yaml  | 15 +++++++++------
 .../{8.2.0 => 9.3.0}/defaults/kustomization.yaml  |  0
 services/gitea/{8.2.0 => 9.3.0}/gitea.yaml        |  4 ++--
 .../gitea/{8.2.0 => 9.3.0}/kustomization.yaml     |  0
 5 files changed, 13 insertions(+), 8 deletions(-)
 rename services/gitea/{8.2.0 => 9.3.0}/defaults/cm.yaml (87%)
 rename services/gitea/{8.2.0 => 9.3.0}/defaults/kustomization.yaml (100%)
 rename services/gitea/{8.2.0 => 9.3.0}/gitea.yaml (90%)
 rename services/gitea/{8.2.0 => 9.3.0}/kustomization.yaml (100%)

diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
index ee6f829f99..c30d7ae007 100644
--- a/licenses.d2iq.yaml
+++ b/licenses.d2iq.yaml
@@ -4,8 +4,10 @@ ignore:
   - docker.io/nginxinc/nginx-unprivileged:1.22.0-alpine
   - docker.io/bitnami/external-dns:0.13.5-debian-11-r55
   - docker.io/bitnami/memcached:1.6.15-debian-11-r8
+  - docker.io/bitnami/memcached:1.6.19-debian-11-r7
   - docker.io/bitnami/postgresql:11.16.0-debian-11-r9
   - docker.io/bitnami/postgresql:15.2.0-debian-11-r21
+  - docker.io/bitnami/postgresql:15.2.0-debian-11-r26
   - docker.io/library/busybox:1
   - gcr.io/kubecost1/cost-model:prod-1.104.0
   - gcr.io/kubecost1/frontend:prod-1.104.0
diff --git a/services/gitea/8.2.0/defaults/cm.yaml b/services/gitea/9.3.0/defaults/cm.yaml
similarity index 87%
rename from services/gitea/8.2.0/defaults/cm.yaml
rename to services/gitea/9.3.0/defaults/cm.yaml
index 130260b08b..6a1324cbe2 100644
--- a/services/gitea/8.2.0/defaults/cm.yaml
+++ b/services/gitea/9.3.0/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: gitea-8.2.0-d2iq-defaults
+  name: gitea-9.3.0-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |-
@@ -21,9 +21,9 @@ data:
             pathType: ImplementationSpecific
     gitea:
       additionalConfigFromEnvs:
-        - name: ENV_TO_INI__SERVER__SSL_MIN_VERSION
+        - name: GITEA__SERVER__SSL_MIN_VERSION
           value: tlsv1.3
-        - name: ENV_TO_INI__SERVER__SSL_MAX_VERSION
+        - name: GITEA__SERVER__SSL_MAX_VERSION
           value: tlsv1.3
       admin:
         existingSecret: ${adminCredentialsSecret}
@@ -46,7 +46,7 @@ data:
         periodSeconds: 10
         successThreshold: 1
         failureThreshold: 10
-    statefulset:
+    deployment:
       annotations:
         secret.reloader.stakater.com/reload: ${tlsCertificateSecret}
     service:
@@ -62,11 +62,14 @@ data:
       readOnly: true
       mountPath: "/git-tls"
     clusterDomain: cluster.local.
-    memcached:
+    redis-cluster:
       priorityClassName: "dkp-critical-priority"
       image:
-        tag: 1.6.15-debian-11-r8
+        tag: 7.2.0-debian-11-r0
+    postgresql-ha:
+      enabled: false
     postgresql:
+      enabled: true
       primary:
         priorityClassName: "dkp-critical-priority"
       image:
diff --git a/services/gitea/8.2.0/defaults/kustomization.yaml b/services/gitea/9.3.0/defaults/kustomization.yaml
similarity index 100%
rename from services/gitea/8.2.0/defaults/kustomization.yaml
rename to services/gitea/9.3.0/defaults/kustomization.yaml
diff --git a/services/gitea/8.2.0/gitea.yaml b/services/gitea/9.3.0/gitea.yaml
similarity index 90%
rename from services/gitea/8.2.0/gitea.yaml
rename to services/gitea/9.3.0/gitea.yaml
index ba184f7fb9..d84b59ca7f 100644
--- a/services/gitea/8.2.0/gitea.yaml
+++ b/services/gitea/9.3.0/gitea.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: dl.gitea.io-charts
         namespace: kommander-flux
-      version: 8.2.0
+      version: 9.3.0
   interval: 15s
   install:
     crds: CreateReplace
@@ -25,5 +25,5 @@ spec:
   releaseName: gitea
   valuesFrom:
     - kind: ConfigMap
-      name: gitea-8.2.0-d2iq-defaults
+      name: gitea-9.3.0-d2iq-defaults
   targetNamespace: ${releaseNamespace}
diff --git a/services/gitea/8.2.0/kustomization.yaml b/services/gitea/9.3.0/kustomization.yaml
similarity index 100%
rename from services/gitea/8.2.0/kustomization.yaml
rename to services/gitea/9.3.0/kustomization.yaml