Skip to content

Commit 6e27721

Browse files
committed
BUILD: order api pkgs for code-generator consistency
1 parent 9fc8d9c commit 6e27721

File tree

7 files changed

+28
-26
lines changed

7 files changed

+28
-26
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ diff-crd:
3939
tags:
4040
- go
4141
before_script:
42+
- go version
4243
- make cr_generate
4344
script:
4445
- git diff

crs/code-generator.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CR_DIR=$(dirname "$0")
1111
OUTPUT_DIR="${CR_DIR}/.generated"
1212
HDR_FILE="${CR_DIR}/../assets/license-header.txt"
1313
CR_PKG="github.com/haproxytech/kubernetes-ingress/crs"
14-
API_PKGS=$(find ${CR_DIR}/api -mindepth 2 -type d -printf "$CR_PKG/api/%P,")
14+
API_PKGS=$(find ${CR_DIR}/api -mindepth 2 -type d -printf "$CR_PKG/api/%P\n"| sort | tr '\n' ',')
1515
API_PKGS=${API_PKGS::-1} # remove trailing ","
1616

1717
# Install Kubernetes Code Generators from k8s.io/code-generator
@@ -21,7 +21,6 @@ GOBIN="$(go env GOBIN)"
2121
gobin="${GOBIN:-$(go env GOPATH)/bin}"
2222
go install k8s.io/code-generator/cmd/{deepcopy-gen,register-gen,client-gen,lister-gen,informer-gen,defaulter-gen}@$VERSION
2323

24-
2524
# Generate Code
2625
echo "Generating code for $API_PKGS"
2726

@@ -77,4 +76,6 @@ cp -r ${OUTPUT_DIR}/${CR_PKG}/generated/{clientset,listers,informers} ${CR_DIR}/
7776
rm -rf ${OUTPUT_DIR}
7877

7978
go install sigs.k8s.io/controller-tools/cmd/controller-gen@latest
79+
# Controller-gen version
80+
echo "Controller-gen: " $(controller-gen --version)
8081
controller-gen crd paths=./crs/api/ingress/... output:crd:dir=./crs/definition

crs/generated/clientset/versioned/clientset.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crs/generated/clientset/versioned/fake/clientset_generated.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crs/generated/clientset/versioned/fake/register.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crs/generated/clientset/versioned/scheme/register.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crs/generated/informers/externalversions/core/interface.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)