Merge current v2.7 into v2.8

This commit is contained in:
romain 2022-06-27 16:12:21 +02:00
commit 41748c3ae4
59 changed files with 5767 additions and 1086 deletions

View file

@ -32,8 +32,9 @@ docker run --rm \
-w "/go/src/${PROJECT_MODULE}" \
"${IMAGE_NAME}" $cmd
echo "Concatenate the CRD definitions for the integration tests ..."
cat $(pwd)/docs/content/reference/dynamic-configuration/traefik.containo.us_*.yaml > $(pwd)/integration/fixtures/k8s/01-traefik-crd.yml
echo "Concatenate the CRD definitions for publication and integration tests ..."
cat $(pwd)/docs/content/reference/dynamic-configuration/traefik.containo.us_*.yaml > $(pwd)/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml
cp -f $(pwd)/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml $(pwd)/integration/fixtures/k8s/01-traefik-crd.yml
cp -r $(pwd)/${MODULE_VERSION}/* $(pwd)
rm -rf $(pwd)/${MODULE_VERSION}

View file

@ -4,11 +4,11 @@ RepositoryName = "traefik"
OutputType = "file"
FileName = "traefik_changelog.md"
# example new bugfix v2.7.1
# example new bugfix v2.7.2
CurrentRef = "v2.7"
PreviousRef = "v2.7.0"
PreviousRef = "v2.7.1"
BaseBranch = "v2.7"
FutureCurrentRefName = "v2.7.1"
FutureCurrentRefName = "v2.7.2"
ThresholdPreviousRef = 10
ThresholdCurrentRef = 10