Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed descriptions from CRD #932

Merged
merged 1 commit into from
Feb 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .ci/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,24 @@ if [ $? != 0 ]; then
fi
fi

CONTROLLERGEN=controller-gen
command -v ${CONTROLLERGEN} > /dev/null
if [ $? != 0 ]; then
if [ -n ${GOPATH} ]; then
CONTROLLERGEN="${GOPATH}/bin/controller-gen"
fi
fi

# generate the CRD(s)
operator-sdk generate crds
${CONTROLLERGEN} crd paths=./pkg/apis/jaegertracing/... crd:maxDescLen=0,trivialVersions=true output:dir=./deploy/crds/
RT=$?
if [ ${RT} != 0 ]; then
echo "Failed to generate CRDs."
exit ${RT}
fi

# revert the APIs that are not managed by us
for revert in deploy/crds/kafka.strimzi.io_kafkas_crd.yaml deploy/crds/kafka.strimzi.io_kafkausers_crd.yaml; do
if [ -f "${revert}" ]; then
rm "${revert}"
fi
done
# move the generated CRD to the same location the operator-sdk places
mv deploy/crds/jaegertracing.io_jaegers.yaml deploy/crds/jaegertracing.io_jaegers_crd.yaml

# generate the schema validation (openapi) stubs
${OPENAPIGEN} --logtostderr=true -o "" -i ./pkg/apis/jaegertracing/v1 -O zz_generated.openapi -p ./pkg/apis/jaegertracing/v1 -h /dev/null -r "-"
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ install-tools:
golang.org/x/lint/golint \
github.com/securego/gosec/cmd/gosec \
golang.org/x/tools/cmd/goimports \
sigs.k8s.io/controller-tools/cmd/controller-gen \
k8s.io/kube-openapi/cmd/openapi-gen

.PHONY: install
Expand Down
Loading