Skip to content
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
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ clone-sample:
mkdir -p bin
cp -r samples bin/samples

#########

#########

# allow optional per-repo overrides
-include Makefile.overrides.mk
-include client-go/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
Expand All @@ -41,7 +45,7 @@ export

RUN = ./tools/scripts/run.sh

MAKE_DOCKER = $(RUN) make --no-print-directory -e -f Makefile.core.mk
MAKE_DOCKER = $(RUN) make --no-print-directory -e -f client-go/Makefile.core.mk

%:
@$(MAKE_DOCKER) $@
Expand All @@ -67,6 +71,6 @@ include out/.env
export

export GOBIN ?= $(GOPATH)/bin
include Makefile.core.mk
include client-go/Makefile.core.mk

endif
13 changes: 0 additions & 13 deletions Makefile.common.mk

This file was deleted.

1 change: 0 additions & 1 deletion Makefile.overrides.mk

This file was deleted.

2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache Dubbo Kubernetes
Copyright 2018-2025 The Apache Software Foundation
Copyright 2018-2026 The Apache Software Foundation

This product includes software developed by the Dubbo Kubernetes project
at The Apache Software Foundation (http://dubbo.apache.org/).
Expand Down
37 changes: 28 additions & 9 deletions Makefile.core.mk → client-go/Makefile.core.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
gen: generate-k8s-client tidy-go
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

gen: generate-k8s-client

clean: clean-k8s-client

Expand All @@ -9,11 +24,17 @@ client_gen = client-gen
lister_gen = lister-gen
informer_gen = informer-gen

kube_dubbo_source_packages = github.com/apache/dubbo-kubernetes/api/networking/v1alpha3
kube_dubbo_source_packages = $(subst $(space),$(empty), \
github.com/apache/dubbo-kubernetes/api/networking/v1alpha3 \
)

kube_base_output_package = client-go/pkg
kube_base_output_package = github.com/apache/dubbo-kubernetes/client-go/pkg
kube_api_base_package = $(kube_base_output_package)/apis
kube_api_packages = github.com/apache/dubbo-kubernetes/$(kube_api_base_package)/networking/v1alpha3

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
Expand All @@ -39,11 +60,11 @@ else
endif

rename_generated_files=\
cd client-go && find $(subst client-go/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(subst github.com/apache/dubbo-kubernetes/, $(empty), $(kube_clientset_package)) $(subst github.com/apache/dubbo-kubernetes/, $(empty), $(kube_listers_package)) $(subst github.com/apache/dubbo-kubernetes/, $(empty), $(kube_informers_package))) \
cd client-go && find $(subst client-go/, $(empty), $(subst github.com/apache/dubbo-kubernetes/, $(empty), $(subst $(comma), $(space), $(kube_api_packages) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)))) \
-name '*.go' -and -not -name 'doc.go' -and -not -name '*.gen.go' -type f -exec sh -c 'mv "$$1" "$${1%.go}".gen.go' - '{}' \; || true

fixup_generated_files=\
find client-go -name "*.deepcopy.gen.go" -type f -exec sed -i '' -e '/\*out = \*in/d' {} +
find . -name "*.deepcopy.gen.go" -type f | xargs sed -i -e '/\*out = \*in/d'

.PHONY: generate-k8s-client
generate-k8s-client:
Expand All @@ -67,6 +88,4 @@ generate-k8s-client:
.PHONY: clean-k8s-client
clean-k8s-client:
# remove generated code
@rm -rf client-go/pkg

include Makefile.common.mk
@rm -rf client-go/pkg
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

*.md
*.pb.go
.git/
.gitignore
README.md
# Note: bin/ is NOT ignored - it's needed for Docker builds
BUILD_WITH_CONTAINER ?= 1
7 changes: 4 additions & 3 deletions tests/loadtest/go.mod → client-go/cmd/main.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
// this work for additional information regarding copyright ownership.
// The ASF licenses this file to You under the Apache License, Version 2.0
// (the "License"); you may not use this file except in compliance with
// the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

module github.com/apache/dubbo-kubernetes/test/loadtest
package main

go 1.24.0
func main() {}
152 changes: 152 additions & 0 deletions client-go/pkg/apis/networking/v1alpha3/zz_generated.deepcopy.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions client-go/pkg/applyconfiguration/utils.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client-go/pkg/clientset/versioned/clientset.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading