Possible to disable service links

jenkinsci · Sep 10, 2024 · dd32c83 · dd32c83
1 parent 676475d
commit dd32c83
Show file tree

Hide file tree

Showing 7 changed files with 308 additions and 275 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.
 
+## 5.5.15
+
+Add support for `controller.enableServiceLinks` to disable service links in the controller pod.
+
 ## 5.5.14
 
 Update `jenkins/jenkins` to version `2.462.2-jdk17`

diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: jenkins
 type: application
 home: https://www.jenkins.io/
-version: 5.5.14
+version: 5.5.15
 appVersion: 2.462.2
 description: >
   Jenkins - Build great things at any scale! As the leading open source automation server, Jenkins provides over 1800 plugins to support building, deploying and automating any project.

diff --git a/charts/jenkins/VALUES.md b/charts/jenkins/VALUES.md
diff --git a/charts/jenkins/templates/jenkins-controller-statefulset.yaml b/charts/jenkins/templates/jenkins-controller-statefulset.yaml
@@ -80,6 +80,9 @@ spec:
       {{- if .Values.controller.shareProcessNamespace }}
       shareProcessNamespace: true
       {{- end }}
+      {{- if not .Values.controller.enableServiceLinks }}
+      enableServiceLinks: false
+      {{- end }}
 {{- if .Values.controller.usePodSecurityContext }}
       securityContext:
   {{- if kindIs "map" .Values.controller.podSecurityContextOverride }}

diff --git a/charts/jenkins/unittests/__snapshot__/jenkins-controller-statefulset-test.yaml.snap b/charts/jenkins/unittests/__snapshot__/jenkins-controller-statefulset-test.yaml.snap
@@ -131,6 +131,7 @@ default values:
                 name: sc-config-volume
               - mountPath: /var/jenkins_home
                 name: jenkins-home
+        enableServiceLinks: false
         initContainers:
           - env:
               - name: POD_NAME
@@ -350,6 +351,7 @@ test scheme for config-reload:
                 name: sc-config-volume
               - mountPath: /var/jenkins_home
                 name: jenkins-home
+        enableServiceLinks: false
         initContainers:
           - env:
               - name: POD_NAME

diff --git a/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml b/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml
@@ -623,6 +623,23 @@ tests:
     asserts:
       - isNull:
           path: spec.template.spec.shareProcessNamespace
+  - it: test false enableServiceLinks
+    template: jenkins-controller-statefulset.yaml
+    set:
+      controller:
+        enableServiceLinks: false
+    asserts:
+      - equal:
+          path: spec.template.spec.enableServiceLinks
+          value: false
+  - it: test true enableServiceLinks
+    template: jenkins-controller-statefulset.yaml
+    set:
+      controller:
+        enableServiceLinks: true
+    asserts:
+      - isNull:
+          path: spec.template.spec.enableServiceLinks
   - it: test disableSecretMount
     template: jenkins-controller-statefulset.yaml
     set:

diff --git a/charts/jenkins/values.yaml b/charts/jenkins/values.yaml
@@ -123,6 +123,12 @@ controller:
   # Share process namespace to allow sidecar containers to interact with processes in other containers in the same pod
   shareProcessNamespace: false
 
+  # Service links might cause issue if running in a namespace with a large amount of services
+  # that might cause a slow startup when plugins are copied from ref to volume
+  # Set to true to keep previous behavior
+  # See https://github.com/kubernetes/kubernetes/issues/121787
+  enableServiceLinks: false
+
   # Overrides the init container default values
   # -- Resources allocation (Requests and Limits) for Init Container
   initContainerResources: {}