Add container tool to non-Go operator makefiles

rhuss · rhuss · commit df2d9c609f4f · 2025-05-14T20:27:35.000+02:00
diff --git a/internal/plugins/manifests/v2/init.go b/internal/plugins/manifests/v2/init.go
@@ -230,6 +230,9 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
 `
 
 	makefileBundleFragmentNonGo = `
+# Container tool to use for building images
+CONTAINER_TOOL ?= docker
+
 .PHONY: bundle
 bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests -q
diff --git a/testdata/helm/memcached-operator/Makefile b/testdata/helm/memcached-operator/Makefile
@@ -171,6 +171,9 @@ OPERATOR_SDK = $(shell which operator-sdk)
 endif
 endif
 
+# Container tool to use for building and pushing images
+CONTAINER_TOOL ?= docker
+
 .PHONY: bundle
 bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests --interactive=false -q

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,9 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada`
`230`	`230`	`
`231`	`231`
`232`	`232`	makefileBundleFragmentNonGo = `
	`233`	`+# Container tool to use for building images`
	`234`	`+CONTAINER_TOOL ?= docker`
	`235`	`+`
`233`	`236`	`.PHONY: bundle`
`234`	`237`	`bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.`
`235`	`238`	`$(OPERATOR_SDK) generate kustomize manifests -q`