-
Notifications
You must be signed in to change notification settings - Fork 890
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
70 changed files
with
7,558 additions
and
4,273 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,23 @@ | ||
| <!-- | ||
| Thank you for contributing! | ||
| Before you submit this PR we'd like to make sure you are aware of our technical requirements and best practices: | ||
| * https://github.com/jenkinsci/helm-charts/blob/main/CONTRIBUTING.md#technical-requirements | ||
| * https://helm.sh/docs/chart_best_practices/ | ||
| For a quick overview across what we will look at reviewing your PR, please read our review guidelines: | ||
| * https://github.com/helm/charts/blob/master/REVIEW_GUIDELINES.md | ||
| Following our best practices right from the start will accelerate the review process and help get your PR merged quicker. | ||
| When updates to your PR are requested, please add new commits and do not squash the history. | ||
| This will make it easier to identify new changes. | ||
| The PR will be squashed anyways when it is merged. | ||
| Thanks. | ||
| <!-- markdownlint-disable MD041 --> | ||
|
|
||
| For fast feedback, please @-mention maintainers that are listed in the Chart.yaml file. | ||
| ### What does this PR do? | ||
|
|
||
| Please make sure you test your changes before you push them. | ||
| Once pushed, GitHub Actions will run across your changes and do some initial checks and linting. | ||
| These checks run very quickly. | ||
| Please check the results. | ||
| We would like these checks to pass before we even continue reviewing your changes. | ||
| <!-- Describe the purpose of this PR, and any background context. | ||
| *(optional, add the issue number in `Fixes #<issue number>`, to close that issue when the PR gets merged)* | ||
| --> | ||
| <!-- markdownlint-disable MD041 --> | ||
|
|
||
| ### What this PR does / why we need it | ||
|
|
||
| ### Which issue this PR fixes | ||
| - Fixes # | ||
|
|
||
| *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)* | ||
| If you modified files in the `./charts/jenkins/` directory, please also include the following: | ||
|
|
||
| - fixes # | ||
| ```[tasklist] | ||
| ### Submitter checklist | ||
| - [ ] I bumped the "version" key in `./charts/jenkins/Chart.yaml`. | ||
| - [ ] I added a new changelog entry to `./charts/jenkins/CHANGELOG.md`. | ||
| - [ ] I followed the [technical requirements](https://github.com/jenkinsci/helm-charts/blob/main/CONTRIBUTING.md#technical-requirements). | ||
| - [ ] I ran `.github/helm-docs.sh` from the project root. | ||
| ``` | ||
|
|
||
| ### Special notes for your reviewer | ||
|
|
||
| ### Checklist | ||
| <!-- [Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.] --> | ||
| - [ ] Chart Version bumped | ||
| - [ ] CHANGELOG.md was updated | ||
| <!-- Leave blank if none --> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -euxo pipefail | ||
|
|
||
| # check if helm-docs is installed | ||
| if ! command -v helm-docs &>/dev/null; then | ||
| echo "helm-docs could not be found. You can install it from https://github.com/norwoodj/helm-docs." | ||
| exit | ||
| fi | ||
|
|
||
| # validate docs | ||
| cd charts/jenkins | ||
| helm-docs --template-files=VALUES.md.gotmpl --output-file=VALUES.md |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "rules": { | ||
| "terminology": { | ||
| "exclude": [ | ||
| "Git", | ||
| "XML", | ||
| "YAML" | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| { | ||
| $schema: "https://docs.renovatebot.com/renovate-schema.json", | ||
| onboarding: false, | ||
| requireConfig: "ignored", | ||
| platform: "github", | ||
| repositories: ["jenkinsci/helm-charts"], | ||
| // eslint-disable-next-line | ||
| allowedPostUpgradeCommands: ['^\.github\/renovate-postupgrade\.sh "{{{depName}}}" "{{{newVersion}}}"$'], | ||
| prConcurrentLimit: 0, | ||
| prHourlyLimit: 5, | ||
| semanticCommits: "enabled", | ||
| enabledManagers: [ | ||
| "helm-values", | ||
| "github-actions", | ||
| "regex", | ||
| ], | ||
| packageRules: [ | ||
| { | ||
| matchPackageNames: ["jenkins/inbound-agent"], | ||
| versioning: "regex:^(?<major>\\d+)?\\.(?<minor>\\w+?)?-(?<build>\\d+)?$", | ||
| }, | ||
| { | ||
| matchPackageNames: ["jenkins/jenkins"], | ||
| versioning: "regex:^(?<major>\\d+?)\\.(?<minor>\\d+?)\\.(?<patch>\\d+?)(-(?<compatibility>\\w+))?$", | ||
| }, | ||
| { | ||
| matchFileNames: ["charts/jenkins/**"], | ||
| postUpgradeTasks: { | ||
| commands: [ | ||
| '.github/renovate-postupgrade.sh "{{{depName}}}" "{{{newVersion}}}"', | ||
| ], | ||
| fileFilters: ["charts/jenkins/**"], | ||
| executionMode: "branch", | ||
| }, | ||
| }, | ||
| { | ||
| matchPackagePatterns: [".*"], | ||
| excludePackagePatterns: ["jenkins/jenkins"], | ||
| minimumReleaseAge: "12 hours", | ||
| }, | ||
| ], | ||
| customDatasources: { | ||
| "python_actions": { | ||
| defaultRegistryUrlTemplate: "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", | ||
| transformTemplates: [ | ||
| "{\"releases\": $$[stable=true].files[arch=\"x64\" and platform=\"linux\"].{\"version\":%.version,\"changelogUrl\":\"https://docs.python.org/whatsnew/index.html\"},\"homepage\":\"https://python.org/\",\"changelogUrl\":\"https://docs.python.org/whatsnew/index.html\"}", | ||
| ], | ||
| }, | ||
| }, | ||
| customManagers: [ | ||
| { | ||
| customType: "regex", | ||
| fileMatch: ["(^|/)\\.github/workflows/[^/]+\\.ya?ml$", "(^|/)\\.github/[^/]+\\.sh$"], | ||
| matchStrings: [ | ||
| "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s+?[\\w\\s-]*?version:? (?<currentValue>.*)\\s", | ||
| "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*?_VERSION=(?<currentValue>.*)\\s", | ||
| ], | ||
| }, | ||
| { | ||
| customType: "regex", | ||
| fileMatch: [ | ||
| "^charts/jenkins/Chart.yaml$", | ||
| "^charts/jenkins/values.yaml$", | ||
| ], | ||
| matchStrings: [ | ||
| "appVersion: (?<currentValue>.*?)\\s", | ||
| 'repository: \\"jenkins/jenkins\\"\\s*?# tag: \\"(?<currentValue>.*?)\\"', | ||
| ], | ||
| depNameTemplate: "jenkins/jenkins", | ||
| datasourceTemplate: "docker", | ||
| }, | ||
| { | ||
| customType: "regex", | ||
| fileMatch: ["^charts/jenkins/values.yaml$"], | ||
| matchStringsStrategy: "recursive", | ||
| matchStrings: [ | ||
| "installPlugins:[\\s\\w:.-]*?(?:\\r*\\n){2}", | ||
| "- (?<depName>.*?):(?<currentValue>.*?)\\s", | ||
| ], | ||
| datasourceTemplate: "jenkins-plugins", | ||
| versioningTemplate: "regex:^(?<major>\\d+)?\\.(?<minor>\\w+?)?(\\.(?<patch>\\d+?))?$", | ||
| }, | ||
| { | ||
| customType: "regex", | ||
| fileMatch: ["^charts/jenkins/Chart.yaml$"], | ||
| matchStringsStrategy: "recursive", | ||
| matchStrings: [ | ||
| "artifacthub\\.io\\/images: \\|[\\s\\w:.\\/-]*(?:artifacthub)", | ||
| "image: (?<depName>.*?):(?<currentValue>.*?)\\s", | ||
| ], | ||
| datasourceTemplate: "docker", | ||
| versioningTemplate: "regex:^(?<major>\\d+)?\\.(?<minor>\\w+?)?(_|\\.)(?<patch>\\w+)?(-(?<build>\\d+))?.*", | ||
| depNameTemplate: "{{#if (equals depName 'docker.io/jenkins/jenkins')}}jenkins/jenkins{{else}}{{{depName}}}{{/if}}", | ||
| }, | ||
| ], | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #!/bin/bash | ||
|
|
||
| # renovate: datasource=github-tags depName=mikefarah/yq | ||
| export YQ_VERSION=v4.45.1 | ||
|
|
||
| # renovate: datasource=github-tags depName=helm/helm | ||
| export HELM_VERSION=v3.17.0 | ||
|
|
||
| # renovate: datasource=github-tags depName=helm-unittest/helm-unittest | ||
| export HELM_UNITTEST_VERSION=v0.7.1 | ||
|
|
||
| # renovate: datasource=github-tags depName=jenkins-x-plugins/jx-release-version | ||
| export JENKINS_JX_VERSION=v2.7.8 | ||
|
|
||
| # renovate: datasource=github-releases depName=norwoodj/helm-docs | ||
| export HELM_DOCS_VERSION=1.14.2 | ||
|
|
||
| apt update | ||
|
|
||
| apt install -y curl git | ||
|
|
||
| curl -fsSL -o /tmp/helm.tar.gz https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz | ||
| mkdir -p /tmp/helm && tar -xf /tmp/helm.tar.gz -C /tmp/helm | ||
| mv /tmp/helm/linux-amd64/helm /usr/local/bin/helm | ||
| chmod a+x /usr/local/bin/helm | ||
|
|
||
| runuser -u ubuntu -- helm plugin install https://github.com/helm-unittest/helm-unittest --version ${HELM_UNITTEST_VERSION} | ||
|
|
||
| curl -fsSL -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 | ||
| chmod a+x /usr/local/bin/yq | ||
|
|
||
| curl -fsSL -o /tmp/jx-release.tar.gz https://github.com/jenkins-x-plugins/jx-release-version/releases/download/${JENKINS_JX_VERSION}/jx-release-version-linux-amd64.tar.gz | ||
| mkdir -p /tmp/jx && tar -xf /tmp/jx-release.tar.gz -C /tmp/jx | ||
| mv /tmp/jx/jx-release-version /usr/local/bin/jx-release-version | ||
| chmod a+x /usr/local/bin/jx-release-version | ||
|
|
||
| curl -fsSL -o /tmp/helm-docs.tar.gz https://github.com/norwoodj/helm-docs/releases/download/v"${HELM_DOCS_VERSION}"/helm-docs_"${HELM_DOCS_VERSION}"_Linux_x86_64.tar.gz | ||
| mkdir -p /tmp/helm-docs && tar -xf /tmp/helm-docs.tar.gz -C /tmp/helm-docs | ||
| mv /tmp/helm-docs/helm-docs /usr/local/bin/helm-docs | ||
| chmod a+x /usr/local/bin/helm-docs | ||
|
|
||
| runuser -u ubuntu renovate |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| #!/bin/bash | ||
|
|
||
| CHARTVERSION="$(jx-release-version -previous-version=from-file:charts/jenkins/Chart.yaml)" | ||
| export CHARTVERSION | ||
| depName=$(echo "$1" | tr ' ' '\n' | sort | uniq) | ||
| export DEPNAME="$depName" | ||
| export NEWVERSION="$2" | ||
|
|
||
| helm unittest --strict -f 'unittests/*.yaml' charts/jenkins -u | ||
| yq eval '.version = env(CHARTVERSION)' -i charts/jenkins/Chart.yaml | ||
| sed -i "/git commit to be able to get more details./a \\\n## ${CHARTVERSION}\n\nUpdate \`${DEPNAME}\` to version \`${NEWVERSION}\`" charts/jenkins/CHANGELOG.md | ||
| .github/helm-docs.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.