Skip to content

Commit

Permalink
Super linter bump (#997)
Browse files Browse the repository at this point in the history
  • Loading branch information
kvanzuijlen authored Feb 1, 2024
1 parent 4ad6489 commit 7196edb
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 14 deletions.
1 change: 1 addition & 0 deletions .github/renovate-config.json5
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
requireConfig: "ignored",
platform: "github",
repositories: ["jenkinsci/helm-charts"],
// eslint-disable-next-line
allowedPostUpgradeCommands: ["^\.github\/renovate-postupgrade\.sh {{{depName}}} {{{newVersion}}}$"],
prConcurrentLimit: 0,
semanticCommits: "enabled",
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ name: Lint and Test Charts

on: pull_request

permissions:
contents: read

jobs:
lint-test:
runs-on: ubuntu-latest
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Lint Code Base

on: pull_request

permissions:
contents: read

jobs:
build:
name: Lint Code Base
Expand All @@ -12,11 +15,10 @@ jobs:
with:
fetch-depth: 0
- name: Lint Code Base
uses: github/super-linter@v4
uses: super-linter/super-linter@v6.0.0
env:
VALIDATE_ALL_CODEBASE: true
VALIDATE_JSCPD: false
VALIDATE_KUBERNETES_KUBEVAL: false
VALIDATE_KUBERNETES_KUBECONFORM: false
VALIDATE_YAML: false
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 3 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
paths:
- 'charts/**'

permissions:
contents: write

jobs:
release:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/renovate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
- cron: "0/15 * * * *"
workflow_dispatch:

permissions:
contents: write
pull-requests: write

jobs:
renovate:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/sync-readme.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
- 'main'
paths:
- 'README.md'

permissions:
contents: write

jobs:
build:
runs-on: ubuntu-latest
Expand Down
5 changes: 5 additions & 0 deletions .gitleaksignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/github/workspace/charts/jenkins/README.md:hashicorp-tf-password:664
/github/workspace/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml:hashicorp-tf-password:618
/github/workspace/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml:hashicorp-tf-password:619
/github/workspace/charts/jenkins/values.yaml:hashicorp-tf-password:584
/github/workspace/charts/jenkins/values.yaml:hashicorp-tf-password:590
20 changes: 12 additions & 8 deletions charts/jenkins/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.4

Updated super-linter to v6. Updated README.md and CHANGELOG.md to fix linting issues.

## 5.0.2

Update `git` to version `5.2.1`
Expand Down Expand Up @@ -1460,13 +1464,13 @@ Make `agent.slaveConnectTimeout` configurable: by increasing this value Jenkins

## 1.9.7 Update plugin versions

plugin | old version | new version
--------------------- | ----------- | ----------
kubernetes | 1.18.2 | 1.21.2
workflow-job | 2.33 | 2.36
credentials-binding | 1.19 | 1.20
git | 3.11.0 | 4.0.0
configuration-as-code | 1.27 | 1.32
| plugin | old version | new version |
|-----------------------|-------------|-------------|
| kubernetes | 1.18.2 | 1.21.2 |
| workflow-job | 2.33 | 2.36 |
| credentials-binding | 1.19 | 1.20 |
| git | 3.11.0 | 4.0.0 |
| configuration-as-code | 1.27 | 1.32 |

## 1.9.6

Expand Down Expand Up @@ -1592,7 +1596,7 @@ JCasC default configuration includes:
- maxRequestsPerHostStr: "32"
- name: "kubernetes"
- namespace
- serverUrl: "https://kubernetes.default"
- serverUrl: `"https://kubernetes.default"`
- template
- containers
- alwaysPullImage: `agent.alwaysPullImage`
Expand Down
2 changes: 1 addition & 1 deletion charts/jenkins/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: jenkins
home: https://jenkins.io/
version: 5.0.2
version: 5.0.4
appVersion: 2.426.3
description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides over 1800 plugins to support building, deploying and automating any project.
sources:
Expand Down
4 changes: 2 additions & 2 deletions charts/jenkins/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -645,10 +645,10 @@ controller:

### HTTPS Keystore Configuration

[This configuration](https://wiki.jenkins.io/pages/viewpage.action?pageId=135468777) enables jenkins to use keystore in order to serve https.
[This configuration](https://wiki.jenkins.io/pages/viewpage.action?pageId=135468777) enables jenkins to use keystore in order to serve HTTPS.
Here is the [value file section](https://wiki.jenkins.io/pages/viewpage.action?pageId=135468777#RunningJenkinswithnativeSSL/HTTPS-ConfigureJenkinstouseHTTPSandtheJKSkeystore) related to keystore configuration.
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`.
After enabling `httpsKeyStore.enable` make sure that `httpPort` and `targetPort` are not the same, as `targetPort` will serve https.
After enabling `httpsKeyStore.enable` make sure that `httpPort` and `targetPort` are not the same, as `targetPort` will serve HTTPS.
Do not set `controller.httpsKeyStore.httpPort` to `-1` because it will cause readiness and liveliness prob to fail.
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` (or override the key name using `jenkinsHttpsJksSecretKey`)
and `https-jks-password` (or override the key name using `jenkinsHttpsJksPasswordSecretKey`; additionally you can make it get the password from a different secret using `jenkinsHttpsJksPasswordSecretName`). Example:
Expand Down

0 comments on commit 7196edb

Please sign in to comment.