README changes from rebase

Signed-off-by: Aaron McDonald <wmcdona89@gmail.com>
helm · Jul 19, 2020 · 61074d2 · 61074d2
1 parent 1860085
commit 61074d2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/stable/jenkins/README.md b/stable/jenkins/README.md
@@ -134,6 +134,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
 | `master.sidecars.configAutoReload` | Jenkins Config as Code auto-reload settings |                                   |
 | `master.sidecars.configAutoReload.enabled` | Jenkins Config as Code auto-reload settings (Attention: rbac needs to be enabled otherwise the sidecar can't read the config map) | `true`                                                      |
 | `master.sidecars.configAutoReload.image` | Image which triggers the reload | `kiwigrid/k8s-sidecar:0.1.144`           |
+| `master.sidecars.configAutoReload.reqRetryConnect` | How many connection-related errors to retry on  | `10`          |
 | `master.sidecars.configAutoReload.env` | Environment variables for the Jenkins Config as Code auto-reload container  | Not set |
 | `master.testEnabled`              | Can be used to disable rendering test resources when using helm template | `true`                         |
 
@@ -371,17 +372,19 @@ Some third-party systems, e.g. GitHub, use HTML-formatted data in their payload
 | `agent.slaveConnectTimeout`| Timeout in seconds for an agent to be online    | 100                    |
 | `agent.volumes`            | Additional volumes                              | `[]`                   |
 | `agent.yamlTemplate`       | The raw yaml of a Pod API Object to merge into the agent spec | Not set  |
-| `agent.yamlMergeStrategy   | Defines how the raw yaml field gets merged with yaml definitions from inherited pod templates | `override` |
+| `agent.yamlMergeStrategy`   | Defines how the raw yaml field gets merged with yaml definitions from inherited pod templates | `override` |
 
 #### Side Container Configuration
 | Parameter                  | Description                                     | Default                |
 | -------------------------- | ----------------------------------------------- | ---------------------- |
 | `agent.sideContainerName`  | Side container name in agent                    | jnlp                   |
-| `agent.image`              | Agent image name                                | `jenkins/jnlp-slave`   |
-| `agent.tag`                | Agent image tag                                 | `3.27-1`               |
+| `agent.image`              | Agent image name                                | `jenkins/inbound-agent`|
+| `agent.tag`                | Agent image tag                                 | `4.3-4`                |
 | `agent.alwaysPullImage`    | Always pull agent container image before build  | `false`                |
 | `agent.privileged`         | Agent privileged container                      | `false`                |
 | `agent.resources`          | Resources allocation (Requests and Limits)      | `{requests: {cpu: 512m, memory: 512Mi}, limits: {cpu: 512m, memory: 512Mi}}` |
+| `agent.runAsUser`          | Configure container user                        | Not set                |
+| `agent.runAsGroup`         | Configure container group                       | Not set                |
 | `agent.command`            | Executed command when side container starts     | Not set                |
 | `agent.args`               | Arguments passed to executed command            | `${computer.jnlpmac} ${computer.name}` |
 | `agent.TTYEnabled`         | Allocate pseudo tty to the side container       | false                  |