diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md index b78fa8917..78c7c2ff8 100644 --- 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.1.30 + +Add `controller.JCasC.configMapAnnotations` to allow setting annotations on the JCasC ConfigMaps. + ## 5.1.29 Update `docker.io/kiwigrid/k8s-sidecar` to version `1.27.4` diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml index c0e877f7e..aad2a1757 100644 --- 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.1.29 +version: 5.1.30 appVersion: 2.452.1 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 index c0c7b1a28..287b25d2d 100644 --- a/charts/jenkins/VALUES.md +++ b/charts/jenkins/VALUES.md @@ -8,65 +8,66 @@ The following tables list the configurable parameters of the Jenkins chart and t | Key | Type | Description | Default | |:----|:-----|:---------|:------------| -| [additionalAgents](./values.yaml#L1138) | object | Configure additional | `{}` | -| [additionalClouds](./values.yaml#L1163) | object | | `{}` | -| [agent.TTYEnabled](./values.yaml#L1058) | bool | Allocate pseudo tty to the side container | `false` | -| [agent.additionalContainers](./values.yaml#L1091) | list | Add additional containers to the agents | `[]` | -| [agent.alwaysPullImage](./values.yaml#L951) | bool | Always pull agent container image before build | `false` | -| [agent.annotations](./values.yaml#L1087) | object | Annotations to apply to the pod | `{}` | -| [agent.args](./values.yaml#L1052) | string | Arguments passed to command to execute | `"${computer.jnlpmac} ${computer.name}"` | -| [agent.command](./values.yaml#L1050) | string | Command to execute when side container starts | `nil` | -| [agent.componentName](./values.yaml#L919) | string | | `"jenkins-agent"` | -| [agent.connectTimeout](./values.yaml#L1085) | int | Timeout in seconds for an agent to be online | `100` | -| [agent.containerCap](./values.yaml#L1060) | int | Max number of agents to launch | `10` | -| [agent.customJenkinsLabels](./values.yaml#L916) | list | Append Jenkins labels to the agent | `[]` | -| [agent.defaultsProviderTemplate](./values.yaml#L882) | string | The name of the pod template to use for providing default values | `""` | -| [agent.directConnection](./values.yaml#L922) | bool | | `false` | -| [agent.disableDefaultAgent](./values.yaml#L1109) | bool | Disable the default Jenkins Agent configuration | `false` | -| [agent.enabled](./values.yaml#L880) | bool | Enable Kubernetes plugin jnlp-agent podTemplate | `true` | -| [agent.envVars](./values.yaml#L1033) | list | Environment variables for the agent Pod | `[]` | -| [agent.hostNetworking](./values.yaml#L930) | bool | Enables the agent to use the host network | `false` | -| [agent.idleMinutes](./values.yaml#L1065) | int | Allows the Pod to remain active for reuse until the configured number of minutes has passed since the last step was executed on it | `0` | -| [agent.image.repository](./values.yaml#L909) | string | Repository to pull the agent jnlp image from | `"jenkins/inbound-agent"` | -| [agent.image.tag](./values.yaml#L911) | string | Tag of the image to pull | `"3248.v65ecb_254c298-1"` | -| [agent.imagePullSecretName](./values.yaml#L918) | string | Name of the secret to be used to pull the image | `nil` | -| [agent.jenkinsTunnel](./values.yaml#L890) | string | Overrides the Kubernetes Jenkins tunnel | `nil` | -| [agent.jenkinsUrl](./values.yaml#L886) | string | Overrides the Kubernetes Jenkins URL | `nil` | -| [agent.jnlpregistry](./values.yaml#L906) | string | Custom registry used to pull the agent jnlp image from | `nil` | -| [agent.kubernetesConnectTimeout](./values.yaml#L892) | int | The connection timeout in seconds for connections to Kubernetes API. The minimum value is 5 | `5` | -| [agent.kubernetesReadTimeout](./values.yaml#L894) | int | The read timeout in seconds for connections to Kubernetes API. The minimum value is 15 | `15` | -| [agent.livenessProbe](./values.yaml#L941) | object | | `{}` | -| [agent.maxRequestsPerHostStr](./values.yaml#L896) | string | The maximum concurrent connections to Kubernetes API | `"32"` | -| [agent.namespace](./values.yaml#L902) | string | Namespace in which the Kubernetes agents should be launched | `nil` | -| [agent.nodeSelector](./values.yaml#L1044) | object | Node labels for pod assignment | `{}` | -| [agent.nodeUsageMode](./values.yaml#L914) | string | | `"NORMAL"` | -| [agent.podLabels](./values.yaml#L904) | object | Custom Pod labels (an object with `label-key: label-value` pairs) | `{}` | -| [agent.podName](./values.yaml#L1062) | string | Agent Pod base name | `"default"` | -| [agent.podRetention](./values.yaml#L960) | string | | `"Never"` | -| [agent.podTemplates](./values.yaml#L1119) | object | Configures extra pod templates for the default kubernetes cloud | `{}` | -| [agent.privileged](./values.yaml#L924) | bool | Agent privileged container | `false` | -| [agent.resources](./values.yaml#L932) | object | Resources allocation (Requests and Limits) | `{"limits":{"cpu":"512m","memory":"512Mi"},"requests":{"cpu":"512m","memory":"512Mi"}}` | -| [agent.restrictedPssSecurityContext](./values.yaml#L957) | bool | Set a restricted securityContext on jnlp containers | `false` | -| [agent.retentionTimeout](./values.yaml#L898) | int | Time in minutes after which the Kubernetes cloud plugin will clean up an idle worker that has not already terminated | `5` | -| [agent.runAsGroup](./values.yaml#L928) | string | Configure container group | `nil` | -| [agent.runAsUser](./values.yaml#L926) | string | Configure container user | `nil` | -| [agent.secretEnvVars](./values.yaml#L1037) | list | Mount a secret as environment variable | `[]` | -| [agent.showRawYaml](./values.yaml#L964) | bool | | `true` | -| [agent.sideContainerName](./values.yaml#L1054) | string | Side container name | `"jnlp"` | -| [agent.volumes](./values.yaml#L971) | list | Additional volumes | `[]` | -| [agent.waitForPodSec](./values.yaml#L900) | int | Seconds to wait for pod to be running | `600` | -| [agent.websocket](./values.yaml#L921) | bool | Enables agent communication via websockets | `false` | -| [agent.workingDir](./values.yaml#L913) | string | Configure working directory for default agent | `"/home/jenkins/agent"` | -| [agent.workspaceVolume](./values.yaml#L1006) | object | Workspace volume (defaults to EmptyDir) | `{}` | -| [agent.yamlMergeStrategy](./values.yaml#L1083) | string | Defines how the raw yaml field gets merged with yaml definitions from inherited pod templates. Possible values: "merge" or "override" | `"override"` | -| [agent.yamlTemplate](./values.yaml#L1072) | string | The raw yaml of a Pod API Object to merge into the agent spec | `""` | -| [awsSecurityGroupPolicies.enabled](./values.yaml#L1289) | bool | | `false` | -| [awsSecurityGroupPolicies.policies[0].name](./values.yaml#L1291) | string | | `""` | -| [awsSecurityGroupPolicies.policies[0].podSelector](./values.yaml#L1293) | object | | `{}` | -| [awsSecurityGroupPolicies.policies[0].securityGroupIds](./values.yaml#L1292) | list | | `[]` | -| [checkDeprecation](./values.yaml#L1286) | bool | Checks if any deprecated values are used | `true` | +| [additionalAgents](./values.yaml#L1142) | object | Configure additional | `{}` | +| [additionalClouds](./values.yaml#L1167) | object | | `{}` | +| [agent.TTYEnabled](./values.yaml#L1062) | bool | Allocate pseudo tty to the side container | `false` | +| [agent.additionalContainers](./values.yaml#L1095) | list | Add additional containers to the agents | `[]` | +| [agent.alwaysPullImage](./values.yaml#L955) | bool | Always pull agent container image before build | `false` | +| [agent.annotations](./values.yaml#L1091) | object | Annotations to apply to the pod | `{}` | +| [agent.args](./values.yaml#L1056) | string | Arguments passed to command to execute | `"${computer.jnlpmac} ${computer.name}"` | +| [agent.command](./values.yaml#L1054) | string | Command to execute when side container starts | `nil` | +| [agent.componentName](./values.yaml#L923) | string | | `"jenkins-agent"` | +| [agent.connectTimeout](./values.yaml#L1089) | int | Timeout in seconds for an agent to be online | `100` | +| [agent.containerCap](./values.yaml#L1064) | int | Max number of agents to launch | `10` | +| [agent.customJenkinsLabels](./values.yaml#L920) | list | Append Jenkins labels to the agent | `[]` | +| [agent.defaultsProviderTemplate](./values.yaml#L886) | string | The name of the pod template to use for providing default values | `""` | +| [agent.directConnection](./values.yaml#L926) | bool | | `false` | +| [agent.disableDefaultAgent](./values.yaml#L1113) | bool | Disable the default Jenkins Agent configuration | `false` | +| [agent.enabled](./values.yaml#L884) | bool | Enable Kubernetes plugin jnlp-agent podTemplate | `true` | +| [agent.envVars](./values.yaml#L1037) | list | Environment variables for the agent Pod | `[]` | +| [agent.hostNetworking](./values.yaml#L934) | bool | Enables the agent to use the host network | `false` | +| [agent.idleMinutes](./values.yaml#L1069) | int | Allows the Pod to remain active for reuse until the configured number of minutes has passed since the last step was executed on it | `0` | +| [agent.image.repository](./values.yaml#L913) | string | Repository to pull the agent jnlp image from | `"jenkins/inbound-agent"` | +| [agent.image.tag](./values.yaml#L915) | string | Tag of the image to pull | `"3248.v65ecb_254c298-1"` | +| [agent.imagePullSecretName](./values.yaml#L922) | string | Name of the secret to be used to pull the image | `nil` | +| [agent.jenkinsTunnel](./values.yaml#L894) | string | Overrides the Kubernetes Jenkins tunnel | `nil` | +| [agent.jenkinsUrl](./values.yaml#L890) | string | Overrides the Kubernetes Jenkins URL | `nil` | +| [agent.jnlpregistry](./values.yaml#L910) | string | Custom registry used to pull the agent jnlp image from | `nil` | +| [agent.kubernetesConnectTimeout](./values.yaml#L896) | int | The connection timeout in seconds for connections to Kubernetes API. The minimum value is 5 | `5` | +| [agent.kubernetesReadTimeout](./values.yaml#L898) | int | The read timeout in seconds for connections to Kubernetes API. The minimum value is 15 | `15` | +| [agent.livenessProbe](./values.yaml#L945) | object | | `{}` | +| [agent.maxRequestsPerHostStr](./values.yaml#L900) | string | The maximum concurrent connections to Kubernetes API | `"32"` | +| [agent.namespace](./values.yaml#L906) | string | Namespace in which the Kubernetes agents should be launched | `nil` | +| [agent.nodeSelector](./values.yaml#L1048) | object | Node labels for pod assignment | `{}` | +| [agent.nodeUsageMode](./values.yaml#L918) | string | | `"NORMAL"` | +| [agent.podLabels](./values.yaml#L908) | object | Custom Pod labels (an object with `label-key: label-value` pairs) | `{}` | +| [agent.podName](./values.yaml#L1066) | string | Agent Pod base name | `"default"` | +| [agent.podRetention](./values.yaml#L964) | string | | `"Never"` | +| [agent.podTemplates](./values.yaml#L1123) | object | Configures extra pod templates for the default kubernetes cloud | `{}` | +| [agent.privileged](./values.yaml#L928) | bool | Agent privileged container | `false` | +| [agent.resources](./values.yaml#L936) | object | Resources allocation (Requests and Limits) | `{"limits":{"cpu":"512m","memory":"512Mi"},"requests":{"cpu":"512m","memory":"512Mi"}}` | +| [agent.restrictedPssSecurityContext](./values.yaml#L961) | bool | Set a restricted securityContext on jnlp containers | `false` | +| [agent.retentionTimeout](./values.yaml#L902) | int | Time in minutes after which the Kubernetes cloud plugin will clean up an idle worker that has not already terminated | `5` | +| [agent.runAsGroup](./values.yaml#L932) | string | Configure container group | `nil` | +| [agent.runAsUser](./values.yaml#L930) | string | Configure container user | `nil` | +| [agent.secretEnvVars](./values.yaml#L1041) | list | Mount a secret as environment variable | `[]` | +| [agent.showRawYaml](./values.yaml#L968) | bool | | `true` | +| [agent.sideContainerName](./values.yaml#L1058) | string | Side container name | `"jnlp"` | +| [agent.volumes](./values.yaml#L975) | list | Additional volumes | `[]` | +| [agent.waitForPodSec](./values.yaml#L904) | int | Seconds to wait for pod to be running | `600` | +| [agent.websocket](./values.yaml#L925) | bool | Enables agent communication via websockets | `false` | +| [agent.workingDir](./values.yaml#L917) | string | Configure working directory for default agent | `"/home/jenkins/agent"` | +| [agent.workspaceVolume](./values.yaml#L1010) | object | Workspace volume (defaults to EmptyDir) | `{}` | +| [agent.yamlMergeStrategy](./values.yaml#L1087) | string | Defines how the raw yaml field gets merged with yaml definitions from inherited pod templates. Possible values: "merge" or "override" | `"override"` | +| [agent.yamlTemplate](./values.yaml#L1076) | string | The raw yaml of a Pod API Object to merge into the agent spec | `""` | +| [awsSecurityGroupPolicies.enabled](./values.yaml#L1293) | bool | | `false` | +| [awsSecurityGroupPolicies.policies[0].name](./values.yaml#L1295) | string | | `""` | +| [awsSecurityGroupPolicies.policies[0].podSelector](./values.yaml#L1297) | object | | `{}` | +| [awsSecurityGroupPolicies.policies[0].securityGroupIds](./values.yaml#L1296) | list | | `[]` | +| [checkDeprecation](./values.yaml#L1290) | bool | Checks if any deprecated values are used | `true` | | [clusterZone](./values.yaml#L21) | string | Override the cluster name for FQDN resolving | `"cluster.local"` | | [controller.JCasC.authorizationStrategy](./values.yaml#L533) | string | Jenkins Config as Code Authorization Strategy-section | `"loggedInUsersCanDoAnything:\n allowAnonymousRead: false"` | +| [controller.JCasC.configMapAnnotations](./values.yaml#L538) | object | Annotations for the JCasC ConfigMap | `{}` | | [controller.JCasC.configScripts](./values.yaml#L507) | object | List of Jenkins Config as Code scripts | `{}` | | [controller.JCasC.configUrls](./values.yaml#L504) | list | Remote URLs for configuration files. | `[]` | | [controller.JCasC.defaultConfig](./values.yaml#L498) | bool | Enables default Jenkins configuration via configuration as code plugin | `true` | @@ -82,7 +83,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | [controller.admin.passwordKey](./values.yaml#L86) | string | The key in the existing admin secret containing the password | `"jenkins-admin-password"` | | [controller.admin.userKey](./values.yaml#L84) | string | The key in the existing admin secret containing the username | `"jenkins-admin-user"` | | [controller.admin.username](./values.yaml#L78) | string | Admin username created as a secret if `controller.admin.createSecret` is true | `"admin"` | -| [controller.affinity](./values.yaml#L638) | object | Affinity settings | `{}` | +| [controller.affinity](./values.yaml#L642) | object | Affinity settings | `{}` | | [controller.agentListenerEnabled](./values.yaml#L318) | bool | Create Agent listener service | `true` | | [controller.agentListenerExternalTrafficPolicy](./values.yaml#L328) | string | Traffic Policy of for the agentListener service | `nil` | | [controller.agentListenerHostPort](./values.yaml#L322) | string | Host port to listen for agents | `nil` | @@ -92,12 +93,12 @@ The following tables list the configurable parameters of the Jenkins chart and t | [controller.agentListenerPort](./values.yaml#L320) | int | Listening port for agents | `50000` | | [controller.agentListenerServiceAnnotations](./values.yaml#L353) | object | Annotations for the agentListener service | `{}` | | [controller.agentListenerServiceType](./values.yaml#L350) | string | Defines how to expose the agentListener service | `"ClusterIP"` | -| [controller.backendconfig.annotations](./values.yaml#L738) | object | backendconfig annotations | `{}` | -| [controller.backendconfig.apiVersion](./values.yaml#L732) | string | backendconfig API version | `"extensions/v1beta1"` | -| [controller.backendconfig.enabled](./values.yaml#L730) | bool | Enables backendconfig | `false` | -| [controller.backendconfig.labels](./values.yaml#L736) | object | backendconfig labels | `{}` | -| [controller.backendconfig.name](./values.yaml#L734) | string | backendconfig name | `nil` | -| [controller.backendconfig.spec](./values.yaml#L740) | object | backendconfig spec | `{}` | +| [controller.backendconfig.annotations](./values.yaml#L742) | object | backendconfig annotations | `{}` | +| [controller.backendconfig.apiVersion](./values.yaml#L736) | string | backendconfig API version | `"extensions/v1beta1"` | +| [controller.backendconfig.enabled](./values.yaml#L734) | bool | Enables backendconfig | `false` | +| [controller.backendconfig.labels](./values.yaml#L740) | object | backendconfig labels | `{}` | +| [controller.backendconfig.name](./values.yaml#L738) | string | backendconfig name | `nil` | +| [controller.backendconfig.spec](./values.yaml#L744) | object | backendconfig spec | `{}` | | [controller.cloudName](./values.yaml#L487) | string | Name of default cloud configuration. | `"kubernetes"` | | [controller.clusterIp](./values.yaml#L217) | string | k8s service clusterIP. Only used if serviceType is ClusterIP | `nil` | | [controller.componentName](./values.yaml#L34) | string | Used for label app.kubernetes.io/component | `"jenkins-controller"` | @@ -106,7 +107,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | [controller.containerSecurityContext](./values.yaml#L205) | object | Allow controlling the securityContext for the jenkins container | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":1000,"runAsUser":1000}` | | [controller.csrf.defaultCrumbIssuer.enabled](./values.yaml#L339) | bool | Enable the default CSRF Crumb issuer | `true` | | [controller.csrf.defaultCrumbIssuer.proxyCompatability](./values.yaml#L341) | bool | Enable proxy compatibility | `true` | -| [controller.customInitContainers](./values.yaml#L537) | list | Custom init-container specification in raw-yaml format | `[]` | +| [controller.customInitContainers](./values.yaml#L541) | list | Custom init-container specification in raw-yaml format | `[]` | | [controller.customJenkinsLabels](./values.yaml#L68) | list | Append Jenkins labels to the controller | `[]` | | [controller.disableRememberMe](./values.yaml#L59) | bool | Disable use of remember me | `false` | | [controller.disabledAgentProtocols](./values.yaml#L333) | list | Disabled agent protocols | `["JNLP-connect","JNLP2-connect"]` | @@ -115,38 +116,38 @@ The following tables list the configurable parameters of the Jenkins chart and t | [controller.existingSecret](./values.yaml#L456) | string | | `nil` | | [controller.extraPorts](./values.yaml#L388) | list | Optionally configure other ports to expose in the controller container | `[]` | | [controller.fsGroup](./values.yaml#L186) | int | Deprecated in favor of `controller.podSecurityContextOverride`. uid that will be used for persistent volume. | `1000` | -| [controller.googlePodMonitor.enabled](./values.yaml#L801) | bool | | `false` | -| [controller.googlePodMonitor.scrapeEndpoint](./values.yaml#L806) | string | | `"/prometheus"` | -| [controller.googlePodMonitor.scrapeInterval](./values.yaml#L804) | string | | `"60s"` | +| [controller.googlePodMonitor.enabled](./values.yaml#L805) | bool | | `false` | +| [controller.googlePodMonitor.scrapeEndpoint](./values.yaml#L810) | string | | `"/prometheus"` | +| [controller.googlePodMonitor.scrapeInterval](./values.yaml#L808) | string | | `"60s"` | | [controller.healthProbes](./values.yaml#L248) | bool | Enable Kubernetes Probes configuration configured in `controller.probes` | `true` | -| [controller.hostAliases](./values.yaml#L754) | list | Allows for adding entries to Pod /etc/hosts | `[]` | +| [controller.hostAliases](./values.yaml#L758) | list | Allows for adding entries to Pod /etc/hosts | `[]` | | [controller.hostNetworking](./values.yaml#L70) | bool | | `false` | -| [controller.httpsKeyStore.disableSecretMount](./values.yaml#L822) | bool | | `false` | -| [controller.httpsKeyStore.enable](./values.yaml#L813) | bool | Enables HTTPS keystore on jenkins controller | `false` | -| [controller.httpsKeyStore.fileName](./values.yaml#L830) | string | Jenkins keystore filename which will appear under controller.httpsKeyStore.path | `"keystore.jks"` | -| [controller.httpsKeyStore.httpPort](./values.yaml#L826) | int | HTTP Port that Jenkins should listen to along with HTTPS, it also serves as the liveness and readiness probes port. | `8081` | -| [controller.httpsKeyStore.jenkinsHttpsJksPasswordSecretKey](./values.yaml#L821) | string | Name of the key in the secret that contains the JKS password | `"https-jks-password"` | -| [controller.httpsKeyStore.jenkinsHttpsJksPasswordSecretName](./values.yaml#L819) | string | Name of the secret that contains the JKS password, if it is not in the same secret as the JKS file | `""` | -| [controller.httpsKeyStore.jenkinsHttpsJksSecretKey](./values.yaml#L817) | string | Name of the key in the secret that already has ssl keystore | `"jenkins-jks-file"` | -| [controller.httpsKeyStore.jenkinsHttpsJksSecretName](./values.yaml#L815) | string | Name of the secret that already has ssl keystore | `""` | -| [controller.httpsKeyStore.jenkinsKeyStoreBase64Encoded](./values.yaml#L835) | string | Base64 encoded Keystore content. Keystore must be converted to base64 then being pasted here | `nil` | -| [controller.httpsKeyStore.password](./values.yaml#L832) | string | Jenkins keystore password | `"password"` | -| [controller.httpsKeyStore.path](./values.yaml#L828) | string | Path of HTTPS keystore file | `"/var/jenkins_keystore"` | +| [controller.httpsKeyStore.disableSecretMount](./values.yaml#L826) | bool | | `false` | +| [controller.httpsKeyStore.enable](./values.yaml#L817) | bool | Enables HTTPS keystore on jenkins controller | `false` | +| [controller.httpsKeyStore.fileName](./values.yaml#L834) | string | Jenkins keystore filename which will appear under controller.httpsKeyStore.path | `"keystore.jks"` | +| [controller.httpsKeyStore.httpPort](./values.yaml#L830) | int | HTTP Port that Jenkins should listen to along with HTTPS, it also serves as the liveness and readiness probes port. | `8081` | +| [controller.httpsKeyStore.jenkinsHttpsJksPasswordSecretKey](./values.yaml#L825) | string | Name of the key in the secret that contains the JKS password | `"https-jks-password"` | +| [controller.httpsKeyStore.jenkinsHttpsJksPasswordSecretName](./values.yaml#L823) | string | Name of the secret that contains the JKS password, if it is not in the same secret as the JKS file | `""` | +| [controller.httpsKeyStore.jenkinsHttpsJksSecretKey](./values.yaml#L821) | string | Name of the key in the secret that already has ssl keystore | `"jenkins-jks-file"` | +| [controller.httpsKeyStore.jenkinsHttpsJksSecretName](./values.yaml#L819) | string | Name of the secret that already has ssl keystore | `""` | +| [controller.httpsKeyStore.jenkinsKeyStoreBase64Encoded](./values.yaml#L839) | string | Base64 encoded Keystore content. Keystore must be converted to base64 then being pasted here | `nil` | +| [controller.httpsKeyStore.password](./values.yaml#L836) | string | Jenkins keystore password | `"password"` | +| [controller.httpsKeyStore.path](./values.yaml#L832) | string | Path of HTTPS keystore file | `"/var/jenkins_keystore"` | | [controller.image.pullPolicy](./values.yaml#L47) | string | Controller image pull policy | `"Always"` | | [controller.image.registry](./values.yaml#L37) | string | Controller image registry | `"docker.io"` | | [controller.image.repository](./values.yaml#L39) | string | Controller image repository | `"jenkins/jenkins"` | | [controller.image.tag](./values.yaml#L42) | string | Controller image tag override; i.e., tag: "2.440.1-jdk17" | `nil` | | [controller.image.tagLabel](./values.yaml#L45) | string | Controller image tag label | `"jdk17"` | | [controller.imagePullSecretName](./values.yaml#L49) | string | Controller image pull secret | `nil` | -| [controller.ingress.annotations](./values.yaml#L677) | object | Ingress annotations | `{}` | -| [controller.ingress.apiVersion](./values.yaml#L673) | string | Ingress API version | `"extensions/v1beta1"` | -| [controller.ingress.enabled](./values.yaml#L656) | bool | Enables ingress | `false` | -| [controller.ingress.hostName](./values.yaml#L690) | string | Ingress hostname | `nil` | -| [controller.ingress.labels](./values.yaml#L675) | object | Ingress labels | `{}` | -| [controller.ingress.path](./values.yaml#L686) | string | Ingress path | `nil` | -| [controller.ingress.paths](./values.yaml#L660) | list | Override for the default Ingress paths | `[]` | -| [controller.ingress.resourceRootUrl](./values.yaml#L692) | string | Hostname to serve assets from | `nil` | -| [controller.ingress.tls](./values.yaml#L694) | list | Ingress TLS configuration | `[]` | +| [controller.ingress.annotations](./values.yaml#L681) | object | Ingress annotations | `{}` | +| [controller.ingress.apiVersion](./values.yaml#L677) | string | Ingress API version | `"extensions/v1beta1"` | +| [controller.ingress.enabled](./values.yaml#L660) | bool | Enables ingress | `false` | +| [controller.ingress.hostName](./values.yaml#L694) | string | Ingress hostname | `nil` | +| [controller.ingress.labels](./values.yaml#L679) | object | Ingress labels | `{}` | +| [controller.ingress.path](./values.yaml#L690) | string | Ingress path | `nil` | +| [controller.ingress.paths](./values.yaml#L664) | list | Override for the default Ingress paths | `[]` | +| [controller.ingress.resourceRootUrl](./values.yaml#L696) | string | Hostname to serve assets from | `nil` | +| [controller.ingress.tls](./values.yaml#L698) | list | Ingress TLS configuration | `[]` | | [controller.initConfigMap](./values.yaml#L446) | string | Name of the existing ConfigMap that contains init scripts | `nil` | | [controller.initContainerEnv](./values.yaml#L141) | list | Environment variables for Init Container | `[]` | | [controller.initContainerEnvFrom](./values.yaml#L137) | list | Environment variable sources for Init Container | `[]` | @@ -172,11 +173,11 @@ The following tables list the configurable parameters of the Jenkins chart and t | [controller.loadBalancerSourceRanges](./values.yaml#L372) | list | Allowed inbound IP addresses | `["0.0.0.0/0"]` | | [controller.markupFormatter](./values.yaml#L433) | string | Yaml of the markup formatter to use | `"plainText"` | | [controller.nodePort](./values.yaml#L223) | string | k8s node port. Only used if serviceType is NodePort | `nil` | -| [controller.nodeSelector](./values.yaml#L625) | object | Node labels for pod assignment | `{}` | +| [controller.nodeSelector](./values.yaml#L629) | object | Node labels for pod assignment | `{}` | | [controller.numExecutors](./values.yaml#L62) | int | Set Number of executors | `0` | | [controller.overwritePlugins](./values.yaml#L418) | bool | Overwrite installed plugins on start | `false` | | [controller.overwritePluginsFromImage](./values.yaml#L422) | bool | Overwrite plugins that are already installed in the controller image | `true` | -| [controller.podAnnotations](./values.yaml#L646) | object | Annotations for controller pod | `{}` | +| [controller.podAnnotations](./values.yaml#L650) | object | Annotations for controller pod | `{}` | | [controller.podDisruptionBudget.annotations](./values.yaml#L312) | object | | `{}` | | [controller.podDisruptionBudget.apiVersion](./values.yaml#L310) | string | Policy API version | `"policy/v1beta1"` | | [controller.podDisruptionBudget.enabled](./values.yaml#L305) | bool | Enable Kubernetes Pod Disruption Budget configuration | `false` | @@ -184,7 +185,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | [controller.podDisruptionBudget.maxUnavailable](./values.yaml#L315) | string | Number of pods that can be unavailable. Either an absolute number or a percentage | `"0"` | | [controller.podLabels](./values.yaml#L241) | object | Custom Pod labels (an object with `label-key: label-value` pairs) | `{}` | | [controller.podSecurityContextOverride](./values.yaml#L202) | string | Completely overwrites the contents of the pod security context, ignoring the values provided for `runAsUser`, `fsGroup`, and `securityContextCapabilities` | `nil` | -| [controller.priorityClassName](./values.yaml#L643) | string | The name of a `priorityClass` to apply to the controller pod | `nil` | +| [controller.priorityClassName](./values.yaml#L647) | string | The name of a `priorityClass` to apply to the controller pod | `nil` | | [controller.probes.livenessProbe.failureThreshold](./values.yaml#L266) | int | Set the failure threshold for the liveness probe | `5` | | [controller.probes.livenessProbe.httpGet.path](./values.yaml#L269) | string | Set the Pod's HTTP path for the liveness probe | `"{{ default \"\" .Values.controller.jenkinsUriPrefix }}/login"` | | [controller.probes.livenessProbe.httpGet.port](./values.yaml#L271) | string | Set the Pod's HTTP port to use for the liveness probe | `"http"` | @@ -203,31 +204,31 @@ The following tables list the configurable parameters of the Jenkins chart and t | [controller.probes.startupProbe.periodSeconds](./values.yaml#L260) | int | Set the time interval between two startup probes executions in seconds | `10` | | [controller.probes.startupProbe.timeoutSeconds](./values.yaml#L262) | int | Set the timeout for the startup probe in seconds | `5` | | [controller.projectNamingStrategy](./values.yaml#L425) | string | | `"standard"` | -| [controller.prometheus.alertingRulesAdditionalLabels](./values.yaml#L787) | object | Additional labels to add to the PrometheusRule object | `{}` | -| [controller.prometheus.alertingrules](./values.yaml#L785) | list | Array of prometheus alerting rules | `[]` | -| [controller.prometheus.enabled](./values.yaml#L770) | bool | Enables prometheus service monitor | `false` | -| [controller.prometheus.metricRelabelings](./values.yaml#L797) | list | | `[]` | -| [controller.prometheus.prometheusRuleNamespace](./values.yaml#L789) | string | Set a custom namespace where to deploy PrometheusRule resource | `""` | -| [controller.prometheus.relabelings](./values.yaml#L795) | list | | `[]` | -| [controller.prometheus.scrapeEndpoint](./values.yaml#L780) | string | The endpoint prometheus should get metrics from | `"/prometheus"` | -| [controller.prometheus.scrapeInterval](./values.yaml#L776) | string | How often prometheus should scrape metrics | `"60s"` | -| [controller.prometheus.serviceMonitorAdditionalLabels](./values.yaml#L772) | object | Additional labels to add to the service monitor object | `{}` | -| [controller.prometheus.serviceMonitorNamespace](./values.yaml#L774) | string | Set a custom namespace where to deploy ServiceMonitor resource | `nil` | +| [controller.prometheus.alertingRulesAdditionalLabels](./values.yaml#L791) | object | Additional labels to add to the PrometheusRule object | `{}` | +| [controller.prometheus.alertingrules](./values.yaml#L789) | list | Array of prometheus alerting rules | `[]` | +| [controller.prometheus.enabled](./values.yaml#L774) | bool | Enables prometheus service monitor | `false` | +| [controller.prometheus.metricRelabelings](./values.yaml#L801) | list | | `[]` | +| [controller.prometheus.prometheusRuleNamespace](./values.yaml#L793) | string | Set a custom namespace where to deploy PrometheusRule resource | `""` | +| [controller.prometheus.relabelings](./values.yaml#L799) | list | | `[]` | +| [controller.prometheus.scrapeEndpoint](./values.yaml#L784) | string | The endpoint prometheus should get metrics from | `"/prometheus"` | +| [controller.prometheus.scrapeInterval](./values.yaml#L780) | string | How often prometheus should scrape metrics | `"60s"` | +| [controller.prometheus.serviceMonitorAdditionalLabels](./values.yaml#L776) | object | Additional labels to add to the service monitor object | `{}` | +| [controller.prometheus.serviceMonitorNamespace](./values.yaml#L778) | string | Set a custom namespace where to deploy ServiceMonitor resource | `nil` | | [controller.resources](./values.yaml#L115) | object | Resource allocation (Requests and Limits) | `{"limits":{"cpu":"2000m","memory":"4096Mi"},"requests":{"cpu":"50m","memory":"256Mi"}}` | -| [controller.route.annotations](./values.yaml#L749) | object | Route annotations | `{}` | -| [controller.route.enabled](./values.yaml#L745) | bool | Enables openshift route | `false` | -| [controller.route.labels](./values.yaml#L747) | object | Route labels | `{}` | -| [controller.route.path](./values.yaml#L751) | string | Route path | `nil` | +| [controller.route.annotations](./values.yaml#L753) | object | Route annotations | `{}` | +| [controller.route.enabled](./values.yaml#L749) | bool | Enables openshift route | `false` | +| [controller.route.labels](./values.yaml#L751) | object | Route labels | `{}` | +| [controller.route.path](./values.yaml#L755) | string | Route path | `nil` | | [controller.runAsUser](./values.yaml#L183) | int | Deprecated in favor of `controller.podSecurityContextOverride`. uid that jenkins runs with. | `1000` | -| [controller.schedulerName](./values.yaml#L621) | string | Name of the Kubernetes scheduler to use | `""` | +| [controller.schedulerName](./values.yaml#L625) | string | Name of the Kubernetes scheduler to use | `""` | | [controller.scriptApproval](./values.yaml#L437) | list | List of groovy functions to approve | `[]` | -| [controller.secondaryingress.annotations](./values.yaml#L712) | object | | `{}` | -| [controller.secondaryingress.apiVersion](./values.yaml#L710) | string | | `"extensions/v1beta1"` | -| [controller.secondaryingress.enabled](./values.yaml#L704) | bool | | `false` | -| [controller.secondaryingress.hostName](./values.yaml#L719) | string | | `nil` | -| [controller.secondaryingress.labels](./values.yaml#L711) | object | | `{}` | -| [controller.secondaryingress.paths](./values.yaml#L707) | list | | `[]` | -| [controller.secondaryingress.tls](./values.yaml#L720) | string | | `nil` | +| [controller.secondaryingress.annotations](./values.yaml#L716) | object | | `{}` | +| [controller.secondaryingress.apiVersion](./values.yaml#L714) | string | | `"extensions/v1beta1"` | +| [controller.secondaryingress.enabled](./values.yaml#L708) | bool | | `false` | +| [controller.secondaryingress.hostName](./values.yaml#L723) | string | | `nil` | +| [controller.secondaryingress.labels](./values.yaml#L715) | object | | `{}` | +| [controller.secondaryingress.paths](./values.yaml#L711) | list | | `[]` | +| [controller.secondaryingress.tls](./values.yaml#L724) | string | | `nil` | | [controller.secretClaims](./values.yaml#L480) | list | List of `SecretClaim` resources to create | `[]` | | [controller.securityContextCapabilities](./values.yaml#L192) | object | | `{}` | | [controller.serviceAnnotations](./values.yaml#L230) | object | Jenkins controller service annotations | `{}` | @@ -236,68 +237,68 @@ The following tables list the configurable parameters of the Jenkins chart and t | [controller.servicePort](./values.yaml#L219) | int | k8s service port | `8080` | | [controller.serviceType](./values.yaml#L214) | string | k8s service type | `"ClusterIP"` | | [controller.shareProcessNamespace](./values.yaml#L124) | bool | | `false` | -| [controller.sidecars.additionalSidecarContainers](./values.yaml#L603) | list | Configures additional sidecar container(s) for the Jenkins controller | `[]` | -| [controller.sidecars.configAutoReload.containerSecurityContext](./values.yaml#L598) | object | Enable container security context | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true}` | -| [controller.sidecars.configAutoReload.enabled](./values.yaml#L550) | bool | Enables Jenkins Config as Code auto-reload | `true` | -| [controller.sidecars.configAutoReload.env](./values.yaml#L580) | object | Environment variables for the Jenkins Config as Code auto-reload container | `{}` | -| [controller.sidecars.configAutoReload.envFrom](./values.yaml#L578) | list | Environment variable sources for the Jenkins Config as Code auto-reload container | `[]` | -| [controller.sidecars.configAutoReload.folder](./values.yaml#L591) | string | | `"/var/jenkins_home/casc_configs"` | -| [controller.sidecars.configAutoReload.image.registry](./values.yaml#L553) | string | Registry for the image that triggers the reload | `"docker.io"` | -| [controller.sidecars.configAutoReload.image.repository](./values.yaml#L555) | string | Repository of the image that triggers the reload | `"kiwigrid/k8s-sidecar"` | -| [controller.sidecars.configAutoReload.image.tag](./values.yaml#L557) | string | Tag for the image that triggers the reload | `"1.27.4"` | -| [controller.sidecars.configAutoReload.imagePullPolicy](./values.yaml#L558) | string | | `"IfNotPresent"` | -| [controller.sidecars.configAutoReload.reqRetryConnect](./values.yaml#L573) | int | How many connection-related errors to retry on | `10` | -| [controller.sidecars.configAutoReload.resources](./values.yaml#L559) | object | | `{}` | -| [controller.sidecars.configAutoReload.scheme](./values.yaml#L568) | string | The scheme to use when connecting to the Jenkins configuration as code endpoint | `"http"` | -| [controller.sidecars.configAutoReload.skipTlsVerify](./values.yaml#L570) | bool | Skip TLS verification when connecting to the Jenkins configuration as code endpoint | `false` | -| [controller.sidecars.configAutoReload.sleepTime](./values.yaml#L575) | string | How many seconds to wait before updating config-maps/secrets (sets METHOD=SLEEP on the sidecar) | `nil` | -| [controller.sidecars.configAutoReload.sshTcpPort](./values.yaml#L589) | int | | `1044` | -| [controller.statefulSetAnnotations](./values.yaml#L648) | object | Annotations for controller StatefulSet | `{}` | +| [controller.sidecars.additionalSidecarContainers](./values.yaml#L607) | list | Configures additional sidecar container(s) for the Jenkins controller | `[]` | +| [controller.sidecars.configAutoReload.containerSecurityContext](./values.yaml#L602) | object | Enable container security context | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true}` | +| [controller.sidecars.configAutoReload.enabled](./values.yaml#L554) | bool | Enables Jenkins Config as Code auto-reload | `true` | +| [controller.sidecars.configAutoReload.env](./values.yaml#L584) | object | Environment variables for the Jenkins Config as Code auto-reload container | `{}` | +| [controller.sidecars.configAutoReload.envFrom](./values.yaml#L582) | list | Environment variable sources for the Jenkins Config as Code auto-reload container | `[]` | +| [controller.sidecars.configAutoReload.folder](./values.yaml#L595) | string | | `"/var/jenkins_home/casc_configs"` | +| [controller.sidecars.configAutoReload.image.registry](./values.yaml#L557) | string | Registry for the image that triggers the reload | `"docker.io"` | +| [controller.sidecars.configAutoReload.image.repository](./values.yaml#L559) | string | Repository of the image that triggers the reload | `"kiwigrid/k8s-sidecar"` | +| [controller.sidecars.configAutoReload.image.tag](./values.yaml#L561) | string | Tag for the image that triggers the reload | `"1.27.4"` | +| [controller.sidecars.configAutoReload.imagePullPolicy](./values.yaml#L562) | string | | `"IfNotPresent"` | +| [controller.sidecars.configAutoReload.reqRetryConnect](./values.yaml#L577) | int | How many connection-related errors to retry on | `10` | +| [controller.sidecars.configAutoReload.resources](./values.yaml#L563) | object | | `{}` | +| [controller.sidecars.configAutoReload.scheme](./values.yaml#L572) | string | The scheme to use when connecting to the Jenkins configuration as code endpoint | `"http"` | +| [controller.sidecars.configAutoReload.skipTlsVerify](./values.yaml#L574) | bool | Skip TLS verification when connecting to the Jenkins configuration as code endpoint | `false` | +| [controller.sidecars.configAutoReload.sleepTime](./values.yaml#L579) | string | How many seconds to wait before updating config-maps/secrets (sets METHOD=SLEEP on the sidecar) | `nil` | +| [controller.sidecars.configAutoReload.sshTcpPort](./values.yaml#L593) | int | | `1044` | +| [controller.statefulSetAnnotations](./values.yaml#L652) | object | Annotations for controller StatefulSet | `{}` | | [controller.statefulSetLabels](./values.yaml#L232) | object | Jenkins controller custom labels for the StatefulSet | `{}` | | [controller.targetPort](./values.yaml#L221) | int | k8s target port | `8080` | -| [controller.terminationGracePeriodSeconds](./values.yaml#L631) | string | Set TerminationGracePeriodSeconds | `nil` | -| [controller.terminationMessagePath](./values.yaml#L633) | string | Set the termination message path | `nil` | -| [controller.terminationMessagePolicy](./values.yaml#L635) | string | Set the termination message policy | `nil` | -| [controller.testEnabled](./values.yaml#L809) | bool | Can be used to disable rendering controller test resources when using helm template | `true` | -| [controller.tolerations](./values.yaml#L629) | list | Toleration labels for pod assignment | `[]` | -| [controller.updateStrategy](./values.yaml#L652) | object | Update strategy for StatefulSet | `{}` | +| [controller.terminationGracePeriodSeconds](./values.yaml#L635) | string | Set TerminationGracePeriodSeconds | `nil` | +| [controller.terminationMessagePath](./values.yaml#L637) | string | Set the termination message path | `nil` | +| [controller.terminationMessagePolicy](./values.yaml#L639) | string | Set the termination message policy | `nil` | +| [controller.testEnabled](./values.yaml#L813) | bool | Can be used to disable rendering controller test resources when using helm template | `true` | +| [controller.tolerations](./values.yaml#L633) | list | Toleration labels for pod assignment | `[]` | +| [controller.updateStrategy](./values.yaml#L656) | object | Update strategy for StatefulSet | `{}` | | [controller.usePodSecurityContext](./values.yaml#L176) | bool | Enable pod security context (must be `true` if podSecurityContextOverride, runAsUser or fsGroup are set) | `true` | | [credentialsId](./values.yaml#L27) | string | The Jenkins credentials to access the Kubernetes API server. For the default cluster it is not needed. | `nil` | | [fullnameOverride](./values.yaml#L13) | string | Override the full resource names | `jenkins-(release-name)` or `jenkins` if the release-name is `jenkins` | -| [helmtest.bats.image.registry](./values.yaml#L1302) | string | Registry of the image used to test the framework | `"docker.io"` | -| [helmtest.bats.image.repository](./values.yaml#L1304) | string | Repository of the image used to test the framework | `"bats/bats"` | -| [helmtest.bats.image.tag](./values.yaml#L1306) | string | Tag of the image to test the framework | `"1.11.0"` | +| [helmtest.bats.image.registry](./values.yaml#L1306) | string | Registry of the image used to test the framework | `"docker.io"` | +| [helmtest.bats.image.repository](./values.yaml#L1308) | string | Repository of the image used to test the framework | `"bats/bats"` | +| [helmtest.bats.image.tag](./values.yaml#L1310) | string | Tag of the image to test the framework | `"1.11.0"` | | [kubernetesURL](./values.yaml#L24) | string | The URL of the Kubernetes API server | `"https://kubernetes.default"` | | [nameOverride](./values.yaml#L10) | string | Override the resource name prefix | `Chart.Name` | | [namespaceOverride](./values.yaml#L16) | string | Override the deployment namespace | `Release.Namespace` | -| [networkPolicy.apiVersion](./values.yaml#L1232) | string | NetworkPolicy ApiVersion | `"networking.k8s.io/v1"` | -| [networkPolicy.enabled](./values.yaml#L1227) | bool | Enable the creation of NetworkPolicy resources | `false` | -| [networkPolicy.externalAgents.except](./values.yaml#L1246) | list | A list of IP sub-ranges to be excluded from the allowlisted IP range | `[]` | -| [networkPolicy.externalAgents.ipCIDR](./values.yaml#L1244) | string | The IP range from which external agents are allowed to connect to controller, i.e., 172.17.0.0/16 | `nil` | -| [networkPolicy.internalAgents.allowed](./values.yaml#L1236) | bool | Allow internal agents (from the same cluster) to connect to controller. Agent pods will be filtered based on PodLabels | `true` | -| [networkPolicy.internalAgents.namespaceLabels](./values.yaml#L1240) | object | A map of labels (keys/values) that agents namespaces must have to be able to connect to controller | `{}` | -| [networkPolicy.internalAgents.podLabels](./values.yaml#L1238) | object | A map of labels (keys/values) that agent pods must have to be able to connect to controller | `{}` | -| [persistence.accessMode](./values.yaml#L1202) | string | The PVC access mode | `"ReadWriteOnce"` | -| [persistence.annotations](./values.yaml#L1198) | object | Annotations for the PVC | `{}` | -| [persistence.dataSource](./values.yaml#L1208) | object | Existing data source to clone PVC from | `{}` | -| [persistence.enabled](./values.yaml#L1182) | bool | Enable the use of a Jenkins PVC | `true` | -| [persistence.existingClaim](./values.yaml#L1188) | string | Provide the name of a PVC | `nil` | -| [persistence.labels](./values.yaml#L1200) | object | Labels for the PVC | `{}` | -| [persistence.mounts](./values.yaml#L1220) | list | Additional mounts | `[]` | -| [persistence.size](./values.yaml#L1204) | string | The size of the PVC | `"8Gi"` | -| [persistence.storageClass](./values.yaml#L1196) | string | Storage class for the PVC | `nil` | -| [persistence.subPath](./values.yaml#L1213) | string | SubPath for jenkins-home mount | `nil` | -| [persistence.volumes](./values.yaml#L1215) | list | Additional volumes | `[]` | -| [rbac.create](./values.yaml#L1252) | bool | Whether RBAC resources are created | `true` | -| [rbac.readSecrets](./values.yaml#L1254) | bool | Whether the Jenkins service account should be able to read Kubernetes secrets | `false` | +| [networkPolicy.apiVersion](./values.yaml#L1236) | string | NetworkPolicy ApiVersion | `"networking.k8s.io/v1"` | +| [networkPolicy.enabled](./values.yaml#L1231) | bool | Enable the creation of NetworkPolicy resources | `false` | +| [networkPolicy.externalAgents.except](./values.yaml#L1250) | list | A list of IP sub-ranges to be excluded from the allowlisted IP range | `[]` | +| [networkPolicy.externalAgents.ipCIDR](./values.yaml#L1248) | string | The IP range from which external agents are allowed to connect to controller, i.e., 172.17.0.0/16 | `nil` | +| [networkPolicy.internalAgents.allowed](./values.yaml#L1240) | bool | Allow internal agents (from the same cluster) to connect to controller. Agent pods will be filtered based on PodLabels | `true` | +| [networkPolicy.internalAgents.namespaceLabels](./values.yaml#L1244) | object | A map of labels (keys/values) that agents namespaces must have to be able to connect to controller | `{}` | +| [networkPolicy.internalAgents.podLabels](./values.yaml#L1242) | object | A map of labels (keys/values) that agent pods must have to be able to connect to controller | `{}` | +| [persistence.accessMode](./values.yaml#L1206) | string | The PVC access mode | `"ReadWriteOnce"` | +| [persistence.annotations](./values.yaml#L1202) | object | Annotations for the PVC | `{}` | +| [persistence.dataSource](./values.yaml#L1212) | object | Existing data source to clone PVC from | `{}` | +| [persistence.enabled](./values.yaml#L1186) | bool | Enable the use of a Jenkins PVC | `true` | +| [persistence.existingClaim](./values.yaml#L1192) | string | Provide the name of a PVC | `nil` | +| [persistence.labels](./values.yaml#L1204) | object | Labels for the PVC | `{}` | +| [persistence.mounts](./values.yaml#L1224) | list | Additional mounts | `[]` | +| [persistence.size](./values.yaml#L1208) | string | The size of the PVC | `"8Gi"` | +| [persistence.storageClass](./values.yaml#L1200) | string | Storage class for the PVC | `nil` | +| [persistence.subPath](./values.yaml#L1217) | string | SubPath for jenkins-home mount | `nil` | +| [persistence.volumes](./values.yaml#L1219) | list | Additional volumes | `[]` | +| [rbac.create](./values.yaml#L1256) | bool | Whether RBAC resources are created | `true` | +| [rbac.readSecrets](./values.yaml#L1258) | bool | Whether the Jenkins service account should be able to read Kubernetes secrets | `false` | | [renderHelmLabels](./values.yaml#L30) | bool | Enables rendering of the helm.sh/chart label to the annotations | `true` | -| [serviceAccount.annotations](./values.yaml#L1264) | object | Configures annotations for the ServiceAccount | `{}` | -| [serviceAccount.create](./values.yaml#L1258) | bool | Configures if a ServiceAccount with this name should be created | `true` | -| [serviceAccount.extraLabels](./values.yaml#L1266) | object | Configures extra labels for the ServiceAccount | `{}` | -| [serviceAccount.imagePullSecretName](./values.yaml#L1268) | string | Controller ServiceAccount image pull secret | `nil` | -| [serviceAccount.name](./values.yaml#L1262) | string | | `nil` | -| [serviceAccountAgent.annotations](./values.yaml#L1279) | object | Configures annotations for the agent ServiceAccount | `{}` | -| [serviceAccountAgent.create](./values.yaml#L1273) | bool | Configures if an agent ServiceAccount should be created | `false` | -| [serviceAccountAgent.extraLabels](./values.yaml#L1281) | object | Configures extra labels for the agent ServiceAccount | `{}` | -| [serviceAccountAgent.imagePullSecretName](./values.yaml#L1283) | string | Agent ServiceAccount image pull secret | `nil` | -| [serviceAccountAgent.name](./values.yaml#L1277) | string | The name of the agent ServiceAccount to be used by access-controlled resources | `nil` | +| [serviceAccount.annotations](./values.yaml#L1268) | object | Configures annotations for the ServiceAccount | `{}` | +| [serviceAccount.create](./values.yaml#L1262) | bool | Configures if a ServiceAccount with this name should be created | `true` | +| [serviceAccount.extraLabels](./values.yaml#L1270) | object | Configures extra labels for the ServiceAccount | `{}` | +| [serviceAccount.imagePullSecretName](./values.yaml#L1272) | string | Controller ServiceAccount image pull secret | `nil` | +| [serviceAccount.name](./values.yaml#L1266) | string | | `nil` | +| [serviceAccountAgent.annotations](./values.yaml#L1283) | object | Configures annotations for the agent ServiceAccount | `{}` | +| [serviceAccountAgent.create](./values.yaml#L1277) | bool | Configures if an agent ServiceAccount should be created | `false` | +| [serviceAccountAgent.extraLabels](./values.yaml#L1285) | object | Configures extra labels for the agent ServiceAccount | `{}` | +| [serviceAccountAgent.imagePullSecretName](./values.yaml#L1287) | string | Agent ServiceAccount image pull secret | `nil` | +| [serviceAccountAgent.name](./values.yaml#L1281) | string | The name of the agent ServiceAccount to be used by access-controlled resources | `nil` | diff --git a/charts/jenkins/templates/jcasc-config.yaml b/charts/jenkins/templates/jcasc-config.yaml index e40419452..f51444525 100644 --- a/charts/jenkins/templates/jcasc-config.yaml +++ b/charts/jenkins/templates/jcasc-config.yaml @@ -17,6 +17,10 @@ metadata: "app.kubernetes.io/instance": "{{ $.Release.Name }}" "app.kubernetes.io/component": "{{ $.Values.controller.componentName }}" {{ template "jenkins.fullname" $root }}-jenkins-config: "true" +{{- if $root.Values.controller.JCasC.configMapAnnotations }} + annotations: +{{ toYaml $root.Values.controller.JCasC.configMapAnnotations | indent 4 }} +{{- end }} data: {{ $key }}.yaml: |- {{ tpl $val $| indent 4 }} @@ -38,6 +42,10 @@ metadata: "app.kubernetes.io/instance": "{{ $.Release.Name }}" "app.kubernetes.io/component": "{{ $.Values.controller.componentName }}" {{ template "jenkins.fullname" $root }}-jenkins-config: "true" +{{- if $root.Values.controller.JCasC.configMapAnnotations }} + annotations: +{{ toYaml $root.Values.controller.JCasC.configMapAnnotations | indent 4 }} +{{- end }} data: jcasc-default-config.yaml: |- {{- include "jenkins.casc.defaults" . | nindent 4 }} diff --git a/charts/jenkins/unittests/jcasc-config-test.yaml b/charts/jenkins/unittests/jcasc-config-test.yaml index 8929e32ad..f6a4d8041 100644 --- a/charts/jenkins/unittests/jcasc-config-test.yaml +++ b/charts/jenkins/unittests/jcasc-config-test.yaml @@ -748,3 +748,20 @@ tests: pattern: ^jenkins- - matchSnapshot: path: data["jcasc-default-config.yaml"] + - it: custom configmap annotations + set: + controller: + JCasC: + configMapAnnotations: + jenkins.example.com/anno1: "custom-annotation" + jenkins.example.com/anno2: "another-annotation" + asserts: + - isKind: + of: ConfigMap + - hasDocuments: + count: 1 + - equal: + path: metadata.annotations + value: + jenkins.example.com/anno1: "custom-annotation" + jenkins.example.com/anno2: "another-annotation" diff --git a/charts/jenkins/values.yaml b/charts/jenkins/values.yaml index bda661134..01f1fb22b 100644 --- a/charts/jenkins/values.yaml +++ b/charts/jenkins/values.yaml @@ -533,6 +533,10 @@ controller: authorizationStrategy: |- loggedInUsersCanDoAnything: allowAnonymousRead: false + + # -- Annotations for the JCasC ConfigMap + configMapAnnotations: {} + # -- Custom init-container specification in raw-yaml format customInitContainers: [] # - name: custom-init