Skip to content

Commit

Permalink
prepare new release
Browse files Browse the repository at this point in the history
  • Loading branch information
sp-yduck committed Oct 8, 2023
1 parent 1194110 commit 1b8d01b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ generate-e2e-templates: $(KUSTOMIZE) ## Generate cluster-templates for e2e
build-e2e-image: ## Build cappx image to be used for e2e test
IMG=${E2E_IMG} $(MAKE) docker-build

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

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

.PHONY: undeploy
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.
Expand All @@ -196,7 +198,9 @@ $(RELEASE_DIR):

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

.PHONY: release ## Builds all the manifests/config files to publish with a release
.PHONY: release
release: ## Builds all the manifests/config files to publish with a release
@echo "Building assets for Release \"$(RELEASE_TAG)\""
$(MAKE) release-manifests
$(MAKE) release-metadata
$(MAKE) release-templates
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ for more information : https://cluster-api.sigs.k8s.io/user/quick-start.html#ini
```sh
# install cluster-api components
export EXP_CLUSTER_RESOURCE_SET=true
clusterctl init --infrastructure=proxmox:v0.3.0 --config https://raw.githubusercontent.com/sp-yduck/cluster-api-provider-proxmox/main/clusterctl.yaml
clusterctl init --infrastructure=proxmox:v0.3.1 --config https://raw.githubusercontent.com/sp-yduck/cluster-api-provider-proxmox/main/clusterctl.yaml
```
**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)

Expand All @@ -30,7 +30,7 @@ export PROXMOX_PASSWORD=password
export PROXMOX_USER=user@pam

# generate manifests (available flags: --target-namespace, --kubernetes-version, --control-plane-machine-count, --worker-machine-count)
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
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

# inspect and edit
vi cappx-test.yaml
Expand Down Expand Up @@ -119,7 +119,7 @@ export PROXMOX_USER=user@pam
make test
```

### E2E Testing
#### E2E Testing
```
export CONTROLPLANE_HOST=X.X.X.X
export PROXMOX_URL=https://X.X.X.X:8006/api2/json
Expand Down
2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ patchesStrategicMerge:
# If you want your controller-manager to expose the /metrics
# endpoint w/o any authn/z, please comment the following line.
- manager_auth_proxy_patch.yaml
- manager_config_patch.yaml
# - manager_config_patch.yaml



Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_config_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ spec:
spec:
containers:
- name: manager
image: ghcr.io/sp-yduck/cluster-api-provider-proxmox:v0.3.0
image: ghcr.io/sp-yduck/cluster-api-provider-proxmox:latest
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: controller
newName: ghcr.io/sp-yduck/cluster-api-provider-proxmox
newTag: latest

0 comments on commit 1b8d01b

Please sign in to comment.