Merge branch 'main' into feature/extra-tpl
Signed-off-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Marco Maurer (-Kilchhofer)
GitHub
commit
08729d9522
7 changed files with 108 additions and 78 deletions
7
.github/configs/renovate-config.js
vendored
Normal file
7
.github/configs/renovate-config.js
vendored
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
module.exports = {
|
||||
platform: 'github',
|
||||
gitAuthor: 'renovate[bot] <renovate[bot]@users.noreply.github.com>',
|
||||
autodiscover: false,
|
||||
allowPostUpgradeCommandTemplating: true,
|
||||
allowedPostUpgradeCommands: [".*"],
|
||||
};
|
||||
57
.github/workflows/chart-version-bump.yml
vendored
57
.github/workflows/chart-version-bump.yml
vendored
|
|
@ -1,57 +0,0 @@
|
|||
## Used on Renovate PRs to bump the chart version and add a changelog entry
|
||||
## Reference: https://github.com/stefanzweifel/git-auto-commit-action
|
||||
## Reference: https://github.com/marketplace/actions/changed-files
|
||||
name: 'Chart Version Bump and Changelog'
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types:
|
||||
- labeled
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
helm-bumper:
|
||||
if: ${{ (contains(github.event.pull_request.labels.*.name, 'renovate')) }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
with:
|
||||
token: ${{ secrets.PAT }}
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Get changed files
|
||||
id: changed-files
|
||||
uses: tj-actions/changed-files@3f54ebb830831fc121d3263c1857cfbdc310cdb9 # v42.0.4
|
||||
with:
|
||||
files: charts/{argo-workflows,argo-cd,argo-events,argo-rollouts,argocd-image-updater}/Chart.yaml
|
||||
|
||||
- name: "Bump Version and Changelog"
|
||||
run: |
|
||||
chartName="$(echo \"${{ steps.changed-files.outputs.all_changed_files }}\" | cut -d '/' -f2)"
|
||||
echo "Changed chart name is: $chartName"
|
||||
echo "----------------------------------------"
|
||||
|
||||
parentDir="charts/${chartName}"
|
||||
|
||||
# Bump the chart version by one patch version
|
||||
version=$(grep '^version:' ${parentDir}/Chart.yaml | awk '{print $2}')
|
||||
major=$(echo $version | cut -d. -f1)
|
||||
minor=$(echo $version | cut -d. -f2)
|
||||
patch=$(echo $version | cut -d. -f3)
|
||||
patch=$(expr $patch + 1)
|
||||
sed -i "s/^version:.*/version: ${major}.${minor}.${patch}/g" ${parentDir}/Chart.yaml
|
||||
|
||||
# Add a changelog entry
|
||||
appVersion=$(grep '^appVersion:' ${parentDir}/Chart.yaml | awk '{print $2}')
|
||||
sed -i -e '/^ artifacthub.io\/changes: |/,$d' ${parentDir}/Chart.yaml
|
||||
echo " artifacthub.io/changes: |" >> ${parentDir}/Chart.yaml
|
||||
echo " - kind: changed" >> ${parentDir}/Chart.yaml
|
||||
echo " description: Bump ${chartName} to ${appVersion}" >> ${parentDir}/Chart.yaml
|
||||
cat ${parentDir}/Chart.yaml
|
||||
|
||||
- name: "Commit and push changes"
|
||||
uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # v5.0.0
|
||||
with:
|
||||
commit_options: '--signoff'
|
||||
36
.github/workflows/renovate.yaml
vendored
Normal file
36
.github/workflows/renovate.yaml
vendored
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
name: Renovate
|
||||
on:
|
||||
# The "*" (#42, asterisk) character has special semantics in YAML, so this
|
||||
# string has to be quoted.
|
||||
schedule:
|
||||
- cron: '0 * * * *'
|
||||
# Manual trigger is also possible
|
||||
workflow_dispatch: {}
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
renovate:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Get token
|
||||
uses: actions/create-github-app-token@e8e39f73bb84fdf315a015fa3104f314c0a258b4 # v1.8.1
|
||||
id: get_token
|
||||
with:
|
||||
app-id: ${{ vars.RENOVATE_APP_ID }}
|
||||
private-key: ${{ secrets.RENOVATE_APP_PRIVATE_KEY }}
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
|
||||
- name: Self-hosted Renovate
|
||||
uses: renovatebot/github-action@a6e57359b32af9a54d5b3b6603011f50629a0a05 # v40.1.2
|
||||
with:
|
||||
configurationFile: .github/configs/renovate-config.js
|
||||
# renovate: datasource=docker depName=ghcr.io/renovatebot/renovate
|
||||
renovate-version: 37.192.1
|
||||
token: '${{ steps.get_token.outputs.token }}'
|
||||
env:
|
||||
LOG_LEVEL: 'debug'
|
||||
RENOVATE_REPOSITORIES: '${{ github.repository }}'
|
||||
|
|
@ -952,7 +952,7 @@ NAME: my-release
|
|||
| server.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the Argo CD server |
|
||||
| server.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
|
||||
| server.ingress.annotations | object | `{}` | Additional ingress annotations |
|
||||
| server.ingress.aws.backendProtocolVersion | string | `"HTTP2"` | Backend protocol version for the AWS ALB gRPC service |
|
||||
| server.ingress.aws.backendProtocolVersion | string | `"GRPC"` | Backend protocol version for the AWS ALB gRPC service |
|
||||
| server.ingress.aws.serviceType | string | `"NodePort"` | Service type for the AWS ALB gRPC service |
|
||||
| server.ingress.controller | string | `"generic"` | Specific implementation for ingress controller. One of `generic`, `aws` or `gke` |
|
||||
| server.ingress.enabled | bool | `false` | Enable an ingress resource for the Argo CD server |
|
||||
|
|
|
|||
|
|
@ -2074,8 +2074,9 @@ server:
|
|||
## Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/ingress/#aws-application-load-balancers-albs-and-classic-elb-http-mode
|
||||
aws:
|
||||
# -- Backend protocol version for the AWS ALB gRPC service
|
||||
## This tells AWS to send traffic from the ALB using HTTP2. Can use gRPC as well if you want to leverage gRPC specific features
|
||||
backendProtocolVersion: HTTP2
|
||||
## This tells AWS to send traffic from the ALB using gRPC.
|
||||
## For more information: https://docs.aws.amazon.com/elasticloadbalancing/latest/application/target-group-health-checks.html#health-check-settings
|
||||
backendProtocolVersion: GRPC
|
||||
# -- Service type for the AWS ALB gRPC service
|
||||
## Can be of type NodePort or ClusterIP depending on which mode you are running.
|
||||
## Instance mode needs type NodePort, IP mode needs type ClusterIP
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
"fileMatch": ["\\.yaml$", "\\.yml$"]
|
||||
},
|
||||
"extends": [
|
||||
"config:base",
|
||||
"config:recommended",
|
||||
"docker:enableMajor"
|
||||
],
|
||||
"labels": ["renovate"],
|
||||
|
|
@ -13,10 +13,12 @@
|
|||
"**/charts/argo-cd/Chart.yaml",
|
||||
"**/charts/argo-events/Chart.yaml",
|
||||
"**/charts/argo-rollouts/Chart.yaml",
|
||||
"**/charts/argocd-image-updater/Chart.yaml"
|
||||
"**/charts/argocd-image-updater/Chart.yaml",
|
||||
"**/.github/workflows/renovate.yaml"
|
||||
],
|
||||
"regexManagers": [
|
||||
"customManagers": [
|
||||
{
|
||||
"customType": "regex",
|
||||
"fileMatch": ["charts/argo-workflows/Chart.yaml$"],
|
||||
"matchStrings": [
|
||||
"\\sappVersion: (?<currentValue>.*)\\s"
|
||||
|
|
@ -26,6 +28,7 @@
|
|||
"datasourceTemplate": "github-releases"
|
||||
},
|
||||
{
|
||||
"customType": "regex",
|
||||
"fileMatch": ["charts/argo-cd/Chart.yaml$"],
|
||||
"matchStrings": [
|
||||
"\\sappVersion: (?<currentValue>.*)\\s"
|
||||
|
|
@ -35,6 +38,7 @@
|
|||
"datasourceTemplate": "github-releases"
|
||||
},
|
||||
{
|
||||
"customType": "regex",
|
||||
"fileMatch": ["charts/argo-events/Chart.yaml$"],
|
||||
"matchStrings": [
|
||||
"\\sappVersion: (?<currentValue>.*)\\s"
|
||||
|
|
@ -44,6 +48,7 @@
|
|||
"datasourceTemplate": "github-releases"
|
||||
},
|
||||
{
|
||||
"customType": "regex",
|
||||
"fileMatch": ["charts/argo-rollouts/Chart.yaml$"],
|
||||
"matchStrings": [
|
||||
"\\sappVersion: (?<currentValue>.*)\\s"
|
||||
|
|
@ -53,6 +58,7 @@
|
|||
"datasourceTemplate": "github-releases"
|
||||
},
|
||||
{
|
||||
"customType": "regex",
|
||||
"fileMatch": ["charts/argocd-image-updater/Chart.yaml$"],
|
||||
"matchStrings": [
|
||||
"\\sappVersion: (?<currentValue>.*)\\s"
|
||||
|
|
@ -60,28 +66,34 @@
|
|||
"versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}",
|
||||
"depNameTemplate": "argoproj-labs/argocd-image-updater",
|
||||
"datasourceTemplate": "github-releases"
|
||||
},
|
||||
{
|
||||
"customType": "regex",
|
||||
"fileMatch": ["^\\.github/workflows/[^/]+\\.ya?ml$"],
|
||||
"matchStrings": [
|
||||
"# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s+.+version: (?<currentValue>.*)"
|
||||
]
|
||||
}
|
||||
],
|
||||
"packageRules": [
|
||||
{
|
||||
"matchPackagePatterns": ["argoproj/argo-workflows"],
|
||||
"commitMessagePrefix": "chore(argo-workflows):"
|
||||
},
|
||||
{
|
||||
"matchPackagePatterns": ["argoproj/argo-cd"],
|
||||
"commitMessagePrefix": "chore(argo-cd):"
|
||||
},
|
||||
{
|
||||
"matchPackagePatterns": ["argoproj/argo-events"],
|
||||
"commitMessagePrefix": "chore(argo-events):"
|
||||
},
|
||||
{
|
||||
"matchPackagePatterns": ["argoproj/argo-rollouts"],
|
||||
"commitMessagePrefix": "chore(argo-rollouts):"
|
||||
"matchPackagePatterns": [
|
||||
"argoproj/argo-workflows",
|
||||
"argoproj/argo-cd",
|
||||
"argoproj/argo-events",
|
||||
"argoproj/argo-rollouts"
|
||||
],
|
||||
"commitMessagePrefix": "chore({{{replace 'argoproj/' '' depName}}}):",
|
||||
"postUpgradeTasks": {
|
||||
"commands": ["./scripts/renovate-bump-version.sh {{depName}}"]
|
||||
}
|
||||
},
|
||||
{
|
||||
"matchPackagePatterns": ["argoproj-labs/argocd-image-updater"],
|
||||
"commitMessagePrefix": "chore(argocd-image-updater):"
|
||||
"commitMessagePrefix": "chore({{{replace 'argoproj-labs/' '' depName}}}):",
|
||||
"postUpgradeTasks": {
|
||||
"commands": ["./scripts/renovate-bump-version.sh {{depName}}"]
|
||||
}
|
||||
},
|
||||
{
|
||||
"matchPackagePatterns": ["redis-ha"],
|
||||
|
|
|
|||
31
scripts/renovate-bump-version.sh
Executable file
31
scripts/renovate-bump-version.sh
Executable file
|
|
@ -0,0 +1,31 @@
|
|||
#!/bin/bash
|
||||
depName="${1}"
|
||||
if [ -z "${depName}" ]; then
|
||||
echo "Missing argument 'depName'" >&2
|
||||
echo "Example usage: $0 argoproj/argo-cd" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
chartName=$(echo "$depName" | sed -e "s+^argoproj/++" -e "s+^argoproj-labs/++")
|
||||
echo "Changed chart name is: $chartName"
|
||||
echo "----------------------------------------"
|
||||
|
||||
parentDir="charts/${chartName}"
|
||||
|
||||
# Bump the chart version by one patch version
|
||||
version=$(grep '^version:' "${parentDir}/Chart.yaml" | awk '{print $2}')
|
||||
major=$(echo "${version}" | cut -d. -f1)
|
||||
minor=$(echo "${version}" | cut -d. -f2)
|
||||
patch=$(echo "${version}" | cut -d. -f3)
|
||||
patch=$((patch + 1))
|
||||
sed -i "s/^version:.*/version: ${major}.${minor}.${patch}/g" "${parentDir}/Chart.yaml"
|
||||
|
||||
# Add a changelog entry
|
||||
appVersion=$(grep '^appVersion:' "${parentDir}/Chart.yaml" | awk '{print $2}')
|
||||
sed -i -e '/^ artifacthub.io\/changes: |/,$ d' "${parentDir}/Chart.yaml"
|
||||
{
|
||||
echo " artifacthub.io/changes: |"
|
||||
echo " - kind: changed"
|
||||
echo " description: Bump ${chartName} to ${appVersion}"
|
||||
} >> "${parentDir}/Chart.yaml"
|
||||
cat "${parentDir}/Chart.yaml"
|
||||
Loading…
Reference in a new issue