add support for customizing kubernetes jnlpregistry

jenkinsci · Jul 2, 2023 · 5793819 · 5793819
1 parent b666c74
commit 5793819
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 35 deletions.
diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md
@@ -12,6 +12,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
 The changelog until v1.5.7 was auto-generated based on git commits.
 Those entries include a reference to the git commit to be able to get more details.
 
+## 4.3.31
+
+Added `.Values.agent.jnlpregistry` to allow agents to be configured with private registry.
+
 ## 4.3.30
 
 Update Jenkins version in controller test matching LTS version

diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: jenkins
 home: https://jenkins.io/
-version: 4.3.30
+version: 4.3.31
 appVersion: 2.401.2
 description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project.
 sources:

diff --git a/charts/jenkins/VALUES_SUMMARY.md b/charts/jenkins/VALUES_SUMMARY.md
@@ -297,18 +297,19 @@ The following tables list the configurable parameters of the Jenkins chart and t
 
 ### Jenkins Agent(s)
 
-| Parameter                  | Description                                     | Default                |
-| -------------------------- | ----------------------------------------------- | ---------------------- |
-| `agent.enabled`            | Enable Kubernetes plugin jnlp-agent podTemplate | `true`                 |
-| `agent.namespace`          | Namespace in which the Kubernetes agents should be launched  | Not set   |
-| `agent.containerCap`       | Maximum number of agent                         | 10                     |
-| `agent.defaultsProviderTemplate` | The name of the pod template to use for providing default values | Not set  |
-| `agent.jenkinsUrl`          | Overrides the Kubernetes Jenkins URL    | Not set                                |
-| `agent.jenkinsTunnel`       | Overrides the Kubernetes Jenkins tunnel | Not set                                |
+| Parameter                  | Description                                                                              | Default                |
+| -------------------------- |------------------------------------------------------------------------------------------| ---------------------- |
+| `agent.enabled`            | Enable Kubernetes plugin jnlp-agent podTemplate                                          | `true`                 |
+| `agent.namespace`          | Namespace in which the Kubernetes agents should be launched                              | Not set   |
+| `agent.containerCap`       | Maximum number of agent                                                                  | 10                     |
+| `agent.defaultsProviderTemplate` | The name of the pod template to use for providing default values                         | Not set  |
+| `agent.jenkinsUrl`          | Overrides the Kubernetes Jenkins URL                                                     | Not set                                |
+| `agent.jenkinsTunnel`       | Overrides the Kubernetes Jenkins tunnel                                                  | Not set                                |
 | `agent.kubernetesConnectTimeout` | The connection timeout in seconds for connections to Kubernetes API. Minimum value is 5. | 5 |
-| `agent.kubernetesReadTimeout` | The read timeout in seconds for connections to Kubernetes API. Minimum value is 15. | 15 |
-| `agent.maxRequestsPerHostStr` | The maximum concurrent connections to Kubernetes API | 32 |
-| `agent.podLabels`             | Custom Pod labels (an object with `label-key: label-value` pairs)                    | Not set                         |
+| `agent.kubernetesReadTimeout` | The read timeout in seconds for connections to Kubernetes API. Minimum value is 15.      | 15 |
+| `agent.maxRequestsPerHostStr` | The maximum concurrent connections to Kubernetes API                                     | 32 |
+| `agent.podLabels`             | Custom Pod labels (an object with `label-key: label-value` pairs)                        | Not set                         |
+| `agent.jnlpregistry`          | Custom docker registry used for to get agent jnlp image                                  | Not set                         |
 
 #### Pod Configuration
 

diff --git a/charts/jenkins/templates/_helpers.tpl b/charts/jenkins/templates/_helpers.tpl
@@ -140,6 +140,9 @@ jenkins:
   clouds:
   - kubernetes:
       containerCapStr: "{{ .Values.agent.containerCap }}"
+      {{- if .Values.agent.jnlpregistry }}
+      jnlpregistry: "{{ .Values.agent.jnlpregistry }}"
+      {{- end }}
       defaultsProviderTemplate: "{{ .Values.agent.defaultsProviderTemplate }}"
       connectTimeout: "{{ .Values.agent.kubernetesConnectTimeout }}"
       readTimeout: "{{ .Values.agent.kubernetesReadTimeout }}"

diff --git a/charts/jenkins/unittests/jcasc-config-test.yaml b/charts/jenkins/unittests/jcasc-config-test.yaml
@@ -55,7 +55,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: c6441dbc474cd880232d3dc2549a297f0c9b8dd592adf21000f4a8f8168d226f
+                      id: e6bd43103872c44b7b510703dc168c6a97474d35732c1ccb64b356a2e16ba642
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -175,7 +175,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "jenkins-agents"
-                      id: 4cffb9a3d604a65d39cdfc0c9dbf2a8786f98b302f47daa388ce763ebc9c8932
+                      id: bf49d2715e6f359d62d0a7c8ac38b08c9b2d5fbc089aa4b28f4df26c9fde6383
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -320,6 +320,7 @@ tests:
       agent:
         namespace: default
         containerCap: 22
+        jnlpregistry: private.registry.com
         defaultsProviderTemplate: my-defaults
         kubernetesConnectTimeout: 11
         kubernetesReadTimeout: 12
@@ -458,6 +459,7 @@ tests:
               clouds:
               - kubernetes:
                   containerCapStr: "22"
+                  jnlpregistry: "private.registry.com"
                   defaultsProviderTemplate: "my-defaults"
                   connectTimeout: "11"
                   readTimeout: "12"
@@ -476,7 +478,7 @@ tests:
                       annotations:
                       - key: ci.jenkins-agent/test
                         value: "custom"
-                      id: e79c14afdc6e664e7b1a3b6f34bb7eec6bf98ac59160622d57ab8da1f01d6001
+                      id: 514e132cc13c51fae35237893972a022352de4a940d313393b769dc33005cfe6
                       containers:
                       - name: "sideContainer"
                         alwaysPullImage: true
@@ -615,7 +617,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: a1376b8e2a35697dc8772e81ae978085ccb1568996aaed65704753c0cf2f3bdb
+                      id: 0e24427171981e0e4a627b48513b0bbe939387aa0622ec74bf1e5baf0dec0323
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -719,7 +721,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: 049c3572c4b6d9710eac05340e4ecd70064036e0b0fcbad5c7aa7505b94af88a
+                      id: ef1d3459268de366c5842b280c865a4b4f782623fec35a88a5b61038969c0161
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -821,7 +823,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: 7601f73f39a4663d6517beaf128c49557119fb50e7ba9087d239b98f8ef5dccc
+                      id: 24c7eccd7271d2c683b610812c7a626bd571c872a7403b041ba04cb1ed9ced82
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -925,7 +927,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: f7bb22ad23ec0dc279e716043290d0d59fdbb89a19570b2b274a0b30fa3186a7
+                      id: 364a312f96e581010ac539236d534bf6b8119eaa24d5d245f7d2a3dd80955247
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -1030,7 +1032,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: 17ca71cd34b547009d8827096c7c563f86fb3dc05dff036af52ba93ccc4acf71
+                      id: 6314368ee9b47d8930f7209e138479ffe0982428a31413d87eb516877718175d
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -1134,7 +1136,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: 2b69db3d017a90cf68838605befd3a44370f2f1e333b5201b020d104086d4ff8
+                      id: cbe98280968097caf25e9f0592c9357288129911cb3742fe5b367d55c8313845
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -1305,7 +1307,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: c6441dbc474cd880232d3dc2549a297f0c9b8dd592adf21000f4a8f8168d226f
+                      id: e6bd43103872c44b7b510703dc168c6a97474d35732c1ccb64b356a2e16ba642
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -1406,7 +1408,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "NAMESPACE"
-                      id: 528b7d98a2f51a4753e2b85b809ad9fe88f9b8de663bda6a7f7b8e738ef823fa
+                      id: 9a68c3ebefd2510ae860186b12b8a2361f91e4b104bd442d75edb6c42cec517f
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -1503,7 +1505,7 @@ tests:
                 templates:
                   - name: "default"
                     namespace: "default"
-                    id: c6441dbc474cd880232d3dc2549a297f0c9b8dd592adf21000f4a8f8168d226f
+                    id: e6bd43103872c44b7b510703dc168c6a97474d35732c1ccb64b356a2e16ba642
                     containers:
                     - name: "jnlp"
                       alwaysPullImage: false
@@ -1602,7 +1604,7 @@ tests:
                 templates:
                   - name: "default"
                     namespace: "default"
-                    id: c6441dbc474cd880232d3dc2549a297f0c9b8dd592adf21000f4a8f8168d226f
+                    id: e6bd43103872c44b7b510703dc168c6a97474d35732c1ccb64b356a2e16ba642
                     containers:
                     - name: "jnlp"
                       alwaysPullImage: false
@@ -1689,7 +1691,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: c6441dbc474cd880232d3dc2549a297f0c9b8dd592adf21000f4a8f8168d226f
+                      id: e6bd43103872c44b7b510703dc168c6a97474d35732c1ccb64b356a2e16ba642
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -1783,7 +1785,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: c6441dbc474cd880232d3dc2549a297f0c9b8dd592adf21000f4a8f8168d226f
+                      id: e6bd43103872c44b7b510703dc168c6a97474d35732c1ccb64b356a2e16ba642
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -1874,7 +1876,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: c6441dbc474cd880232d3dc2549a297f0c9b8dd592adf21000f4a8f8168d226f
+                      id: e6bd43103872c44b7b510703dc168c6a97474d35732c1ccb64b356a2e16ba642
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -1966,7 +1968,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: c6441dbc474cd880232d3dc2549a297f0c9b8dd592adf21000f4a8f8168d226f
+                      id: e6bd43103872c44b7b510703dc168c6a97474d35732c1ccb64b356a2e16ba642
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -2057,7 +2059,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: 3e3866d042e08cd9e7d0893710b90ff3d21b9c74f52446277b51337b4d658023
+                      id: 2cac53632cf983a2029d85085ee580d080f3a7aa873ea33013ec1bf8dc9c8874
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -2178,7 +2180,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: 3e3866d042e08cd9e7d0893710b90ff3d21b9c74f52446277b51337b4d658023
+                      id: 2cac53632cf983a2029d85085ee580d080f3a7aa873ea33013ec1bf8dc9c8874
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -2343,7 +2345,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: 3e3866d042e08cd9e7d0893710b90ff3d21b9c74f52446277b51337b4d658023
+                      id: 2cac53632cf983a2029d85085ee580d080f3a7aa873ea33013ec1bf8dc9c8874
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -2480,7 +2482,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: c9b8962ffbdceebd9685c1939d996c682164d83f6efe947c40220cfe2d7b2869
+                      id: 45a5eab80c0ddbc2dc7414cdd4c7e56a0c5128141185b99ce53403fa853fad83
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -2584,7 +2586,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: d6ca5ada4c5eb2b8eeb42b6847c266bdfd83ab7ee5464812d6531fb311661625
+                      id: ecef062eba87189fceb248541b50b06abcb4f011e03a8912914295a9966b52ae
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false
@@ -2689,7 +2691,7 @@ tests:
                   templates:
                     - name: "default"
                       namespace: "default"
-                      id: 761a8afd90430cc69e310fa5ad5b054f559ec839d7416a10f506595622a4d695
+                      id: 54f88fc77c094a352f0fb69e0b8e935524e0d48ffba055f8d701b42c29d5c301
                       containers:
                       - name: "jnlp"
                         alwaysPullImage: false

diff --git a/charts/jenkins/values.yaml b/charts/jenkins/values.yaml
@@ -628,6 +628,8 @@ agent:
   kubernetesReadTimeout: 15
   maxRequestsPerHostStr: "32"
   namespace:
+  # private registry for agent image
+  jnlpregistry:
   image: "jenkins/inbound-agent"
   tag: "3107.v665000b_51092-15"
   workingDir: "/home/jenkins/agent"