From 941d9e64841bfb52c01bcf524004d546241a30a5 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Thu, 3 Aug 2023 15:18:01 +0000
Subject: [PATCH] feature: kubezero-ci drop GoCD, latest Gitea, add Renovate

---
 charts/kubezero-ci/Chart.yaml                 | 18 +++---
 .../templates/gocd/istio-service.yaml         | 18 ------
 charts/kubezero-ci/values.yaml                | 64 +++++++++----------
 3 files changed, 41 insertions(+), 59 deletions(-)
 delete mode 100644 charts/kubezero-ci/templates/gocd/istio-service.yaml

diff --git a/charts/kubezero-ci/Chart.yaml b/charts/kubezero-ci/Chart.yaml
index 52476839..a11514c9 100644
--- a/charts/kubezero-ci/Chart.yaml
+++ b/charts/kubezero-ci/Chart.yaml
@@ -2,14 +2,14 @@ apiVersion: v2
 name: kubezero-ci
 description: KubeZero umbrella chart for all things CI
 type: application
-version: 0.6.3
+version: 0.7.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
   - kubezero
   - jenkins
-  - goCD
   - gitea
+  - renovate
 maintainers:
   - name: Stefan Reimer
     email: stefan@zero-downtime.net
@@ -17,20 +17,20 @@ dependencies:
   - name: kubezero-lib
     version: ">= 0.1.6"
     repository: https://cdn.zero-downtime.net/charts/
-  - name: gocd
-    version: 1.40.8
-    repository: https://gocd.github.io/helm-chart
-    condition: gocd.enabled
   - name: gitea
-    version: 8.3.0
+    version: 9.1.0
     repository: https://dl.gitea.io/charts/
     condition: gitea.enabled
   - name: jenkins
-    version: 4.3.24
+    version: 4.5.0
     repository: https://charts.jenkins.io
     condition: jenkins.enabled
   - name: trivy
     version: 0.7.0
     repository: https://aquasecurity.github.io/helm-charts/
     condition: trivy.enabled
-kubeVersion: ">= 1.24.0"
+  - name: renovate
+    version: 36.29.0
+    repository: https://docs.renovatebot.com/helm-charts
+    condition: renovate.enabled
+kubeVersion: ">= 1.25.0"
diff --git a/charts/kubezero-ci/templates/gocd/istio-service.yaml b/charts/kubezero-ci/templates/gocd/istio-service.yaml
deleted file mode 100644
index 22d9b8ac..00000000
--- a/charts/kubezero-ci/templates/gocd/istio-service.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{- if and .Values.gocd.enabled .Values.gocd.istio.enabled }}
-apiVersion: networking.istio.io/v1beta1
-kind: VirtualService
-metadata:
-  name: {{ include "kubezero-lib.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "kubezero-lib.labels" . | nindent 4 }}
-spec:
-  gateways:
-  - {{ .Values.gocd.istio.gateway }}
-  hosts:
-  - {{ .Values.gocd.istio.url }}
-  http:
-  - route:
-    - destination:
-        host: gocd-server
-{{- end }}
diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml
index b260149c..530516ed 100644
--- a/charts/kubezero-ci/values.yaml
+++ b/charts/kubezero-ci/values.yaml
@@ -1,24 +1,23 @@
-gocd:
-  enabled: false
-
-  server:
-    service:
-      type: "ClusterIP"
-    ingress:
-      enabled: false
-
-  istio:
-    enabled: false
-    gateway: istio-ingress/private-ingressgateway
-    url: "" # gocd.example.com
-
-
 gitea:
   enabled: false
 
-  image:
+  #image:
     #tag: 1.17.4
-    rootless: true
+    #rootless: true
+
+  repliaCount: 1
+
+  # We use RWO persistence
+  strategy:
+    type: "Recreate"
+
+  # Since V9 they default to RWX and deployment, we default to old existing RWO from statefulset
+  persistence:
+    enabled: true
+    mount: true
+    create: false
+    #claimName: <set per install>
+    size: 4Gi
 
   securityContext:
     allowPrivilegeEscalation: false
@@ -28,10 +27,6 @@ gitea:
       add:
         - SYS_CHROOT
 
-  persistence:
-    enabled: true
-    size: 4Gi
-
   resources:
     requests:
       cpu: "150m"
@@ -56,15 +51,17 @@ gitea:
         DB_TYPE: sqlite3
       cache:
         ADAPTER: memory
+      session:
+        PROVIDER: memory
+      queue:
+        TYPE: level
 
-  memcached:
+  redis-cluster:
+    enabled: false
+  postgresql-ha:
     enabled: false
   postgresql:
     enabled: false
-  mysql:
-    enabled: false
-  mariadb:
-    enabled: false
 
   istio:
     enabled: false
@@ -121,19 +118,19 @@ jenkins:
                       numToKeepStr: "10"
 
     installPlugins:
-      - kubernetes:3937.vd7b_82db_e347b_
+      - kubernetes:3971.v94b_4c914ca_75
+      - kubernetes-credentials-provider:1.225.v14f9e6b_28f53
       - workflow-aggregator:581.v0c46fa_697ffd
-      - git:5.1.0
-      - basic-branch-build-strategies:71.vc1421f89888e
+      - git:5.2.0
+      - basic-branch-build-strategies:81.v05e333931c7d
       - pipeline-graph-view:183.v9e27732d970f
-      - pipeline-stage-view:2.32
+      - pipeline-stage-view:2.33
       - configuration-as-code:1647.ve39ca_b_829b_42
       - antisamy-markup-formatter:159.v25b_c67cd35fb_
       - prometheus:2.2.3
       - htmlpublisher:1.31
       - build-discarder:139.v05696a_7fe240
-      - dark-theme:315.va_22e7d692ea_a
-        # - kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c
+      - dark-theme:336.v02165cd8c2ee
 
   serviceAccountAgent:
     create: true
@@ -237,3 +234,6 @@ trivy:
     size: 1Gi
   rbac:
     create: false
+
+renovate:
+  enabled: false