Skip to content

Commit a95786d

Browse files
committed
Use oc kustomize instead of kustomize to build the docs
For not mixing the kustomize versions (CRDs and docs), use oc kustomize for docs Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>
1 parent 21b29b8 commit a95786d

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

Makefile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,8 @@ docs-clean:
107107
rm -r docs_build
108108

109109
.PHONY: docs-examples
110-
docs-kustomize-examples: export KUSTOMIZE_VERSION=v5.0.1
111-
docs-kustomize-examples: yq kustomize ## Generate updated docs from examples using kustomize
112-
KUSTOMIZE=$(KUSTOMIZE) LOCALBIN=$(LOCALBIN) ./docs/kustomize_to_docs.sh
110+
docs-kustomize-examples: oc yq ## Generate updated docs from examples using kustomize
111+
LOCALBIN=$(LOCALBIN) ./docs/kustomize_to_docs.sh
113112

114113
##@ General
115114

@@ -270,6 +269,7 @@ CONTROLLER_TOOLS_VERSION ?= v0.11.1
270269
CRD_MARKDOWN_VERSION ?= v0.0.3
271270
KUTTL_VERSION ?= 0.17.0
272271
GOTOOLCHAIN_VERSION ?= go1.21.0
272+
OC_VERSION ?= 4.14.0
273273

274274
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
275275
.PHONY: kustomize
@@ -363,11 +363,17 @@ endif
363363
endif
364364

365365
.PHONY: yq
366-
yq: ## Download and install yq in local env
366+
yq: $(LOCALBIN) ## Download and install yq in local env
367367
test -s $(LOCALBIN)/yq || ( cd $(LOCALBIN) &&\
368368
wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64.tar.gz -O - |\
369369
tar xz && mv yq_linux_amd64 $(LOCALBIN)/yq )
370370

371+
.PHONY: oc
372+
oc: $(LOCALBIN) ## Download and install oc in local env
373+
test -s $(LOCALBIN)/oc || ( cd $(LOCALBIN) &&\
374+
wget https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/$(OC_VERSION)/openshift-client-linux-$(OC_VERSION).tar.gz -O - |\
375+
tar xz)
376+
371377
# Build make variables to export for shell
372378
MAKE_ENV := $(shell echo '$(.VARIABLES)' | awk -v RS=' ' '/^(IMAGE)|.*?(REGISTRY)$$/')
373379
SHELL_EXPORT = $(foreach v,$(MAKE_ENV),$(v)='$($(v))')

docs/kustomize_to_docs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ BAREMETAL=docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-bare-meta
55
FOOTER=$(sed '0,/----/d' $BAREMETAL | sed -e '0,/----/d')
66
sed -i '/----/q' $BAREMETAL
77
sed -i 's/preprovisioned/baremetal/' config/samples/dataplane/no_vars_from/kustomization.yaml
8-
$KUSTOMIZE --load-restrictor LoadRestrictionsNone build config/samples/dataplane/no_vars_from | $LOCALBIN/yq ' select(.kind == "OpenStackDataPlaneNodeSet")' >> $BAREMETAL
8+
$LOCALBIN/oc kustomize --load-restrictor LoadRestrictionsNone config/samples/dataplane/no_vars_from | $LOCALBIN/yq ' select(.kind == "OpenStackDataPlaneNodeSet")' >> $BAREMETAL
99
sed -i 's/\/baremetal/\/preprovisioned/' config/samples/dataplane/no_vars_from/kustomization.yaml
1010
echo -e "----\n$FOOTER" >> $BAREMETAL
1111

@@ -32,7 +32,7 @@ done
3232
PREPROVISIONED=docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-preprovisioned-nodes.adoc
3333
FOOTER=$(sed '0,/----/d' $PREPROVISIONED | sed -e '0,/----/d')
3434
sed -i '/----/q' $PREPROVISIONED
35-
$KUSTOMIZE --load-restrictor LoadRestrictionsNone build config/samples/dataplane/no_vars_from | $LOCALBIN/yq ' select(.kind == "OpenStackDataPlaneNodeSet")' >> $PREPROVISIONED
35+
$LOCALBIN/oc kustomize --load-restrictor LoadRestrictionsNone config/samples/dataplane/no_vars_from | $LOCALBIN/yq ' select(.kind == "OpenStackDataPlaneNodeSet")' >> $PREPROVISIONED
3636
echo -e "----\n$FOOTER" >> $PREPROVISIONED
3737

3838
COUNT=1

0 commit comments

Comments
 (0)