diff --git a/CHANGELOG.md b/CHANGELOG.md
index 942b952..a6c9d78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,75 @@
+## [CAPI Control Plane Provider Talos 0.4.0-alpha.0](https://github.com/talos-systems/cluster-api-control-plane-provider-talos/releases/tag/v0.4.0-alpha.0) (2021-11-10)
+
+Welcome to the v0.4.0-alpha.0 release of CAPI Control Plane Provider Talos!
+*This is a pre-release of CAPI Control Plane Provider Talos*
+
+
+
+Please try out the release binaries and report any issues at
+https://github.com/talos-systems/cluster-api-control-plane-provider-talos/issues.
+
+### CAPI v1beta1
+
+This release of CACPPT brings compatibility with CAPI v1beta1.
+
+
+### Contributors
+
+* Artem Chernyshev
+* Andrey Smirnov
+* Spencer Smith
+
+### Changes
+3 commits
+
+
+* [`bbe8822`](https://github.com/talos-systems/cluster-api-control-plane-provider-talos/commit/bbe88224359300a829aae84cd842d0be5ab7d372) release(v0.4.0-alpha.0): prepare release
+* [`b8db449`](https://github.com/talos-systems/cluster-api-control-plane-provider-talos/commit/b8db4492d55f910e8a7d2a3b69ab08740963683e) fix: properly pick talos client configuration
+* [`61fb582`](https://github.com/talos-systems/cluster-api-control-plane-provider-talos/commit/61fb5826391e4434b64619f0590683f7fa7b82b6) feat: support clusterapi v1beta1
+
+
+
+### Changes from talos-systems/capi-utils
+5 commits
+
+
+* [`144451c`](https://github.com/talos-systems/capi-utils/commit/144451cdef39bf6aed0cf1395ff69f9ce0496243) feat: switch to CAPI v1beta1
+* [`151aac2`](https://github.com/talos-systems/capi-utils/commit/151aac243655ecf5ac82fde99db1d11795f4c14c) fix: properly define calico version
+* [`658f48a`](https://github.com/talos-systems/capi-utils/commit/658f48a2034f991278ba7eeebccb3519dc1ee30a) feat: support getting cluster template files by http urls
+* [`e0cadf5`](https://github.com/talos-systems/capi-utils/commit/e0cadf51e3dec7f7af7acfc533233365e01860a1) feat: add method to fetch a k8s client
+* [`b018ea2`](https://github.com/talos-systems/capi-utils/commit/b018ea29c13a09ae2fdb2a071c5b7c8bd626bb50) feat: add ability to pass custom `Proxy` implementation in clusterapi
+
+
+
+### Changes from talos-systems/cluster-api-bootstrap-provider-talos
+6 commits
+
+
+* [`2a4115f`](https://github.com/talos-systems/cluster-api-bootstrap-provider-talos/commit/2a4115f1211a20e5058a7b0430c4dc4081acfcfe) release(v0.5.0-alpha.0): prepare release
+* [`d124c07`](https://github.com/talos-systems/cluster-api-bootstrap-provider-talos/commit/d124c072c9db8d402b353a73646d2d197bae76a4) docs: update README with usage and compatibility matrix
+* [`20792f3`](https://github.com/talos-systems/cluster-api-bootstrap-provider-talos/commit/20792f345b7ff3c8ffa9d65c9ca8dcab1932f49e) feat: generate talosconfig as a secret with proper endpoints
+* [`abd206f`](https://github.com/talos-systems/cluster-api-bootstrap-provider-talos/commit/abd206fd8a98f5478f8ffd0f8686e32be3b7defe) feat: update to CAPI v1.0.x contract (v1beta1)
+* [`b7faf9e`](https://github.com/talos-systems/cluster-api-bootstrap-provider-talos/commit/b7faf9e730b7c9f50ffa94be194ddcf908708a2c) feat: update Talos machinery to 0.13.0
+* [`04742b9`](https://github.com/talos-systems/cluster-api-bootstrap-provider-talos/commit/04742b96bf757413c88d0f15bee91679644f0337) feat: import fixes/updates from kubeadm bootstrap provider
+
+
+
+### Dependency Changes
+
+* **github.com/onsi/gomega** v1.15.0 -> v1.16.0
+* **github.com/talos-systems/capi-utils** b2f8f83d3df6 -> 144451cdef39
+* **github.com/talos-systems/cluster-api-bootstrap-provider-talos** v0.4.0-alpha.0 -> v0.5.0-alpha.0
+* **google.golang.org/grpc** v1.40.0 -> v1.41.0
+* **k8s.io/api** v0.22.1 -> v0.22.2
+* **k8s.io/apimachinery** v0.22.1 -> v0.22.2
+* **k8s.io/apiserver** v0.22.1 -> v0.22.2
+* **k8s.io/client-go** v0.22.1 -> v0.22.2
+* **k8s.io/utils** bdf08cb9a70a -> cb0fa318a74b
+* **sigs.k8s.io/cluster-api** v0.4.3 -> v1.0.0
+* **sigs.k8s.io/controller-runtime** v0.9.7 -> v0.10.2
+
+Previous release can be found at [v0.3.0](https://github.com/talos-systems/cluster-api-control-plane-provider-talos/releases/tag/v0.3.0)
+
## [CAPI Control Plane Provider Talos 0.3.0-alpha.0](https://github.com/talos-systems/cluster-api-control-plane-provider-talos/releases/tag/v0.3.0-alpha.0) (2021-10-01)
Welcome to the v0.3.0-alpha.0 release of CAPI Control Plane Provider Talos!
diff --git a/hack/test/e2e-aws.sh b/hack/test/e2e-aws.sh
index 6fd85cd..40ead5b 100644
--- a/hack/test/e2e-aws.sh
+++ b/hack/test/e2e-aws.sh
@@ -34,17 +34,18 @@ TALOSCTL_PATH="${TMP}/talosctl"
TALOSCTL="${TALOSCTL_PATH} --talosconfig=${TMP}/talosconfig"
KUSTOMIZE="${TMP}/kustomize"
TEARDOWN_CLUSTER=${TEARDOWN_CLUSTER:-true}
+KUBECTL="${TMP}/kubectl"
+
+curl -Lo ${KUBECTL} "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/${PLATFORM}/amd64/kubectl"
+chmod +x ${KUBECTL}
cleanup() {
if [ "$1" != "0" ]; then
# gather container logs
if [[ ! -z ${KUBECONFIG} ]]; then
- curl -Lo kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/${PLATFORM}/amd64/kubectl"
- chmod +x kubectl
-
- ./kubectl delete cluster --all || true
- ./kubectl logs -n capa-system deployment/capa-controller-manager manager || true
- ./kubectl logs -n cacppt-system deployment/cacppt-controller-manager || true
+ ${KUBECTL} delete cluster --all || true
+ ${KUBECTL} logs -n capa-system deployment/capa-controller-manager manager || true
+ ${KUBECTL} logs -n cacppt-system deployment/cacppt-controller-manager || true
fi
fi
@@ -101,16 +102,21 @@ function cluster {
chmod +x ${TALOSCTL_PATH}
- CREATED_CLUSTER="cacppt-test"
+ CREATED_CLUSTER="cacppt-test-$(echo $RANDOM | md5sum | head -c 10)"
if [[ ! -f "${TMP}/kubeconfig" ]]; then
+ echo "creating cluster ${CREATED_CLUSTER}"
TAG="${TALOS_VERSION}" ${TALOSCTL} cluster create \
--name=${CREATED_CLUSTER} \
--kubernetes-version=${K8S_VERSION} \
${REGISTRY_MIRROR_FLAGS} \
- --crashdump
+ --crashdump \
+ --cidr 172.27.0.0/24 \
+ --workers=0
+
+ ${KUBECTL} taint node ${CREATED_CLUSTER}-master-1 node-role.kubernetes.io/master=:NoSchedule-
- ${TALOSCTL} config nodes 10.5.0.2
+ ${TALOSCTL} config nodes 172.27.0.2
${TALOSCTL} kubeconfig -f ${TMP}/kubeconfig
fi