Skip to content

Commit 6259c19

Browse files
authored
Proofreading and linting on chart readme (#88)
* Fix chart README formatting issues Signed-off-by: Brandon High <[email protected]> * Update CHANGELOG/Chart version Signed-off-by: Brandon High <[email protected]>
1 parent c662239 commit 6259c19

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

charts/jenkins/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
1010

1111
The change log 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.
1212

13+
## 2.12.1
14+
15+
Helm chart README update
16+
1317
## 2.12.0
1418

1519
Add option to configure securityContext capabilities

charts/jenkins/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: jenkins
33
home: https://jenkins.io/
4-
version: 2.12.0
4+
version: 2.12.1
55
appVersion: lts
66
description: Open source continuous integration server. It supports multiple SCM tools
77
including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based

charts/jenkins/README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen
5555
Visit the chart's [CHANGELOG](./CHANGELOG.md) to view the chart's release history.
5656
For migration between major version check [migration guide](#migration-guide).
5757

58-
5958
## Configuration
6059

6160
See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands:
@@ -114,7 +113,7 @@ master:
114113
115114
Keep in mind that default configuration file already contains some values that you won't be able to override under configScripts section.
116115
117-
For example, you can not configure Jenkins URL and System Admin e-mail address like this because of conflictig configuration error.
116+
For example, you can not configure Jenkins URL and System Admin e-mail address like this because of conflicting configuration error.
118117
119118
Incorrect:
120119
@@ -159,6 +158,7 @@ rbac:
159158
```
160159

161160
### Allow Limited HTML Markup in User-Submitted Text
161+
162162
Some third-party systems (e.g. GitHub) use HTML-formatted data in their payload sent to a Jenkins webhook (e.g. URL of a pull-request being built).
163163
To display such data as processed HTML instead of raw text set `master.enableRawHtmlMarkupFormatter` to true.
164164
This option requires installation of the [OWASP Markup Formatter Plugin (antisamy-markup-formatter)](https://plugins.jenkins.io/antisamy-markup-formatter/).
@@ -249,7 +249,6 @@ It is possible to define which storage class to use, by setting `persistence.sto
249249
If set to a dash (`-`), dynamic provisioning is disabled.
250250
If the storage class is set to null or left undefined (`""`), the default provisioner is used (gp2 on AWS, standard on GKE, AWS & OpenStack).
251251

252-
253252
### RBAC
254253

255254
RBAC is enabled by default. If you want to disable it you will need to set `rbac.create` to `false`.
@@ -264,7 +263,6 @@ To restore a backup, you can use the `kube-tasks` underlying tool called [skbn](
264263
The best way to do it would be using a `Job` to copy files from the desired backup tag to the Jenkins pod.
265264
See the [skbn in-cluster example](https://github.com/maorfr/skbn/tree/master/examples/in-cluster) for more details.
266265

267-
268266
### Providing Jobs XML
269267

270268
Jobs can be created (and overwritten) by providing jenkins config xml within the `values.yaml` file.
@@ -448,7 +446,7 @@ Finally, you'll need to wrap the contents of `templates/config.tpl` like so:
448446

449447
[This configuration](https://wiki.jenkins.io/pages/viewpage.action?pageId=135468777) enables jenkins to use keystore in order to serve https.
450448
Here is the [value file section](https://wiki.jenkins.io/pages/viewpage.action?pageId=135468777#RunningJenkinswithnativeSSL/HTTPS-ConfigureJenkinstouseHTTPSandtheJKSkeystore) related to keystore configuration.
451-
Keystore itself should be placed in front of `jenkinsKeyStoreBase64Encoded` key and in base64 encoded format. To achive that after having `keystore.jks` file simply do this: `cat keystore.jks | base64` and paste the output in front of `jenkinsKeyStoreBase64Encoded`.
449+
Keystore itself should be placed in front of `jenkinsKeyStoreBase64Encoded` key and in base64 encoded format. To achieve that after having `keystore.jks` file simply do this: `cat keystore.jks | base64` and paste the output in front of `jenkinsKeyStoreBase64Encoded`.
452450
After enabling `httpsKeyStore.enable` make sure that `httpPort` and `targetPort` are not the same, as `targetPort` will serve https.
453451
Do not set `master.httpsKeyStore.httpPort` to `-1` because it will cause readiness and liveliness prob to fail.
454452
If you already have a kubernetes secret that has keystore and its password you can specify its' name in front of `jenkinsHttpsJksSecretName`, You need to remember that your secret should have proper data key names `jenkins-jks-file` and `https-jks-password`. Example:

0 commit comments

Comments
 (0)