fix(apps/prod/jenkins-beta): upgrade chart (#1196)

use official chart Signed-off-by: wuhuizuo <[email protected]> Signed-off-by: wuhuizuo <[email protected]>
PingCAP-QE · Aug 2, 2024 · b063aef · b063aef
1 parent 60e8db5
commit b063aef
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 56 deletions.
diff --git a/apps/prod/jenkins-beta/release/release.yaml b/apps/prod/jenkins-beta/release/release.yaml
@@ -8,10 +8,11 @@ spec:
   targetNamespace: apps
   chart:
     spec:
-      chart: ./charts/jenkins
+      chart: jenkins
+      version: 5.0.13
       sourceRef:
-        kind: GitRepository
-        name: flux-system
+        kind: HelmRepository
+        name: jenkins
         namespace: flux-system
   interval: 1h0m0s
   timeout: 15m

diff --git a/apps/prod/jenkins-beta/release/values-JCasC.yaml b/apps/prod/jenkins-beta/release/values-JCasC.yaml
@@ -39,7 +39,6 @@ controller:
     - { name: docs-cn, keyName: qiniu-sk }
     - { name: docs-cn, keyName: qiniu-bn }
 
-
   additionalSecrets: []
   #  - name: nameOfSecret
   #    value: secretText
@@ -254,7 +253,7 @@ controller:
           gitHubConfiguration:
             apiRateLimitChecker: ThrottleOnOver
           gitHubPluginConfig:
-            hookUrl: "http://internal.do.pingcap.net:30080/jenkins/github-webhook/"
+            hookUrl: "https://internal-do.pingcap.net/jenkins-beta/github-webhook/"
       pipeline-cache: |
         unclassified:
           pipeline-cache:

diff --git a/apps/prod/jenkins-beta/release/values-agent.yaml b/apps/prod/jenkins-beta/release/values-agent.yaml
@@ -1,9 +1,4 @@
 agent:
   maxRequestsPerHostStr: "200" # need to restart controller after updated it.
   namespace: jenkins-beta
-  podRetention: Never
   containerCap: 200
-  image: "jenkins/inbound-agent"
-  tag: 3148.v532a_7e715ee3-10
-  command: ""
-  args: ""
diff --git a/apps/prod/jenkins-beta/release/values-controller-plugins.yaml b/apps/prod/jenkins-beta/release/values-controller-plugins.yaml
@@ -11,8 +11,27 @@ controller:
     - name: JENKINS_UC_DOWNLOAD
       value: https://mirrors.tuna.tsinghua.edu.cn/jenkins
 
-  # all plugins are installed in the image already
-  installPlugins: false
+  installLatestPlugins: true
+  # List of plugins to install in addition to those listed in controller.installPlugins
+  additionalPlugins:
+    # Ref: https://github.com/jenkinsci/plugin-installation-manager-tool#plugin-input-format
+    # but without outer `plugin` key.
+    - kubernetes-client-api:6.8.1-224.vd388fca_4db_3b_
+    - prometheus:2.4.1
+    - blueocean:1.27.8
+    - job-dsl:1.87
+    - build-failure-analyzer::https://github.com/PingCAP-QE/build-failure-analyzer-plugin/releases/download/v2.4.2-jobname/build-failure-analyzer.hpi
+    - pipeline-utility-steps:2.16.0
+    - http_request:1.18
+    - workflow-aggregator:596.v8c21c963d92d
+    - instance-identity:185.v303dc7c645f9
+    - jenkins-pipeline-cache:0.2.0:https://github.com/j3t/jenkins-pipeline-cache-plugin/releases/download/0.2.0/jenkins-pipeline-cache-0.2.0.hpi
+    - ghprb:1.42.2
+    - generic-webhook-trigger:1.88.2
+    - ssh-agent:346.vda_a_c4f2c8e50
+    - cloud-events:1.0.0
+    - json-path-api:2.8.0-5.v07cb_a_1ca_738c
+  initializeOnce: true
 
   # for plugin build-failure-analyzer
   #   Exporting to prometheus

diff --git a/apps/prod/jenkins-beta/release/values-controller.yaml b/apps/prod/jenkins-beta/release/values-controller.yaml
@@ -1,7 +1,9 @@
 # please see: https://github.com/jenkinsci/helm-charts/blob/main/charts/jenkins/VALUES_SUMMARY.md
 controller:
-  image: "hub.pingcap.net/jenkins/jenkins-with-plugins"
-  tag: "2.426.3-lts-jdk11"
+  image:
+    registry: "docker.io"
+    repository: "jenkins/jenkins"
+    tag: "2.426.3-jdk17"
   resources:
     requests:
       cpu: "4"
@@ -62,32 +64,13 @@ controller:
 
   ingress:
     enabled: true
-    # Override for the default paths that map requests to the backend
-    paths: []
-    # - backend:
-    #     serviceName: ssl-redirect
-    #     servicePort: use-annotation
-    # - backend:
-    #     serviceName: >-
-    #       {{ template "jenkins.fullname" . }}
-    #     # Don't use string here, use only integer value!
-    #     servicePort: 8080
-    # For Kubernetes v1.14+, use 'networking.k8s.io/v1beta1'
-    # For Kubernetes v1.19+, use 'networking.k8s.io/v1'
     apiVersion: networking.k8s.io/v1
-    kubernetes.io/ingress.class: nginx
     kubernetes.io/tls-acme: "true"
-    # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
-    # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
     ingressClassName: nginx
     # Set this path to jenkinsUriPrefix above or use annotations to rewrite path
     path: "/jenkins-beta"
     # configures the hostname e.g. jenkins.example.com
     hostName: internal-do.pingcap.net
-    tls:
-    # - secretName: jenkins.cluster.local
-    #   hosts:
-    #     - jenkins.cluster.local
 
   # Expose Prometheus metrics
   prometheus:
@@ -96,16 +79,4 @@ controller:
     enabled: true
     # Additional labels to add to the ServiceMonitor object
     serviceMonitorAdditionalLabels: { release: kps }
-    # Set a custom namespace where to deploy ServiceMonitor resource
-    # serviceMonitorNamespace: monitoring
-    scrapeInterval: 60s
-    # This is the default endpoint used by the prometheus plugin
-    scrapeEndpoint: /prometheus
-    # Additional labels to add to the PrometheusRule object
-    alertingRulesAdditionalLabels: {}
-    # An array of prometheus alerting rules
-    # See here: https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/
-    # The `groups` root object is added by default, simply add the rule entries
-    alertingrules: []
-    # Set a custom namespace where to deploy PrometheusRule resource
-    prometheusRuleNamespace: ""
+
diff --git a/apps/prod/jenkins-beta/release/values-persistence.yaml b/apps/prod/jenkins-beta/release/values-persistence.yaml
@@ -14,14 +14,4 @@ persistence:
   #   GKE, AWS & OpenStack)
   #
   storageClass: ceph-block
-  annotations: {}
-  labels: {}
-  accessMode: "ReadWriteOnce"
   size: "100Gi"
-  volumes:
-  #  - name: nothing
-  #    emptyDir: {}
-  mounts:
-  #  - mountPath: /var/nothing
-  #    name: nothing
-  #    readOnly: true
diff --git a/infrastructure/_base/sources/helm-repo-others.yaml b/infrastructure/_base/sources/helm-repo-others.yaml
@@ -17,3 +17,12 @@ spec:
   interval: 24h
   type: oci
   url: oci://quay.io/strimzi-helm
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: jenkins
+  namespace: flux-system
+spec:
+  interval: 24h
+  url: https://charts.jenkins.io