Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(apps/prod/jenkins/release): bump jenkins controller and plugins #697

Merged
merged 1 commit into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions apps/prod/jenkins-beta/release/values-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ controller:
cpu: "8"
memory: 32Gi

# all plugins are installed in the image already
installPlugins: false

affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
Expand Down
20 changes: 20 additions & 0 deletions apps/prod/jenkins/release/values-JCasC.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -251,3 +251,23 @@ controller:
testResultParsingEnabled: false
testResultCategories: "UT"
fallbackCategoriesAsString: unknown

# for cloudevents plugin config.
# FIXME: should use cdevents plugin when the issue solved:
# https://github.com/jenkinsci/cdevents-plugin/issues/9
cloudevents: |
unclassified:
cloudEventsGlobalConfig:
sinkType: "http"
sinkURL: "http://cloudevents-server.apps.svc/events"
completed: true
created: true
enteredWaiting: true
failed: true
finalized: true
left: true
started: true
updated: true
# nodes
offline: true
online: true
4 changes: 2 additions & 2 deletions apps/prod/jenkins/release/values-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ agent:
podRetention: Never
containerCap: 200
image: "jenkins/inbound-agent"
tag: "4.11-1"
tag: 3148.v532a_7e715ee3-10
command: ""
args: ""
args: ""
32 changes: 15 additions & 17 deletions apps/prod/jenkins/release/values-controller-plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,32 @@ controller:
- name: JENKINS_UC_DOWNLOAD
value: https://mirrors.tuna.tsinghua.edu.cn/jenkins

installLatestPlugins: false

# List of plugins to be install during Jenkins controller start
installPlugins:
# Ref: https://github.com/jenkinsci/plugin-installation-manager-tool#plugin-input-format
# but without outer `plugin` key.
- artifactId: kubernetes
source:
# renovate: datasource=jenkins-plugins depName=kubernetes
version: 3845.va_9823979a_744
version: 4029.v5712230ccb_f8
- artifactId: kubernetes-client-api
source:
# renovate: datasource=jenkins-plugins depName=kubernetes-client-api
version: 6.3.1-206.v76d3b_6b_14db_b
- artifactId: git
source:
# renovate: datasource=jenkins-plugins depName=git
version: 5.0.0
version: 6.8.1-224.vd388fca_4db_3b_
- artifactId: configuration-as-code
source:
# renovate: datasource=jenkins-plugins depName=configuration-as-code
version: 1569.vb_72405b_80249
version: 1714.v09593e830cfa
- artifactId: prometheus
source:
# renovate: datasource=jenkins-plugins depName=prometheus
version: 2.0.11
version: 2.3.3
- artifactId: blueocean
source:
# renovate: datasource=jenkins-plugins depName=blueocean
version: 1.25.8
version: 1.27.8
- artifactId: job-dsl
source:
# renovate: datasource=jenkins-plugins depName=job-dsl
Expand All @@ -49,23 +47,19 @@ controller:
- artifactId: pipeline-utility-steps
source:
# renovate: datasource=jenkins-plugins depName=pipeline-utility-steps
version: 2.13.2
version: 2.16.0
- artifactId: http_request
source:
# renovate: datasource=jenkins-plugins depName=http_request
version: 1.16
- artifactId: workflow-aggregator
source:
# renovate: datasource=jenkins-plugins depName=workflow-aggregator
version: 590.v6a_d052e5a_a_b_5
- artifactId: workflow-cps-global-lib
source:
# renovate: datasource=jenkins-plugins depName=workflow-cps-global-lib
version: 609.vd95673f149b_b
version: 596.v8c21c963d92d
- artifactId: instance-identity
source:
# renovate: datasource=jenkins-plugins depName=instance-identity
version: 142.v04572ca_5b_265
version: 173.va_37c494ec4e5
- artifactId: jenkins-pipeline-cache
source:
# renovate: datasource=github-releases depName=j3t/jenkins-pipeline-cache-plugin versioning=semver
Expand All @@ -77,11 +71,15 @@ controller:
- artifactId: generic-webhook-trigger
source:
# renovate: datasource=jenkins-plugins depName=generic-webhook-trigger
version: 1.85.2
version: 1.87.0
- artifactId: ssh-agent
source:
# renovate: datasource=jenkins-plugins depName=ssh-agent
version: 327.v230ecd01f86f
- artifactId: cloudevents
source:
# renovate: datasource=jenkins-plugins depName=cloudevents
version: 1.0.0
# for plugin build-failure-analyzer
# Exporting to prometheus
# Ref: https://github.com/jenkinsci/build-failure-analyzer-plugin/blob/master/docs/metrics.md
Expand Down
12 changes: 11 additions & 1 deletion apps/prod/jenkins/release/values-controller.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# please see: https://github.com/jenkinsci/helm-charts/blob/main/charts/jenkins/VALUES_SUMMARY.md
controller:
tag: "2.387.1"
tag: 2.414.2
resources:
requests:
cpu: "16"
Expand All @@ -9,6 +9,16 @@ controller:
cpu: "16"
memory: 80Gi

affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/arch
operator: In
values:
- amd64

# https://docs.cloudbees.com/docs/admin-resources/latest/jvm-troubleshooting/
# current jenkins using java-11.
# Set min/max heap here if needed with:
Expand Down