diff --git a/Makefile b/Makefile index a46f9c9..fe5eb7f 100644 --- a/Makefile +++ b/Makefile @@ -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 \ @@ -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. @@ -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 diff --git a/README.md b/README.md index a7c96aa..91f91b5 100644 --- a/README.md +++ b/README.md @@ -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:\](https://github.com/sp-yduck/cluster-api-provider-proxmox/pkgs/container/cluster-api-provider-proxmox) @@ -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 @@ -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 diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 7a7853e..8ed444c 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -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 diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml index be26045..00fa62f 100644 --- a/config/default/manager_config_patch.yaml +++ b/config/default/manager_config_patch.yaml @@ -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 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index ad13e96..483e1a7 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -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