Skip to content

Commit f42fbae

Browse files
rhussrhuss
committed
feat: generalize container tool usage
To allow also the usage of podman, a $(CONTAINER_TOOL) var is include in teh Makefile generation. This aligns with the changes in kubebuilder. Signed-off-by: Roland Huß <[email protected]>
1 parent db1c4a1 commit f42fbae

File tree

6 files changed

+33
-20
lines changed

6 files changed

+33
-20
lines changed

‎changelog/fragments/generalize-container-tool.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
entries:
2+
- description: >
3+
The bundle build target now respects the CONTAINER_TOOL variable, allowing users to use alternative container tools like podman instead of docker.
4+
kind: "change"
5+
breaking: false

‎internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ func (f *Makefile) SetTemplateDefaults() error {
6565
}
6666

6767
const makefileTemplate = `
68+
# Container tool to use for building and pushing images
69+
CONTAINER_TOOL ?= docker
70+
6871
# Image URL to use all building/pushing image targets
6972
IMG ?= {{ .Image }}
7073
@@ -96,11 +99,11 @@ run: helm-operator ## Run against the configured Kubernetes cluster in ~/.kube/c
9699
97100
.PHONY: docker-build
98101
docker-build: ## Build docker image with the manager.
99-
docker build -t ${IMG} .
102+
$(CONTAINER_TOOL) build -t ${IMG} .
100103
101104
.PHONY: docker-push
102105
docker-push: ## Push docker image with the manager.
103-
docker push ${IMG}
106+
$(CONTAINER_TOOL) push ${IMG}
104107
105108
# PLATFORMS defines the target platforms for the manager image be build to provide support to multiple
106109
# architectures. (i.e. make docker-buildx IMG=myregistry/mypoperator:0.0.1). To use this option you need to:
@@ -111,10 +114,10 @@ docker-push: ## Push docker image with the manager.
111114
PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
112115
.PHONY: docker-buildx
113116
docker-buildx: ## Build and push docker image for the manager for cross-platform support
114-
- docker buildx create --name project-v3-builder
115-
docker buildx use project-v3-builder
116-
- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile .
117-
- docker buildx rm project-v3-builder
117+
- $(CONTAINER_TOOL) buildx create --name project-v3-builder
118+
$(CONTAINER_TOOL) buildx use project-v3-builder
119+
- $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile .
120+
- $(CONTAINER_TOOL) buildx rm project-v3-builder
118121
119122
##@ Deployment
120123

‎internal/plugins/manifests/v2/init.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
230230
`
231231

232232
makefileBundleFragmentNonGo = `
233+
233234
.PHONY: bundle
234235
bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
235236
$(OPERATOR_SDK) generate kustomize manifests -q
@@ -241,7 +242,7 @@ bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then v
241242
makefileBundleBuildPushFragment = `
242243
.PHONY: bundle-build
243244
bundle-build: ## Build the bundle image.
244-
docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
245+
$(CONTAINER_TOOL) build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
245246
246247
.PHONY: bundle-push
247248
bundle-push: ## Push the bundle image.
@@ -303,7 +304,7 @@ endif
303304
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
304305
.PHONY: catalog-build
305306
catalog-build: opm ## Build a catalog image.
306-
$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
307+
$(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
307308
308309
# Push the catalog image.
309310
.PHONY: catalog-push

‎testdata/go/v4/memcached-operator/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
279279

280280
.PHONY: bundle-build
281281
bundle-build: ## Build the bundle image.
282-
docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
282+
$(CONTAINER_TOOL) build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
283283

284284
.PHONY: bundle-push
285285
bundle-push: ## Push the bundle image.
@@ -319,7 +319,7 @@ endif
319319
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
320320
.PHONY: catalog-build
321321
catalog-build: opm ## Build a catalog image.
322-
$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
322+
$(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
323323

324324
# Push the catalog image.
325325
.PHONY: catalog-push

‎testdata/go/v4/monitoring/memcached-operator/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
294294

295295
.PHONY: bundle-build
296296
bundle-build: ## Build the bundle image.
297-
docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
297+
$(CONTAINER_TOOL) build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
298298

299299
.PHONY: bundle-push
300300
bundle-push: ## Push the bundle image.
@@ -334,7 +334,7 @@ endif
334334
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
335335
.PHONY: catalog-build
336336
catalog-build: opm ## Build a catalog image.
337-
$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
337+
$(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
338338

339339
# Push the catalog image.
340340
.PHONY: catalog-push

‎testdata/helm/memcached-operator/Makefile‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ endif
5050
# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
5151
OPERATOR_SDK_VERSION ?= v1.39.2
5252

53+
# Container tool to use for building and pushing images
54+
CONTAINER_TOOL ?= docker
55+
5356
# Image URL to use all building/pushing image targets
5457
IMG ?= controller:latest
5558

@@ -81,11 +84,11 @@ run: helm-operator ## Run against the configured Kubernetes cluster in ~/.kube/c
8184

8285
.PHONY: docker-build
8386
docker-build: ## Build docker image with the manager.
84-
docker build -t ${IMG} .
87+
$(CONTAINER_TOOL) build -t ${IMG} .
8588

8689
.PHONY: docker-push
8790
docker-push: ## Push docker image with the manager.
88-
docker push ${IMG}
91+
$(CONTAINER_TOOL) push ${IMG}
8992

9093
# PLATFORMS defines the target platforms for the manager image be build to provide support to multiple
9194
# architectures. (i.e. make docker-buildx IMG=myregistry/mypoperator:0.0.1). To use this option you need to:
@@ -96,10 +99,10 @@ docker-push: ## Push docker image with the manager.
9699
PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
97100
.PHONY: docker-buildx
98101
docker-buildx: ## Build and push docker image for the manager for cross-platform support
99-
- docker buildx create --name project-v3-builder
100-
docker buildx use project-v3-builder
101-
- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile .
102-
- docker buildx rm project-v3-builder
102+
- $(CONTAINER_TOOL) buildx create --name project-v3-builder
103+
$(CONTAINER_TOOL) buildx use project-v3-builder
104+
- $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile .
105+
- $(CONTAINER_TOOL) buildx rm project-v3-builder
103106

104107
##@ Deployment
105108

@@ -171,6 +174,7 @@ OPERATOR_SDK = $(shell which operator-sdk)
171174
endif
172175
endif
173176

177+
174178
.PHONY: bundle
175179
bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
176180
$(OPERATOR_SDK) generate kustomize manifests --interactive=false -q
@@ -180,7 +184,7 @@ bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then v
180184

181185
.PHONY: bundle-build
182186
bundle-build: ## Build the bundle image.
183-
docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
187+
$(CONTAINER_TOOL) build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
184188

185189
.PHONY: bundle-push
186190
bundle-push: ## Push the bundle image.
@@ -219,7 +223,7 @@ endif
219223
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
220224
.PHONY: catalog-build
221225
catalog-build: opm ## Build a catalog image.
222-
$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
226+
$(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
223227

224228
# Push the catalog image.
225229
.PHONY: catalog-push

0 commit comments

Comments
 (0)