Skip to content

Commit 4da5f5a

Browse files
committed
move from 0.3.1 to 0.4.0(master) in the CI test
1 parent d8cfc76 commit 4da5f5a

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ TAG ?= dev
5757
ARCH ?= amd64
5858
ALL_ARCH = amd64 arm arm64 ppc64le s390x
5959
CAPI_VERSION = 0.3.11
60+
CAPO_VERSION = 0.4.0
6061

6162
# Allow overriding manifest generation destination directory
6263
MANIFEST_ROOT ?= config
@@ -316,16 +317,16 @@ create-cluster: $(KUSTOMIZE) $(ENVSUBST) ## Create a development Kubernetes clus
316317
mkdir ~/.cluster-api
317318
chmod +x $(CLUSTERCTL)
318319
# Create clusterctl.yaml to use local OpenStack provider
319-
mkdir -p ./out/infrastructure-openstack/v0.3.1
320+
mkdir -p ./out/infrastructure-openstack/$(CAPO_VERSION)
320321
echo "providers:" > ./out/clusterctl.yaml
321322
echo "- name: openstack" >> ./out/clusterctl.yaml
322-
echo " url: $(PWD)/out/infrastructure-openstack/v0.3.1/infrastructure-components.yaml" >> ./out/clusterctl.yaml
323+
echo " url: $(PWD)/out/infrastructure-openstack/$(CAPO_VERSION)/infrastructure-components.yaml" >> ./out/clusterctl.yaml
323324
echo " type: InfrastructureProvider" >> ./out/clusterctl.yaml
324325

325-
echo "releaseSeries:" > ./out/infrastructure-openstack/v0.3.1/metadata.yaml
326-
echo "- major: 0" >> ./out/infrastructure-openstack/v0.3.1/metadata.yaml
327-
echo " minor: 3" >> ./out/infrastructure-openstack/v0.3.1/metadata.yaml
328-
echo " contract: v1alpha3" >> ./out/infrastructure-openstack/v0.3.1/metadata.yaml
326+
echo "releaseSeries:" > ./out/infrastructure-openstack/$(CAPO_VERSION)/metadata.yaml
327+
echo "- major: 0" >> ./out/infrastructure-openstack/$(CAPO_VERSION)/metadata.yaml
328+
echo " minor: 4" >> ./out/infrastructure-openstack/$(CAPO_VERSION)/metadata.yaml
329+
echo " contract: v1alpha3" >> ./out/infrastructure-openstack/$(CAPO_VERSION)/metadata.yaml
329330

330331
@if [ -z `kind get clusters | grep clusterapi` ]; then \
331332
kind create cluster --name=clusterapi; \
@@ -340,7 +341,7 @@ create-cluster: $(KUSTOMIZE) $(ENVSUBST) ## Create a development Kubernetes clus
340341

341342
# (Re-)deploy CAPO provider
342343
MANIFEST_IMG=$(CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) $(MAKE) set-manifest-image
343-
$(KUSTOMIZE) build config > ./out/infrastructure-openstack/v0.3.1/infrastructure-components.yaml
344+
$(KUSTOMIZE) build config > ./out/infrastructure-openstack/$(CAPO_VERSION)/infrastructure-components.yaml
344345
$(CLUSTERCTL) delete --infrastructure openstack --include-namespace --namespace capo-system || true
345346
kubectl wait --for=delete ns/capo-system || true
346347
$(CLUSTERCTL) init --config ./out/clusterctl.yaml --infrastructure openstack --core cluster-api:v${CAPI_VERSION} --bootstrap kubeadm:v${CAPI_VERSION} --control-plane kubeadm:v${CAPI_VERSION}

0 commit comments

Comments
 (0)