Update makefile and client-go (#842)

Author: mfordjody

Makefile

@@ -22,4 +22,51 @@ build-dubboctl:
 .PHONY: clone-sample
 clone-sample:
 	mkdir -p bin
-	cp -r samples bin/samples
+	cp -r samples bin/samples
+
+# allow optional per-repo overrides
+-include Makefile.overrides.mk
+
+# Set the environment variable BUILD_WITH_CONTAINER to use a container
+# to build the repo. The only dependencies in this mode are to have make and
+# docker. If you'd rather build with a local tool chain instead, you'll need to
+# figure out all the tools you need in your environment to make that work.
+export BUILD_WITH_CONTAINER ?= 0
+
+ifeq ($(BUILD_WITH_CONTAINER),1)
+
+# An export free of arguments in a Makefile places all variables in the Makefile into the
+# environment. This is needed to allow overrides from Makefile.overrides.mk.
+export
+
+RUN = ./tools/scripts/run.sh
+
+MAKE_DOCKER = $(RUN) make --no-print-directory -e -f Makefile.core.mk
+
+%:
+	@$(MAKE_DOCKER) $@
+
+default:
+	@$(MAKE_DOCKER)
+
+shell:
+	@$(RUN) /bin/bash
+
+.PHONY: default shell
+
+else
+
+# If we are not in build container, we need a workaround to get environment properly set
+# Write to file, then include
+$(shell mkdir -p out)
+$(shell $(shell pwd)/tools/scripts/setup_env.sh envfile > out/.env)
+include out/.env
+# An export free of arguments in a Makefile places all variables in the Makefile into the
+# environment. This behavior may be surprising to many that use shell often, which simply
+# displays the existing environment
+export
+
+export GOBIN ?= $(GOPATH)/bin
+include Makefile.core.mk
+
+endif

Makefile.common.mk

@@ -0,0 +1,13 @@
+tidy-go:
+	@find -name go.mod -execdir go mod tidy \;
+
+mod-download-go:
+	@-GOFLAGS="-mod=readonly" find -name go.mod -execdir go mod download \;
+# go mod tidy is needed with Golang 1.16+ as go mod download affects go.sum
+# https://github.com/golang/go/issues/43994
+	@find -name go.mod -execdir go mod tidy \;
+
+format-go: tidy-go
+	@${FINDFILES} -name '*.go' \( ! \( -name '*.gen.go' -o -name '*.pb.go' \) \) -print0 | ${XARGS} common/scripts/format_go.sh
+
+.PHONY: format-go tidy-go mod-download-go

Makefile.core.mk

@@ -0,0 +1,85 @@
+gen: generate-k8s-client tidy-go
+
+clean: clean-k8s-client
+
+applyconfiguration_gen = applyconfiguration-gen
+kubetype_gen = kubetype-gen
+deepcopy_gen = deepcopy-gen
+client_gen = client-gen
+lister_gen = lister-gen
+informer_gen = informer-gen
+
+empty:=
+space := $(empty) $(empty)
+comma := ,
+
+kube_dubbo_source_packages = $(subst $(space),$(empty), \
+	./api/networking/v1alpha3 \
+	)
+
+kube_base_output_package = client-go/pkg
+kube_api_base_package = $(kube_base_output_package)/apis
+kube_api_packages = $(subst $(space),$(empty), \
+	$(kube_api_base_package)/networking/v1alpha3 \
+	)
+
+kube_api_applyconfiguration_packages = $(kube_api_packages),k8s.io/apimachinery/pkg/apis/meta/v1
+kube_clientset_package = $(kube_base_output_package)/clientset
+kube_clientset_name = versioned
+kube_listers_package = $(kube_base_output_package)/listers
+kube_informers_package = $(kube_base_output_package)/informers
+kube_applyconfiguration_package = $(kube_base_output_package)/applyconfiguration
+
+kube_go_header_text = header.go.txt
+
+ifeq ($(IN_BUILD_CONTAINER),1)
+	# k8s code generators rely on GOPATH, using $GOPATH/src as the base package
+	# directory.  Using --output-base . does not work, as that ends up generating
+	# code into ./<package>, e.g. ./client-go/pkg/apis/...  To work
+	# around this, we'll just let k8s generate the code where it wants and copy
+	# back to where it should have been generated.
+	move_generated=([ -d $(GOPATH)/src/$(kube_base_output_package)/ ] && cp -r $(GOPATH)/src/$(kube_base_output_package)/ client-go/ && rm -rf $(GOPATH)/src/$(kube_base_output_package)/) || true
+else
+	# nothing special for local builds
+	move_generated=
+endif
+
+rename_generated_files=\
+	for dir in $(subst client-go/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)); do \
+		if [ -d "$$dir" ]; then \
+			find "$$dir" -name '*.go' -and -not -name 'doc.go' -and -not -name '*.gen.go' -type f -exec sh -c 'mv "$$1" "$${1%.go}".gen.go' - '{}' \; ; \
+		fi \
+	done
+
+
+# Kubernetes deepcopy gen directly sets values of our types. Our types are protos; it is illegal to do this for protos.
+# However, we don't even need this anyways -- each individual field is explicitly copied already.
+# Remove the line doing this illegal operation.
+fixup_generated_files=\
+	find . -name "*.deepcopy.gen.go" -type f -exec sed -i '' -e '/\*out = \*in/d' {} +
+
+.PHONY: generate-k8s-client
+generate-k8s-client:
+	# generate kube api type wrappers for dubbo types
+	@GODEBUG=gotypesalias=0 $(kubetype_gen) --input-dirs $(kube_dubbo_source_packages) --output-package $(kube_api_base_package) -h $(kube_go_header_text)
+	@$(move_generated)
+	# generate deepcopy for kube api types
+	@$(deepcopy_gen) --input-dirs $(kube_api_packages) -O zz_generated.deepcopy  -h $(kube_go_header_text)
+	# generate ssa for kube api types
+	@$(applyconfiguration_gen) --input-dirs $(kube_api_applyconfiguration_packages) --output-package $(kube_applyconfiguration_package) -h $(kube_go_header_text)
+	# generate clientsets for kube api types
+	@$(client_gen) --clientset-name $(kube_clientset_name) --input-base "" --input  $(kube_api_packages) --output-package $(kube_clientset_package) -h $(kube_go_header_text) --apply-configuration-package $(kube_applyconfiguration_package)
+	# generate listers for kube api types
+	@$(lister_gen) --input-dirs $(kube_api_packages) --output-package $(kube_listers_package) -h $(kube_go_header_text)
+	# generate informers for kube api types
+	@$(informer_gen) --input-dirs $(kube_api_packages) --versioned-clientset-package $(kube_clientset_package)/$(kube_clientset_name) --listers-package $(kube_listers_package) --output-package $(kube_informers_package) -h $(kube_go_header_text)
+	@$(move_generated)
+	@$(rename_generated_files)
+	@$(fixup_generated_files)
+
+.PHONY: clean-k8s-client
+clean-k8s-client:
+    # remove generated code
+	@rm -rf client-go/pkg
+
+include Makefile.common.mk

Makefile.overrides.mk

@@ -0,0 +1 @@
+BUILD_WITH_CONTAINER ?= 1

api/networking/v1alpha3/destination_rule.pb.go

@@ -28,6 +28,21 @@ import "networking/v1alpha3/virtual_service.proto";
 
 option go_package = "/api/networking/v1alpha3";
 
+// <!-- crd generation tags
+// +cue-gen:DestinationRule:groupName:networking.dubbo.apache.org
+// +cue-gen:DestinationRule:versions:v1alpha3
+// +cue-gen:DestinationRule:annotations:helm.sh/resource-policy=keep
+// +cue-gen:DestinationRule:labels:app=dubbo-planet,chart=dubbo,heritage=Tiller,release=dubbo
+// +cue-gen:DestinationRule:subresource:status
+// +cue-gen:DestinationRule:scope:Namespaced
+// +cue-gen:DestinationRule:resource:categories=dubbo,networking,shortNames=dr
+// +cue-gen:DestinationRule:printerColumn:name=Host,type=string,JSONPath=.spec.host,description="The name of a service from the service registry"
+// +cue-gen:DestinationRule:printerColumn:name=Age,type=date,JSONPath=.metadata.creationTimestamp,description="CreationTimestamp is a timestamp
+// representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations.
+// Clients may not set this value. It is represented in RFC3339 form and is in UTC.
+// Populated by the system. Read-only. Null for lists. For more information, see [Kubernetes API Conventions](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata)"
+// +cue-gen:DestinationRule:preserveUnknownFields:false
+// -->
 //
 // <!-- go code generation tags
 // +kubetype-gen

api/networking/v1alpha3/destination_rule.proto

@@ -24,6 +24,21 @@ import "google/protobuf/wrappers.proto";
 
 option go_package = "/api/networking/v1alpha3";
 
+// <!-- crd generation tags
+// +cue-gen:VirtualService:groupName:networking.dubbo.apache.org
+// +cue-gen:VirtualService:versions:v1alpha3
+// +cue-gen:VirtualService:annotations:helm.sh/resource-policy=keep
+// +cue-gen:VirtualService:labels:app=dubbo-planet,chart=dubbo,heritage=Tiller,release=dubbo
+// +cue-gen:VirtualService:subresource:status
+// +cue-gen:VirtualService:scope:Namespaced
+// +cue-gen:VirtualService:resource:categories=dubbo,networking,shortNames=vs
+// +cue-gen:VirtualService:printerColumn:name=Hosts,type=string,JSONPath=.spec.hosts,description="The destination hosts to which traffic is being sent"
+// +cue-gen:VirtualService:printerColumn:name=Age,type=date,JSONPath=.metadata.creationTimestamp,description="CreationTimestamp is a timestamp
+// representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations.
+// Clients may not set this value. It is represented in RFC3339 form and is in UTC.
+// Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata"
+// +cue-gen:VirtualService:preserveUnknownFields:false
+// -->
 //
 // <!-- go code generation tags
 // +kubetype-gen