From 8380944bdfb7a9902de03d25b2fc00f1f2628905 Mon Sep 17 00:00:00 2001
From: Roxedus <me@roxedus.dev>
Date: Tue, 31 May 2022 23:24:17 +0200
Subject: [PATCH] reorg

---
 .renovaterc                                           |  9 +++++++--
 .../renovate-job.yml => CI/renovate/renovate-job.yaml |  0
 {helms => Charts/traefik}/traefik-chart.yaml          |  0
 .../traefik/traefik-values.yaml                       |  0
 .../py-kms/py-kms.yaml                                | 11 +++++++++++
 py-kms/py-kms-svc.yaml                                | 10 ----------
 6 files changed, 18 insertions(+), 12 deletions(-)
 rename renovate/renovate-job.yml => CI/renovate/renovate-job.yaml (100%)
 rename {helms => Charts/traefik}/traefik-chart.yaml (100%)
 rename helms/values/traefik.yaml => Charts/traefik/traefik-values.yaml (100%)
 rename py-kms/py-kms-deployment.yaml => Deployments/py-kms/py-kms.yaml (81%)
 delete mode 100644 py-kms/py-kms-svc.yaml

diff --git a/.renovaterc b/.renovaterc
index ff86462..19c75ca 100644
--- a/.renovaterc
+++ b/.renovaterc
@@ -4,12 +4,17 @@
     ],
     "kubernetes": {
         "fileMatch": [
-            "deployment\\.yaml$"
+            "Deployments\\*\\.yaml$"
         ]
     },
     "helm-values": {
         "fileMatch": [
-            "values\\.*\\.yaml$"
+            "-values\\.yaml$"
+        ]
+    },
+    "helmv3": {
+        "fileMatch": [
+            "-chart\\.yaml$"
         ]
     },
     "packageRules": [
diff --git a/renovate/renovate-job.yml b/CI/renovate/renovate-job.yaml
similarity index 100%
rename from renovate/renovate-job.yml
rename to CI/renovate/renovate-job.yaml
diff --git a/helms/traefik-chart.yaml b/Charts/traefik/traefik-chart.yaml
similarity index 100%
rename from helms/traefik-chart.yaml
rename to Charts/traefik/traefik-chart.yaml
diff --git a/helms/values/traefik.yaml b/Charts/traefik/traefik-values.yaml
similarity index 100%
rename from helms/values/traefik.yaml
rename to Charts/traefik/traefik-values.yaml
diff --git a/py-kms/py-kms-deployment.yaml b/Deployments/py-kms/py-kms.yaml
similarity index 81%
rename from py-kms/py-kms-deployment.yaml
rename to Deployments/py-kms/py-kms.yaml
index f2f04a2..97afe45 100644
--- a/py-kms/py-kms-deployment.yaml
+++ b/Deployments/py-kms/py-kms.yaml
@@ -25,3 +25,14 @@ spec:
               memory: "40Mi"
           ports:
             - containerPort: 1688
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: py-kms
+spec:
+  ports:
+    - port: 1688
+      targetPort: 1688
+  selector:
+    app: py-kms
diff --git a/py-kms/py-kms-svc.yaml b/py-kms/py-kms-svc.yaml
deleted file mode 100644
index c807c83..0000000
--- a/py-kms/py-kms-svc.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: py-kms
-spec:
-  ports:
-    - port: 1688
-      targetPort: 1688
-  selector:
-    app: py-kms