From dfc13bdac219d6b3c11ff85b5b5a240b3cc603e0 Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Thu, 5 Sep 2024 17:06:43 +1000
Subject: [PATCH 1/3] update resources for gitea and sonarqube

---
 apps/gitea/env/k3s-cluster/values.yaml     | 6 +++++-
 apps/sonarqube/env/k3s-cluster/values.yaml | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/gitea/env/k3s-cluster/values.yaml b/apps/gitea/env/k3s-cluster/values.yaml
index d9c58eb..1a6ecd3 100644
--- a/apps/gitea/env/k3s-cluster/values.yaml
+++ b/apps/gitea/env/k3s-cluster/values.yaml
@@ -13,6 +13,7 @@ smtpUser: "me@edward.sydney"
 smtpExistingSecret: "gitea-secrets"
 persistence:
   existingClaim: "gitea-pvc"
+resourcesPreset: "xlarge"
 podSecurityContext:
   fsGroup: 1000
 containerSecurityContext:
@@ -37,4 +38,7 @@ externalDatabase:
   host: "postgresql-primary.argocd.svc.cluster.local"
   user: "gitea_user"
   existingSecret: "gitea-secrets"
-  existingSecretPasswordKey: "db-password"
\ No newline at end of file
+  existingSecretPasswordKey: "db-password"
+nodeSelector:
+  kubernetes.io/os: linux
+  kubernetes.io/arch: amd64
\ No newline at end of file
diff --git a/apps/sonarqube/env/k3s-cluster/values.yaml b/apps/sonarqube/env/k3s-cluster/values.yaml
index fa78013..947d006 100644
--- a/apps/sonarqube/env/k3s-cluster/values.yaml
+++ b/apps/sonarqube/env/k3s-cluster/values.yaml
@@ -12,6 +12,7 @@ smtpPort: "587"
 smtpUser: "me@edward.sydney"
 smtpProtocol: "TLS"
 smtpExistingSecret: "sonarqube-secrets"
+resourcesPreset: "2xlarge"
 podSecurityContext:
   fsGroup: 1000
 containerSecurityContext:

From 746dad898348b43e547a5512a6c43535b5a9457a Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Thu, 5 Sep 2024 17:08:11 +1000
Subject: [PATCH 2/3] update service type to LB for chartmuseum

---
 apps/chartmuseum/base/service.yaml            |  4 +--
 apps/chartmuseum/env/k3s-cluster/ingress.yaml | 25 -------------------
 .../env/k3s-cluster/kustomization.yaml        |  3 +--
 3 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 apps/chartmuseum/env/k3s-cluster/ingress.yaml

diff --git a/apps/chartmuseum/base/service.yaml b/apps/chartmuseum/base/service.yaml
index 923ee0b..037e2e4 100644
--- a/apps/chartmuseum/base/service.yaml
+++ b/apps/chartmuseum/base/service.yaml
@@ -11,10 +11,10 @@ metadata:
 spec:
   selector:
     app.kubernetes.io/name: chartmuseum
-  type: ClusterIP
+  type: LoadBalancer
   internalTrafficPolicy: Cluster
   ports:
     - protocol: TCP
-      port: 8080
+      port: 8899
       targetPort: 8080
       name: http
diff --git a/apps/chartmuseum/env/k3s-cluster/ingress.yaml b/apps/chartmuseum/env/k3s-cluster/ingress.yaml
deleted file mode 100644
index 7c26925..0000000
--- a/apps/chartmuseum/env/k3s-cluster/ingress.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: chartmuseum-ingress
-  namespace: chartmuseum
-  annotations:
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-    nginx.ingress.kubernetes.io/use-regex: "true"
-spec:
-  ingressClassName: nginx
-  tls:
-    - hosts:
-        - "chartmuseum.cluster.edward.sydney"
-      secretName: ingress-tls-secret
-  rules:
-    - host: "chartmuseum.cluster.edward.sydney"
-      http:
-        paths:
-          - pathType: Prefix
-            path: "/"
-            backend:
-              service:
-                name: chartmuseum
-                port:
-                  number: 8080
\ No newline at end of file
diff --git a/apps/chartmuseum/env/k3s-cluster/kustomization.yaml b/apps/chartmuseum/env/k3s-cluster/kustomization.yaml
index 3ea3085..a227ac4 100644
--- a/apps/chartmuseum/env/k3s-cluster/kustomization.yaml
+++ b/apps/chartmuseum/env/k3s-cluster/kustomization.yaml
@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
-  - ./ingress.yaml
\ No newline at end of file
+  - ../../base
\ No newline at end of file

From 0515542c8c60b17de612396d90894bdac6475d14 Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Thu, 5 Sep 2024 17:08:55 +1000
Subject: [PATCH 3/3] enable apps

---
 projects/{k3s-cluster-app.yaml.bak => k3s-cluster-app.yaml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename projects/{k3s-cluster-app.yaml.bak => k3s-cluster-app.yaml} (100%)

diff --git a/projects/k3s-cluster-app.yaml.bak b/projects/k3s-cluster-app.yaml
similarity index 100%
rename from projects/k3s-cluster-app.yaml.bak
rename to projects/k3s-cluster-app.yaml