mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-10-31 10:18:13 +00:00 
			
		
		
		
	Remove refs to .make
This commit is contained in:
		
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -109,9 +109,6 @@ kubernetes.tar.gz | |||||||
| # Phony test files used as part of coverage generation | # Phony test files used as part of coverage generation | ||||||
| zz_generated_*_test.go | zz_generated_*_test.go | ||||||
|  |  | ||||||
| # make-related metadata |  | ||||||
| /.make/ |  | ||||||
|  |  | ||||||
| # Just in time generated data in the source, should never be committed | # Just in time generated data in the source, should never be committed | ||||||
| /test/e2e/generated/bindata.go | /test/e2e/generated/bindata.go | ||||||
|  |  | ||||||
|   | |||||||
| @@ -77,7 +77,7 @@ port = 8730 | |||||||
|   secrets file = ${SECRETS} |   secrets file = ${SECRETS} | ||||||
|   read only = false |   read only = false | ||||||
|   path = ${VOLUME} |   path = ${VOLUME} | ||||||
|   filter = - /.make/ - /_tmp/ |   filter = - /_tmp/ | ||||||
| EOF | EOF | ||||||
|  |  | ||||||
| exec /usr/bin/rsync --no-detach --daemon --config="${CONFFILE}" "$@" | exec /usr/bin/rsync --no-detach --daemon --config="${CONFFILE}" "$@" | ||||||
|   | |||||||
| @@ -663,7 +663,6 @@ function kube::build::sync_to_container() { | |||||||
|   kube::build::rsync \ |   kube::build::rsync \ | ||||||
|     --delete \ |     --delete \ | ||||||
|     --filter='H /.git' \ |     --filter='H /.git' \ | ||||||
|     --filter='- /.make/' \ |  | ||||||
|     --filter='- /_tmp/' \ |     --filter='- /_tmp/' \ | ||||||
|     --filter='- /_output/' \ |     --filter='- /_output/' \ | ||||||
|     --filter='- /' \ |     --filter='- /' \ | ||||||
|   | |||||||
| @@ -46,9 +46,6 @@ OUT_DIR ?= _output | |||||||
| BIN_DIR := $(OUT_DIR)/bin | BIN_DIR := $(OUT_DIR)/bin | ||||||
| PRJ_SRC_PATH := k8s.io/kubernetes | PRJ_SRC_PATH := k8s.io/kubernetes | ||||||
|  |  | ||||||
| # Metadata for driving the build lives here. |  | ||||||
| META_DIR := .make |  | ||||||
|  |  | ||||||
| ifdef KUBE_GOFLAGS | ifdef KUBE_GOFLAGS | ||||||
| $(info KUBE_GOFLAGS is now deprecated. Please use GOFLAGS instead.) | $(info KUBE_GOFLAGS is now deprecated. Please use GOFLAGS instead.) | ||||||
| ifndef GOFLAGS | ifndef GOFLAGS | ||||||
| @@ -305,26 +302,11 @@ ifeq ($(PRINT_HELP),y) | |||||||
| clean: | clean: | ||||||
| 	echo "$$CLEAN_HELP_INFO" | 	echo "$$CLEAN_HELP_INFO" | ||||||
| else | else | ||||||
| clean: clean_meta | clean: | ||||||
| 	build/make-clean.sh | 	build/make-clean.sh | ||||||
| 	hack/make-rules/clean.sh | 	hack/make-rules/clean.sh | ||||||
| endif | endif | ||||||
|  |  | ||||||
| define CLEAN_META_HELP_INFO |  | ||||||
| # Remove make-related metadata files. |  | ||||||
| # |  | ||||||
| # Example: |  | ||||||
| #   make clean_meta |  | ||||||
| endef |  | ||||||
| .PHONY: clean_meta |  | ||||||
| ifeq ($(PRINT_HELP),y) |  | ||||||
| clean_meta: |  | ||||||
| 	echo "$$CLEAN_META_HELP_INFO" |  | ||||||
| else |  | ||||||
| clean_meta: |  | ||||||
| 	rm -rf $(META_DIR) |  | ||||||
| endif |  | ||||||
|  |  | ||||||
| # TODO(thockin): Remove this in v1.29. | # TODO(thockin): Remove this in v1.29. | ||||||
| .PHONY: generated_files | .PHONY: generated_files | ||||||
| generated_files: | generated_files: | ||||||
|   | |||||||
| @@ -62,8 +62,6 @@ def get_all_files(rootdir): | |||||||
|             dirs.remove('third_party') |             dirs.remove('third_party') | ||||||
|         if '.git' in dirs: |         if '.git' in dirs: | ||||||
|             dirs.remove('.git') |             dirs.remove('.git') | ||||||
|         if '.make' in dirs: |  | ||||||
|             dirs.remove('.make') |  | ||||||
|         if 'BUILD' in files: |         if 'BUILD' in files: | ||||||
|            files.remove('BUILD') |            files.remove('BUILD') | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Tim Hockin
					Tim Hockin