@@ -226,10 +226,6 @@ KUBEADM_CONTROL_PLANE_CONTROLLER_IMG ?= $(REGISTRY)/$(KUBEADM_CONTROL_PLANE_IMAG
226226CAPD_IMAGE_NAME ?= capd-manager
227227CAPD_CONTROLLER_IMG ?= $(REGISTRY ) /$(CAPD_IMAGE_NAME )
228228
229- # capim
230- CAPIM_IMAGE_NAME ?= capim-manager
231- CAPIM_CONTROLLER_IMG ?= $(REGISTRY ) /$(CAPIM_IMAGE_NAME )
232-
233229# clusterctl
234230CLUSTERCTL_MANIFEST_DIR := cmd/clusterctl/config
235231CLUSTERCTL_IMAGE_NAME ?= clusterctl
@@ -272,7 +268,7 @@ help: # Display this help
272268
273269# #@ generate:
274270
275- ALL_GENERATE_MODULES = core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure in-memory-infrastructure test-extension
271+ ALL_GENERATE_MODULES = core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure test-extension
276272
277273.PHONY : generate
278274generate : # # Run all generate-manifests-*, generate-go-deepcopy-*, generate-go-conversions-* and generate-go-openapi targets
@@ -364,21 +360,6 @@ generate-manifests-docker-infrastructure: $(CONTROLLER_GEN) ## Generate manifest
364360 output:webhook:dir=./config/webhook \
365361 webhook
366362
367-
368- .PHONY : generate-manifests-in-memory-infrastructure
369- generate-manifests-in-memory-infrastructure : $(CONTROLLER_GEN ) # # Generate manifests e.g. CRD, RBAC etc. for in-memory infrastructure provider
370- $(MAKE ) clean-generated-yaml SRC_DIRS=" $( CAPIM_DIR) /config/crd/bases,$( CAPIM_DIR) /config/webhook/manifests.yaml"
371- cd $(CAPIM_DIR ) ; $(CONTROLLER_GEN ) \
372- paths=./ \
373- paths=./api/... \
374- paths=./internal/controllers/... \
375- paths=./internal/webhooks/... \
376- crd:crdVersions=v1 \
377- rbac:roleName=manager-role \
378- output:crd:dir=./config/crd/bases \
379- output:webhook:dir=./config/webhook \
380- webhook
381-
382363.PHONY : generate-manifests-test-extension
383364generate-manifests-test-extension : $(CONTROLLER_GEN ) # # Generate manifests e.g. RBAC for test-extension provider
384365 cd ./test/extension; $(CONTROLLER_GEN ) \
@@ -421,20 +402,19 @@ generate-go-deepcopy-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate deepco
421402 paths=./controlplane/kubeadm/api/...
422403
423404.PHONY : generate-go-deepcopy-docker-infrastructure
424- generate-go-deepcopy-docker-infrastructure : $(CONTROLLER_GEN ) # # Generate deepcopy go code for docker infrastructure provider
405+ generate-go-deepcopy-docker-infrastructure : $(CONTROLLER_GEN ) generate-go-deepcopy-in-memory-infrastructure # # Generate deepcopy go code for docker infrastructure provider
425406 $(MAKE ) clean-generated-deepcopy SRC_DIRS=" $( CAPD_DIR) /api,$( CAPD_DIR) /$( EXP_DIR) /api"
426407 cd $(CAPD_DIR ) ; $(CONTROLLER_GEN ) \
427408 object:headerFile=../../../hack/boilerplate/boilerplate.generatego.txt \
428409 paths=./api/... \
429410 paths=./$(EXP_DIR ) /api/...
430411
431412.PHONY : generate-go-deepcopy-in-memory-infrastructure
432- generate-go-deepcopy-in-memory-infrastructure : $(CONTROLLER_GEN ) # # Generate deepcopy go code for in-memory infrastructure provider
433- $(MAKE ) clean-generated-deepcopy SRC_DIRS=" $( CAPIM_DIR) /api, $( CAPIM_DIR ) /internal /cloud/api"
413+ generate-go-deepcopy-in-memory-infrastructure : $(CONTROLLER_GEN ) # # Generate deepcopy go code for in-memory cloud resources
414+ $(MAKE ) clean-generated-deepcopy SRC_DIRS=" $( CAPIM_DIR) /pkg /cloud/api"
434415 cd $(CAPIM_DIR ) ; $(CONTROLLER_GEN ) \
435416 object:headerFile=../../../hack/boilerplate/boilerplate.generatego.txt \
436- paths=./api/... \
437- paths =./internal/cloud/api/...
417+ paths =./pkg/cloud/api/...
438418
439419.PHONY : generate-go-deepcopy-test-extension
440420generate-go-deepcopy-test-extension : $(CONTROLLER_GEN ) # # Generate deepcopy go code for test-extension
@@ -523,12 +503,8 @@ generate-go-conversions-docker-infrastructure: $(CONVERSION_GEN) ## Generate con
523503 ./$(EXP_DIR ) /api/v1alpha3 \
524504 ./$(EXP_DIR ) /api/v1alpha4
525505
526- .PHONY : generate-go-conversions-in-memory-infrastructure
527- generate-go-conversions-in-memory-infrastructure : $(CONVERSION_GEN ) # # Generate conversions go code for in-memory infrastructure provider
528- cd $(CAPIM_DIR )
529-
530506.PHONY : generate-go-conversions-test-extension
531- generate-go-conversions-test-extension : $(CONVERSION_GEN ) # # Generate conversions go code for in-memory infrastructure provider
507+ generate-go-conversions-test-extension : $(CONVERSION_GEN ) # # Generate conversions go code for test runtime extension provider
532508
533509# The tmp/sigs.k8s.io/cluster-api symlink is a workaround to make this target run outside of GOPATH
534510.PHONY : generate-go-openapi
@@ -560,7 +536,6 @@ generate-doctoc:
560536generate-e2e-templates : $(KUSTOMIZE ) $(addprefix generate-e2e-templates-, v0.3 v0.4 v1.5 v1.6 v1.8 v1.9 main) # # Generate cluster templates for all versions
561537
562538DOCKER_TEMPLATES := test/e2e/data/infrastructure-docker
563- INMEMORY_TEMPLATES := test/e2e/data/infrastructure-inmemory
564539
565540.PHONY : generate-e2e-templates-v0.3
566541generate-e2e-templates-v0.3 : $(KUSTOMIZE )
@@ -613,8 +588,6 @@ generate-e2e-templates-main: $(KUSTOMIZE)
613588 $(KUSTOMIZE ) build $(DOCKER_TEMPLATES ) /main/cluster-template-ignition --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES ) /main/cluster-template-ignition.yaml
614589 $(KUSTOMIZE ) build $(DOCKER_TEMPLATES ) /main/clusterclass-quick-start-kcp-only --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES ) /main/clusterclass-quick-start-kcp-only.yaml
615590
616- $(KUSTOMIZE) build $(INMEMORY_TEMPLATES)/main/cluster-template --load-restrictor LoadRestrictionsNone > $(INMEMORY_TEMPLATES)/main/cluster-template.yaml
617-
618591.PHONY : generate-metrics-config
619592generate-metrics-config : # # Generate ./config/metrics/crd-metrics-config.yaml
620593 OUTPUT_FILE=" ./config/metrics/crd-metrics-config.yaml" ; \
@@ -791,7 +764,7 @@ verify-import-restrictions: $(IMPORT_BOSS) ## Verify import restrictions with im
791764clusterctl : # # Build the clusterctl binary
792765 go build -trimpath -ldflags " $( LDFLAGS) " -o $(BIN_DIR ) /clusterctl sigs.k8s.io/cluster-api/cmd/clusterctl
793766
794- ALL_MANAGERS = core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure in-memory-infrastructure
767+ ALL_MANAGERS = core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure
795768
796769.PHONY : managers
797770managers : $(addprefix manager-,$(ALL_MANAGERS ) ) # # Run all manager-* targets
@@ -812,10 +785,6 @@ manager-kubeadm-control-plane: ## Build the kubeadm control plane manager binary
812785manager-docker-infrastructure : # # Build the docker infrastructure manager binary into the ./bin folder
813786 cd $(CAPD_DIR ) ; go build -trimpath -ldflags " $( LDFLAGS) " -o ../../../$(BIN_DIR ) /capd-manager sigs.k8s.io/cluster-api/test/infrastructure/docker
814787
815- .PHONY : manager-in-memory-infrastructure
816- manager-in-memory-infrastructure : # # Build the in-memory-infrastructure infrastructure manager binary into the ./bin folder
817- cd $(CAPIM_DIR ) ; go build -trimpath -ldflags " $( LDFLAGS) " -o ../../../$(BIN_DIR ) /capim-manager sigs.k8s.io/cluster-api/test/infrastructure/inmemory
818-
819788.PHONY : docker-pull-prerequisites
820789docker-pull-prerequisites :
821790 docker pull docker.io/docker/dockerfile:1.4
@@ -829,13 +798,13 @@ docker-build-%:
829798 $(MAKE ) ARCH=$* docker-build
830799
831800# Choice of images to build/push
832- ALL_DOCKER_BUILD ?= core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure in-memory-infrastructure test-extension clusterctl
801+ ALL_DOCKER_BUILD ?= core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure test-extension clusterctl
833802
834803.PHONY : docker-build
835804docker-build : docker-pull-prerequisites # # Run docker-build-* targets for all the images
836805 $(MAKE ) ARCH=$(ARCH ) $(addprefix docker-build-,$(ALL_DOCKER_BUILD ) )
837806
838- ALL_DOCKER_BUILD_E2E = core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure in-memory-infrastructure test-extension
807+ ALL_DOCKER_BUILD_E2E = core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure test-extension
839808
840809.PHONY : docker-build-e2e
841810docker-build-e2e : # # Run docker-build-* targets for all the images with settings to be used for the e2e tests
@@ -871,13 +840,6 @@ docker-build-docker-infrastructure: ## Build the docker image for docker infrast
871840 $(MAKE) set-manifest-image MANIFEST_IMG=$(CAPD_CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="$(CAPD_DIR)/config/default/manager_image_patch.yaml"
872841 $(MAKE) set-manifest-pull-policy TARGET_RESOURCE="$(CAPD_DIR)/config/default/manager_pull_policy.yaml"
873842
874- .PHONY : docker-build-in-memory-infrastructure
875- docker-build-in-memory-infrastructure : # # Build the docker image for in-memory infrastructure controller manager
876- # # reads Dockerfile from stdin to avoid an incorrectly cached Dockerfile (https://github.com/moby/buildkit/issues/1368)
877- cat $(CAPIM_DIR)/Dockerfile | DOCKER_BUILDKIT=1 docker build --build-arg builder_image=$(GO_CONTAINER_IMAGE) --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg ldflags="$(LDFLAGS)" . -t $(CAPIM_CONTROLLER_IMG)-$(ARCH):$(TAG) --file -
878- $(MAKE) set-manifest-image MANIFEST_IMG=$(CAPIM_CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="$(CAPIM_DIR)/config/default/manager_image_patch.yaml"
879- $(MAKE) set-manifest-pull-policy TARGET_RESOURCE="$(CAPIM_DIR)/config/default/manager_pull_policy.yaml"
880-
881843.PHONY : docker-build-clusterctl
882844docker-build-clusterctl : # # Build the docker image for clusterctl
883845# # reads Dockerfile from stdin to avoid an incorrectly cached Dockerfile (https://github.com/moby/buildkit/issues/1368)
@@ -957,20 +919,6 @@ test-docker-infrastructure-junit: $(SETUP_ENVTEST) $(GOTESTSUM) ## Run unit and
957919 $(GOTESTSUM ) --junitfile $(ARTIFACTS ) /junit.infra_docker.xml --raw-command cat $(ARTIFACTS ) /junit.infra_docker.stdout
958920 exit $$(cat $(ARTIFACTS ) /junit.infra_docker.exitcode )
959921
960- .PHONY : test-in-memory-infrastructure
961- test-in-memory-infrastructure : $(SETUP_ENVTEST ) # # Run unit and integration tests for in-memory infrastructure provider
962- cd $(CAPIM_DIR ) ; KUBEBUILDER_ASSETS=" $( KUBEBUILDER_ASSETS) " go test -race ./... $(TEST_ARGS )
963-
964- .PHONY : test-in-memory-infrastructure-verbose
965- test-in-memory-infrastructure-verbose : # # Run unit and integration tests for in-memory infrastructure provider with verbose flag
966- $(MAKE ) test-in-memory-infrastructure TEST_ARGS=" $( TEST_ARGS) -v"
967-
968- .PHONY : test-in-memory-infrastructure-junit
969- test-in-memory-infrastructure-junit : $(SETUP_ENVTEST ) $(GOTESTSUM ) # # Run unit and integration tests and generate a junit report for in-memory infrastructure provider
970- cd $(CAPIM_DIR ) ; set +o errexit; (KUBEBUILDER_ASSETS=" $( KUBEBUILDER_ASSETS) " go test -race -json ./... $( TEST_ARGS) ; echo $$ ? > $( ARTIFACTS) /junit.infra_inmemory.exitcode) | tee $(ARTIFACTS ) /junit.infra_inmemory.stdout
971- $(GOTESTSUM ) --junitfile $(ARTIFACTS ) /junit.infra_inmemory.xml --raw-command cat $(ARTIFACTS ) /junit.infra_inmemory.stdout
972- exit $$(cat $(ARTIFACTS ) /junit.infra_inmemory.exitcode )
973-
974922.PHONY : test-test-extension
975923test-test-extension : $(SETUP_ENVTEST ) # # Run unit and integration tests for the test extension
976924 cd $(TEST_EXTENSION_DIR ) ; KUBEBUILDER_ASSETS=" $( KUBEBUILDER_ASSETS) " go test -race ./... $(TEST_ARGS )
@@ -1087,10 +1035,6 @@ manifest-modification-dev: # Set the manifest images to the staging bucket.
10871035 MANIFEST_IMG=$(REGISTRY ) /$(CAPD_IMAGE_NAME ) MANIFEST_TAG=$(RELEASE_TAG ) \
10881036 TARGET_RESOURCE=" $( CAPD_DIR) /config/default/manager_image_patch.yaml"
10891037 $(MAKE ) set-manifest-pull-policy PULL_POLICY=IfNotPresent TARGET_RESOURCE=" $( CAPD_DIR) /config/default/manager_pull_policy.yaml"
1090- $(MAKE ) set-manifest-image \
1091- MANIFEST_IMG=$(REGISTRY ) /$(CAPIM_IMAGE_NAME ) MANIFEST_TAG=$(RELEASE_TAG ) \
1092- TARGET_RESOURCE=" $( CAPIM_DIR) /config/default/manager_image_patch.yaml"
1093- $(MAKE ) set-manifest-pull-policy PULL_POLICY=IfNotPresent TARGET_RESOURCE=" $( CAPIM_DIR) /config/default/manager_pull_policy.yaml"
10941038 $(MAKE ) set-manifest-image \
10951039 MANIFEST_IMG=$(REGISTRY ) /$(TEST_EXTENSION_IMAGE_NAME ) MANIFEST_TAG=$(RELEASE_TAG ) \
10961040 TARGET_RESOURCE=" $( TEST_EXTENSION_DIR) /config/default/manager_image_patch.yaml"
@@ -1122,8 +1066,6 @@ release-manifests: $(RELEASE_DIR) $(KUSTOMIZE) $(RUNTIME_OPENAPI_GEN) ## Build t
11221066release-manifests-dev : $(RELEASE_DIR ) $(KUSTOMIZE ) # # Build the development manifests and copies them in the release folder
11231067 cd $(CAPD_DIR ) ; $(KUSTOMIZE ) build config/default > ../../../$(RELEASE_DIR ) /infrastructure-components-development.yaml
11241068 cp $(CAPD_DIR ) /templates/* $(RELEASE_DIR ) /
1125- cd $(CAPIM_DIR ) ; $(KUSTOMIZE ) build config/default > ../../../$(RELEASE_DIR ) /infrastructure-components-in-memory-development.yaml
1126- cp $(CAPIM_DIR ) /templates/* $(RELEASE_DIR ) /
11271069 cd $(TEST_EXTENSION_DIR ) ; $(KUSTOMIZE ) build config/default > ../../$(RELEASE_DIR ) /runtime-extension-components-development.yaml
11281070
11291071.PHONY : release-binaries
@@ -1192,7 +1134,6 @@ release-alias-tag: ## Add the release alias tag to the last build tag
11921134 gcloud container images add-tag $(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG ) :$(TAG ) $(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG ) :$(RELEASE_ALIAS_TAG )
11931135 gcloud container images add-tag $(CLUSTERCTL_IMG ) :$(TAG ) $(CLUSTERCTL_IMG ) :$(RELEASE_ALIAS_TAG )
11941136 gcloud container images add-tag $(CAPD_CONTROLLER_IMG ) :$(TAG ) $(CAPD_CONTROLLER_IMG ) :$(RELEASE_ALIAS_TAG )
1195- gcloud container images add-tag $(CAPIM_CONTROLLER_IMG ) :$(TAG ) $(CAPIM_CONTROLLER_IMG ) :$(RELEASE_ALIAS_TAG )
11961137 gcloud container images add-tag $(TEST_EXTENSION_IMG ) :$(TAG ) $(TEST_EXTENSION_IMG ) :$(RELEASE_ALIAS_TAG )
11971138
11981139.PHONY : release-notes-tool
@@ -1285,18 +1226,6 @@ docker-push-manifest-docker-infrastructure: ## Push the multiarch manifest for t
12851226 $(MAKE ) set-manifest-image MANIFEST_IMG=$(CAPD_CONTROLLER_IMG ) MANIFEST_TAG=$(TAG ) TARGET_RESOURCE=" $( CAPD_DIR) /config/default/manager_image_patch.yaml"
12861227 $(MAKE ) set-manifest-pull-policy TARGET_RESOURCE=" $( CAPD_DIR) /config/default/manager_pull_policy.yaml"
12871228
1288- .PHONY : docker-push-in-memory-infrastructure
1289- docker-push-in-memory-infrastructure : # # Push the in-memory infrastructure provider image
1290- docker push $(CAPIM_CONTROLLER_IMG ) -$(ARCH ) :$(TAG )
1291-
1292- .PHONY : docker-push-manifest-in-memory-infrastructure
1293- docker-push-manifest-in-memory-infrastructure : # # Push the multiarch manifest for the in-memory infrastructure provider images
1294- docker manifest create --amend $(CAPIM_CONTROLLER_IMG ) :$(TAG ) $(shell echo $(ALL_ARCH ) | sed -e "s~[^ ]* ~$(CAPIM_CONTROLLER_IMG ) \-&:$(TAG ) ~g")
1295- @for arch in $(ALL_ARCH ) ; do docker manifest annotate --arch $$ {arch} ${CAPIM_CONTROLLER_IMG} :${TAG} ${CAPIM_CONTROLLER_IMG} -$$ {arch}:${TAG} ; done
1296- docker manifest push --purge $(CAPIM_CONTROLLER_IMG ) :$(TAG )
1297- $(MAKE ) set-manifest-image MANIFEST_IMG=$(CAPIM_CONTROLLER_IMG ) MANIFEST_TAG=$(TAG ) TARGET_RESOURCE=" $( CAPIM_DIR) /config/default/manager_image_patch.yaml"
1298- $(MAKE ) set-manifest-pull-policy TARGET_RESOURCE=" $( CAPIM_DIR) /config/default/manager_pull_policy.yaml"
1299-
13001229.PHONY : docker-push-test-extension
13011230docker-push-test-extension : # # Push the test extension provider image
13021231 docker push $(TEST_EXTENSION_IMG ) -$(ARCH ) :$(TAG )
@@ -1357,7 +1286,6 @@ clean-tilt: clean-charts clean-kind ## Remove all files generated by Tilt
13571286 rm -rf ./controlplane/kubeadm/.tiltbuild
13581287 rm -rf ./bootstrap/kubeadm/.tiltbuild
13591288 rm -rf ./test/infrastructure/docker/.tiltbuild
1360- rm -rf ./test/infrastructure/inmemory/.tiltbuild
13611289
13621290.PHONY : clean-charts
13631291clean-charts : # # Remove all local copies of Helm charts in ./hack/observability
0 commit comments