Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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=<your-registry>/cluster-api-provider-maas-controller-amd64:v0.7.0
export IMG=<your-registry>/cluster-api-provider-maas-controller-amd64:v0.8.0
```

- Build and push the controller image:
Expand All @@ -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
Expand All @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion clusterctl-settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "infrastructure-maas",
"config": {
"componentsFile": "infrastructure-components.yaml",
"nextVersion": "v0.7.0"
"nextVersion": "v0.8.0"
}
}
3 changes: 3 additions & 0 deletions metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,7 @@ releaseSeries:
contract: v1beta1
- major: 0
minor: 7
contract: v1beta1
- major: 0
minor: 8
contract: v1beta1