#920: Adding the Jaeger client generated code through client-gen

.ci/generate.sh

@@ -16,6 +16,14 @@ if [ $? != 0 ]; then
     fi
 fi
 
+CLIENTGEN=client-gen
+command -v ${CLIENTGEN} > /dev/null
+if [ $? != 0 ]; then
+    if [ -n ${GOPATH} ]; then
+        CLIENTGEN="${GOPATH}/bin/client-gen"
+    fi
+fi
+
 # generate the CRD(s)
 ${CONTROLLERGEN} crd paths=./pkg/apis/jaegertracing/... crd:maxDescLen=0,trivialVersions=true output:dir=./deploy/crds/
 RT=$?
@@ -42,3 +50,17 @@ if [ ${RT} != 0 ]; then
     echo "Failed to generate the Kubernetes stubs."
     exit ${RT}
 fi
+
+# generate the clients
+${CLIENTGEN} \
+    --input "jaegertracing/v1" \
+    --input-base github.com/jaegertracing/jaeger-operator/pkg/apis \
+    --go-header-file /dev/null \
+    --output-package github.com/jaegertracing/jaeger-operator/pkg/client \
+    --clientset-name versioned \
+    --output-base ../../../
+RT=$?
+if [ ${RT} != 0 ]; then
+    echo "Failed to generate the Jaeger Tracing clients."
+    exit ${RT}
+fi

Makefile

@@ -25,7 +25,9 @@ SDK_VERSION=v0.15.1
 GOPATH ?= "$(HOME)/go"
 
 LD_FLAGS ?= "-X $(VERSION_PKG).version=$(OPERATOR_VERSION) -X $(VERSION_PKG).buildDate=$(VERSION_DATE) -X $(VERSION_PKG).defaultJaeger=$(JAEGER_VERSION)"
-UNIT_TEST_PACKAGES := $(shell go list ./cmd/... ./pkg/... | grep -v elasticsearch/v1 | grep -v kafka/v1beta1)
+
+UNIT_TEST_PACKAGES := $(shell go list ./cmd/... ./pkg/... | grep -v elasticsearch/v1 | grep -v kafka/v1beta1 | grep -v client/versioned)
+
 TEST_OPTIONS = $(VERBOSE) -kubeconfig $(KUBERNETES_CONFIG) -namespacedMan ../../deploy/test/namespace-manifests.yaml -globalMan ../../deploy/test/global-manifests.yaml -root .
 
 .DEFAULT_GOAL := build
@@ -37,8 +39,10 @@ check:
 	@[ ! -s "$(FMT_LOG)" ] || (echo "Go fmt, license check, or import ordering failures, run 'make format'" | cat - $(FMT_LOG) && false)
 
 .PHONY: ensure-generate-is-noop
-ensure-generate-is-noop: generate
+ensure-generate-is-noop: generate format
 	@git diff -s --exit-code pkg/apis/jaegertracing/v1/zz_generated.*.go || (echo "Build failed: a model has been changed but the generated resources aren't up to date. Run 'make generate' and update your PR." && exit 1)
+	@git diff -s --exit-code pkg/client/versioned || (echo "Build failed: the versioned clients aren't up to date. Run 'make generate'." && exit 1)
+
 
 .PHONY: format
 format:
@@ -269,8 +273,11 @@ crd:
 ingress:
 	@minikube addons enable ingress
 
-.PHONY: generate
-generate:
+.PHONY: generate 
+generate: internal-generate format
+
+.PHONY: internal-generate
+internal-generate:
 	@GOPATH=${GOPATH} ./.ci/generate.sh
 
 .PHONY: test
@@ -298,6 +305,7 @@ install-tools:
 		github.com/securego/gosec/cmd/gosec \
 		golang.org/x/tools/cmd/goimports \
 		sigs.k8s.io/controller-tools/cmd/controller-gen \
+		k8s.io/code-generator/cmd/client-gen \
 		k8s.io/kube-openapi/cmd/openapi-gen
 
 .PHONY: install

go.sum

@@ -1054,6 +1054,7 @@ k8s.io/client-go v0.0.0-20191016111102-bec269661e48 h1:C2XVy2z0dV94q9hSSoCuTPp1K
 k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU=
 k8s.io/cloud-provider v0.0.0-20191016115326-20453efc2458/go.mod h1:O5SO5xcgxrjJV9EC9R/47RuBpbk5YX9URDBlg++FA5o=
 k8s.io/cluster-bootstrap v0.0.0-20191016115129-c07a134afb42/go.mod h1:MzCL6kLExQuHruGaqibd8cugC8nw8QRxm3+lzR5l8SI=
+k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894 h1:NMYlxaF7rYQJk2E2IyrUhaX81zX24+dmoZdkPw0gJqI=
 k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894/go.mod h1:mJUgkl06XV4kstAnLHAIzJPVCOzVR+ZcfPIv4fUsFCY=
 k8s.io/component-base v0.0.0-20191016111319-039242c015a9/go.mod h1:SuWowIgd/dtU/m/iv8OD9eOxp3QZBBhTIiWMsBQvKjI=
 k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac/go.mod h1:BvtUaNBr0fEpzb11OfrQiJLsLPtqbmulpo1fPwcpP6Q=