diff --git a/Makefile b/Makefile index eb3c9427b..f949f7940 100644 --- a/Makefile +++ b/Makefile @@ -18,13 +18,13 @@ ALL_ARCH = amd64 arm64 ## Image URL to use all building/pushing image targets #IMAGE_NAME := cluster-api-provider-maas-controller #IMG_URL ?= gcr.io/spectro-dev-public/release/cluster-api -#IMG_TAG ?= v0.7.0 +#IMG_TAG ?= v0.8.0 #IMG ?= ${IMG_URL}/${IMAGE_NAME}:${IMG_TAG} # Image URL to use all building/pushing image targets IMAGE_NAME := cluster-api-provider-maas-controller REGISTRY ?= "us-east1-docker.pkg.dev/spectro-images/dev/${USER}/cluster-api" -IMG_TAG ?= v0.7.0 +IMG_TAG ?= v0.8.0 CONTROLLER_IMG ?= ${REGISTRY}/${IMAGE_NAME} # Set --output-base for conversion-gen if we are not within GOPATH diff --git a/README.md b/README.md index 7bc46a255..7986c0fac 100644 --- a/README.md +++ b/README.md @@ -92,14 +92,14 @@ WORKER_MACHINE_TAG: hello-world ``` - Initialize infrastructure ```bash -clusterctl init --infrastructure maas:v0.7.0 +clusterctl init --infrastructure maas:v0.8.0 ``` `clusterctl init` substitutes `MAAS_ENDPOINT`/`MAAS_API_KEY` into the `capmaas-manager-bootstrap-credentials` secret (in the `capmaas-system` namespace) and wires it into the controller — you do **not** need to create the secret by hand. - Generate and create cluster ``` -clusterctl generate cluster t-cluster --infrastructure=maas:v0.7.0 --kubernetes-version v1.33.5 --control-plane-machine-count=1 --worker-machine-count=3 | kubectl apply -f - +clusterctl generate cluster t-cluster --infrastructure=maas:v0.8.0 --kubernetes-version v1.33.5 --control-plane-machine-count=1 --worker-machine-count=3 | kubectl apply -f - ``` ### Testing the provider @@ -112,7 +112,7 @@ make test - Set `IMG` to the controller image you control (registry + image + tag). This same image must be used for `docker-build`, `docker-push`, and `dev-manifests` so that the generated `infrastructure-components.yaml` points at the image you actually pushed. Export it once so every step picks it up: ```shell -export IMG=/cluster-api-provider-maas-controller-amd64:v0.7.0 +export IMG=/cluster-api-provider-maas-controller-amd64:v0.8.0 ``` - Build and push the controller image: @@ -125,14 +125,14 @@ make docker-build && make docker-push make dev-manifests IMG=$IMG ``` -- Move _build/dev/ directory contents to ~/.clusterapi/overrides v0.7.0 depending on version you are working with +- Move _build/dev/ directory contents to ~/.cluster-api/overrides v0.8.0 depending on version you are working with ```text . ├── clusterctl.yaml ├── overrides │   ├── infrastructure-maas -│   └── v0.7.0 +│   └── v0.8.0 │   ├── cluster-template.yaml │   ├── infrastructure-components.yaml │   └── metadata.yaml @@ -144,24 +144,24 @@ make dev-manifests IMG=$IMG - Run ```shell -clusterctl init --infrastructure maas:v0.7.0 +clusterctl init --infrastructure maas:v0.8.0 ``` ## Install CRDs -### v1beta1 v0.7.0 release +### v1beta1 v0.8.0 release - Generate cluster using ```shell -clusterctl generate cluster t-cluster --infrastructure=maas:v0.7.0 | kubectl apply -f - +clusterctl generate cluster t-cluster --infrastructure=maas:v0.8.0 | kubectl apply -f - ``` or ```shell -clusterctl generate cluster t-cluster --infrastructure=maas:v0.7.0 --kubernetes-version v1.33.5 > my_cluster.yaml +clusterctl generate cluster t-cluster --infrastructure=maas:v0.8.0 --kubernetes-version v1.33.5 > my_cluster.yaml kubectl apply -f my_cluster.yaml ``` or ```shell -clusterctl generate cluster t-cluster --infrastructure=maas:v0.7.0 --kubernetes-version v1.33.5 --control-plane-machine-count=1 --worker-machine-count=3 > my_cluster.yaml +clusterctl generate cluster t-cluster --infrastructure=maas:v0.8.0 --kubernetes-version v1.33.5 --control-plane-machine-count=1 --worker-machine-count=3 > my_cluster.yaml kubectl apply -f my_cluster.yaml ``` diff --git a/clusterctl-settings.json b/clusterctl-settings.json index 90d583600..7bf193997 100644 --- a/clusterctl-settings.json +++ b/clusterctl-settings.json @@ -2,6 +2,6 @@ "name": "infrastructure-maas", "config": { "componentsFile": "infrastructure-components.yaml", - "nextVersion": "v0.7.0" + "nextVersion": "v0.8.0" } } diff --git a/metadata.yaml b/metadata.yaml index 1744c21e6..dedaa80d2 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -25,4 +25,7 @@ releaseSeries: contract: v1beta1 - major: 0 minor: 7 + contract: v1beta1 + - major: 0 + minor: 8 contract: v1beta1 \ No newline at end of file