Merge v2.10 into v3.0
This commit is contained in:
romain
commit
e29a142f6a
118 changed files with 1324 additions and 1290 deletions
40
script/code-gen-docker.sh
Executable file
40
script/code-gen-docker.sh
Executable file
|
|
@ -0,0 +1,40 @@
|
|||
#!/usr/bin/env bash
|
||||
# shellcheck disable=SC2046
|
||||
|
||||
set -e -o pipefail
|
||||
|
||||
export PROJECT_MODULE="github.com/traefik/traefik"
|
||||
export MODULE_VERSION="v3"
|
||||
IMAGE_NAME="kubernetes-codegen:latest"
|
||||
CURRENT_DIR="$(pwd)"
|
||||
|
||||
echo "Building codegen Docker image..."
|
||||
docker build --build-arg KUBE_VERSION=v0.28.3 \
|
||||
--build-arg USER="${USER}" \
|
||||
--build-arg UID="$(id -u)" \
|
||||
--build-arg GID="$(id -g)" \
|
||||
-f "./script/codegen.Dockerfile" \
|
||||
-t "${IMAGE_NAME}" \
|
||||
"."
|
||||
|
||||
echo "Generating Traefik clientSet code and DeepCopy code ..."
|
||||
docker run --rm \
|
||||
-v "${CURRENT_DIR}:/go/src/${PROJECT_MODULE}" \
|
||||
-w "/go/src/${PROJECT_MODULE}" \
|
||||
-e "PROJECT_MODULE=${PROJECT_MODULE}" \
|
||||
-e "MODULE_VERSION=${MODULE_VERSION}" \
|
||||
"${IMAGE_NAME}" \
|
||||
bash ./script/code-gen.sh
|
||||
|
||||
echo "Generating the CRD definitions for the documentation ..."
|
||||
docker run --rm \
|
||||
-v "${CURRENT_DIR}:/go/src/${PROJECT_MODULE}" \
|
||||
-w "/go/src/${PROJECT_MODULE}" \
|
||||
"${IMAGE_NAME}" \
|
||||
controller-gen crd:crdVersions=v1 \
|
||||
paths={./pkg/provider/kubernetes/crd/traefikio/v1alpha1/...} \
|
||||
output:dir=./docs/content/reference/dynamic-configuration/
|
||||
|
||||
echo "Concatenate the CRD definitions for publication and integration tests ..."
|
||||
cat "${CURRENT_DIR}"/docs/content/reference/dynamic-configuration/traefik.io_*.yaml > "${CURRENT_DIR}"/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml
|
||||
cp -f "${CURRENT_DIR}"/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml "${CURRENT_DIR}"/integration/fixtures/k8s/01-traefik-crd.yml
|
||||
|
|
@ -1,58 +1,31 @@
|
|||
#!/bin/bash -e
|
||||
#!/usr/bin/env bash
|
||||
# shellcheck disable=SC2046
|
||||
|
||||
set -e -o pipefail
|
||||
|
||||
PROJECT_MODULE="github.com/traefik/traefik"
|
||||
MODULE_VERSION="v3"
|
||||
IMAGE_NAME="kubernetes-codegen:latest"
|
||||
CURRENT_DIR="$(pwd)"
|
||||
source /go/src/k8s.io/code-generator/kube_codegen.sh
|
||||
|
||||
echo "Building codegen Docker image..."
|
||||
docker build --build-arg KUBE_VERSION=v0.20.2 \
|
||||
--build-arg USER="${USER}" \
|
||||
--build-arg UID="$(id -u)" \
|
||||
--build-arg GID="$(id -g)" \
|
||||
-f "./script/codegen.Dockerfile" \
|
||||
-t "${IMAGE_NAME}" \
|
||||
"."
|
||||
git config --global --add safe.directory /go/src/${PROJECT_MODULE}
|
||||
|
||||
echo "Generating Traefik clientSet code ..."
|
||||
docker run --rm \
|
||||
-v "${CURRENT_DIR}:/go/src/${PROJECT_MODULE}" \
|
||||
-w "/go/src/${PROJECT_MODULE}" \
|
||||
"${IMAGE_NAME}" \
|
||||
/go/src/k8s.io/code-generator/generate-groups.sh all \
|
||||
${PROJECT_MODULE}/${MODULE_VERSION}/pkg/provider/kubernetes/crd/generated \
|
||||
${PROJECT_MODULE}/${MODULE_VERSION}/pkg/provider/kubernetes/crd \
|
||||
"traefikio:v1alpha1" \
|
||||
--go-header-file=/go/src/${PROJECT_MODULE}/script/boilerplate.go.tmpl
|
||||
rm -rf "/go/src/${PROJECT_MODULE}/${MODULE_VERSION}"
|
||||
mkdir -p "/go/src/${PROJECT_MODULE}/${MODULE_VERSION}/"
|
||||
|
||||
echo "Generating DeepCopy code ..."
|
||||
# TODO: remove the workaround when the issue is solved in the code-generator
|
||||
# (https://github.com/kubernetes/code-generator/issues/165).
|
||||
# Here, we create the soft link named "${PROJECT_MODULE}" to the parent directory of
|
||||
# Traefik to ensure the layout required by the kube_codegen.sh script.
|
||||
ln -s "/go/src/${PROJECT_MODULE}/pkg" "/go/src/${PROJECT_MODULE}/${MODULE_VERSION}/"
|
||||
|
||||
docker run --rm \
|
||||
-v "${CURRENT_DIR}:/go/src/${PROJECT_MODULE}" \
|
||||
-w "/go/src/${PROJECT_MODULE}" \
|
||||
"${IMAGE_NAME}" \
|
||||
deepcopy-gen \
|
||||
--input-dirs ${PROJECT_MODULE}/${MODULE_VERSION}/pkg/config/dynamic \
|
||||
--input-dirs ${PROJECT_MODULE}/${MODULE_VERSION}/pkg/tls \
|
||||
--input-dirs ${PROJECT_MODULE}/${MODULE_VERSION}/pkg/types \
|
||||
--output-package ${PROJECT_MODULE}/${MODULE_VERSION} -O zz_generated.deepcopy \
|
||||
--go-header-file=/go/src/${PROJECT_MODULE}/script/boilerplate.go.tmpl
|
||||
kube::codegen::gen_helpers \
|
||||
--input-pkg-root "${PROJECT_MODULE}/pkg" \
|
||||
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
|
||||
--boilerplate "/go/src/${PROJECT_MODULE}/script/boilerplate.go.tmpl"
|
||||
|
||||
echo "Generating the CRD definitions for the documentation ..."
|
||||
docker run --rm \
|
||||
-v "${CURRENT_DIR}:/go/src/${PROJECT_MODULE}" \
|
||||
-w "/go/src/${PROJECT_MODULE}" \
|
||||
"${IMAGE_NAME}" \
|
||||
controller-gen crd:crdVersions=v1 \
|
||||
paths={./pkg/provider/kubernetes/crd/traefikio/v1alpha1/...} \
|
||||
output:dir=./docs/content/reference/dynamic-configuration/
|
||||
kube::codegen::gen_client \
|
||||
--with-watch \
|
||||
--input-pkg-root "${PROJECT_MODULE}/${MODULE_VERSION}/pkg/provider/kubernetes/crd" \
|
||||
--output-pkg-root "${PROJECT_MODULE}/${MODULE_VERSION}/pkg/provider/kubernetes/crd/generated" \
|
||||
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
|
||||
--boilerplate "/go/src/${PROJECT_MODULE}/script/boilerplate.go.tmpl"
|
||||
|
||||
echo "Concatenate the CRD definitions for publication and integration tests ..."
|
||||
cat "${CURRENT_DIR}"/docs/content/reference/dynamic-configuration/traefik.io_*.yaml > "${CURRENT_DIR}"/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml
|
||||
cp -f "${CURRENT_DIR}"/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml "${CURRENT_DIR}"/integration/fixtures/k8s/01-traefik-crd.yml
|
||||
|
||||
cp -r "${CURRENT_DIR}/${MODULE_VERSION}"/* "${CURRENT_DIR}"
|
||||
rm -rf "${CURRENT_DIR:?}/${MODULE_VERSION}"
|
||||
rm -rf "/go/src/${PROJECT_MODULE}/${MODULE_VERSION}"
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ RUN go install k8s.io/code-generator/cmd/client-gen@$KUBE_VERSION
|
|||
RUN go install k8s.io/code-generator/cmd/lister-gen@$KUBE_VERSION
|
||||
RUN go install k8s.io/code-generator/cmd/informer-gen@$KUBE_VERSION
|
||||
RUN go install k8s.io/code-generator/cmd/deepcopy-gen@$KUBE_VERSION
|
||||
RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2
|
||||
RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0
|
||||
|
||||
RUN mkdir -p $GOPATH/src/k8s.io/code-generator
|
||||
RUN cp -R $GOPATH/pkg/mod/k8s.io/code-generator@$KUBE_VERSION/* $GOPATH/src/k8s.io/code-generator/
|
||||
RUN chmod +x $GOPATH/src/k8s.io/code-generator/generate-groups.sh
|
||||
RUN chmod +x $GOPATH/src/k8s.io/code-generator/kube_codegen.sh
|
||||
|
||||
WORKDIR $GOPATH/src/k8s.io/code-generator
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ RepositoryName = "traefik"
|
|||
OutputType = "file"
|
||||
FileName = "traefik_changelog.md"
|
||||
|
||||
# example new bugfix v2.10.5
|
||||
# example new bugfix v2.10.6
|
||||
CurrentRef = "v2.10"
|
||||
PreviousRef = "v2.10.4"
|
||||
PreviousRef = "v2.10.5"
|
||||
BaseBranch = "v2.10"
|
||||
FutureCurrentRefName = "v2.10.5"
|
||||
FutureCurrentRefName = "v2.10.6"
|
||||
|
||||
ThresholdPreviousRef = 10
|
||||
ThresholdCurrentRef = 10
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue