Skip to content

Commit 1b8d01b

Browse files
committed
prepare new release
1 parent 1194110 commit 1b8d01b

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

Makefile

+6-2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ generate-e2e-templates: $(KUSTOMIZE) ## Generate cluster-templates for e2e
115115
build-e2e-image: ## Build cappx image to be used for e2e test
116116
IMG=${E2E_IMG} $(MAKE) docker-build
117117

118+
USE_EXISTING_CLUSTER := false
118119
.PHONY: e2e
119120
e2e: generate-e2e-templates build-e2e-image cleanup-e2e-artifacts ## Run e2e test
120121
go test $(E2E_DIR)/... -v \
@@ -181,7 +182,8 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
181182

182183
.PHONY: deploy
183184
deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
184-
$(KUSTOMIZE) build config/default | kubectl apply -f -
185+
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
186+
$(KUSTOMIZE) build config/default | kubectl diff -f -
185187

186188
.PHONY: undeploy
187189
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
@@ -196,7 +198,9 @@ $(RELEASE_DIR):
196198

197199
RELEASE_TAG := $(shell git describe --abbrev=0 2>/dev/null)
198200

199-
.PHONY: release ## Builds all the manifests/config files to publish with a release
201+
.PHONY: release
202+
release: ## Builds all the manifests/config files to publish with a release
203+
@echo "Building assets for Release \"$(RELEASE_TAG)\""
200204
$(MAKE) release-manifests
201205
$(MAKE) release-metadata
202206
$(MAKE) release-templates

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ for more information : https://cluster-api.sigs.k8s.io/user/quick-start.html#ini
1717
```sh
1818
# install cluster-api components
1919
export EXP_CLUSTER_RESOURCE_SET=true
20-
clusterctl init --infrastructure=proxmox:v0.3.0 --config https://raw.githubusercontent.com/sp-yduck/cluster-api-provider-proxmox/main/clusterctl.yaml
20+
clusterctl init --infrastructure=proxmox:v0.3.1 --config https://raw.githubusercontent.com/sp-yduck/cluster-api-provider-proxmox/main/clusterctl.yaml
2121
```
2222
**Note:** container images are available at [ghcr.io/sp-yduck/cluster-api-provider-proxmox:\<tag\>](https://github.com/sp-yduck/cluster-api-provider-proxmox/pkgs/container/cluster-api-provider-proxmox)
2323

@@ -30,7 +30,7 @@ export PROXMOX_PASSWORD=password
3030
export PROXMOX_USER=user@pam
3131

3232
# generate manifests (available flags: --target-namespace, --kubernetes-version, --control-plane-machine-count, --worker-machine-count)
33-
clusterctl generate cluster cappx-test --control-plane-machine-count=3 --infrastructure=proxmox:v0.3.0 --config https://raw.githubusercontent.com/sp-yduck/cluster-api-provider-proxmox/main/clusterctl.yaml > cappx-test.yaml
33+
clusterctl generate cluster cappx-test --control-plane-machine-count=3 --infrastructure=proxmox:v0.3.1 --config https://raw.githubusercontent.com/sp-yduck/cluster-api-provider-proxmox/main/clusterctl.yaml > cappx-test.yaml
3434

3535
# inspect and edit
3636
vi cappx-test.yaml
@@ -119,7 +119,7 @@ export PROXMOX_USER=user@pam
119119
make test
120120
```
121121

122-
### E2E Testing
122+
#### E2E Testing
123123
```
124124
export CONTROLPLANE_HOST=X.X.X.X
125125
export PROXMOX_URL=https://X.X.X.X:8006/api2/json

config/default/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ patchesStrategicMerge:
3434
# If you want your controller-manager to expose the /metrics
3535
# endpoint w/o any authn/z, please comment the following line.
3636
- manager_auth_proxy_patch.yaml
37-
- manager_config_patch.yaml
37+
# - manager_config_patch.yaml
3838

3939

4040

config/default/manager_config_patch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ spec:
88
spec:
99
containers:
1010
- name: manager
11-
image: ghcr.io/sp-yduck/cluster-api-provider-proxmox:v0.3.0
11+
image: ghcr.io/sp-yduck/cluster-api-provider-proxmox:latest

config/manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
44
kind: Kustomization
55
images:
66
- name: controller
7-
newName: controller
7+
newName: ghcr.io/sp-yduck/cluster-api-provider-proxmox
88
newTag: latest

0 commit comments

Comments
 (0)