Merge pull request #26 from invidian/release-v0.6.0

Release v0.6.0

Author: invidian

CHANGELOG.md

@@ -5,60 +5,54 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.5.1] - 2021-05-31
-
+## [0.6.0] - 2021-09-02
 ### Changed
+- Updated `libflexkube` version to `v.7.0`.
+- Updated remaining dependencies to latest versions.
 
+## [0.5.1] - 2021-05-31
+### Changed
 - Updated `libflexkube` version to `v0.6.0`.
 - Updated remaining dependencies to latest versions.
 
 ## [0.5.0] - 2021-02-18
-
 ### Added
-
 - `flexkube_kubelet` has now `extra_args` argument for extra kubelet arguments.
 
 ### Changed
-
 - Updated to `libflexkube` version `v0.5.1`.
 - e2e tests are now using `containerd` as container runtime.
 
 ## [0.4.1] - 2020-09-20
-
 ### Added
-
 - `flexkube_containers` configuration can have now `env` field specified to set environment variables
-  for containers.
+for containers.
 - Added configuration for running E2E and local tests.
 
 ### Changed
-
 - `libflexkube` has been updated to [v0.4.3](https://github.com/flexkube/libflexkube/releases/tag/v0.4.3).
 - Migrated to [Terraform SDK v2](https://www.terraform.io/docs/extend/guides/v2-upgrade-guide.html).
 - `flexkube_pki` resource has been rewritten to follow the patterns from other resources. It should no longer report
-  inconsistent plan issues and should no longer show ambiguous changes.
+inconsistent plan issues and should no longer show ambiguous changes.
 - All resources will now produce less verbose diff when running `terraform plan` and will show that fields will have
-  new values computed instead. That should greatly reduce number of issues with inconsistent plan, at the cost of
-  changes visibility.
+new values computed instead. That should greatly reduce number of issues with inconsistent plan, at the cost of
+changes visibility.
 
 ### Fixed
-
 - `flexkube_helm_release` now validates fields `values` and `kubeconfig` to make sure they contain valid YAML
-  formatted content, so it does not corrupt the Terraform state, which requires manual interaction to recover from.
+formatted content, so it does not corrupt the Terraform state, which requires manual interaction to recover from.
 - Added missing documentation to `flexkube_containers` resource for `host` block.
 - Adding and removing controller nodes should now work without interruption. Previously, it has been broken because of a bug
-  in `libflexkube` and `flexkube_pki` and `flexkube_etcd_cluster` resources complaining about the inconsistent plan.
+in `libflexkube` and `flexkube_pki` and `flexkube_etcd_cluster` resources complaining about the inconsistent plan.
 
 ## [0.4.0] - 2020-08-31
-
 ### Added
-
 - Initial release based on [libflexkube v0.4.0](https://github.com/flexkube/libflexkube/releases/tag/v0.4.0).
 
 ### Changed
-
 - flexkube_containers: rename 'container' to 'host_configured_container'.
 
+[0.6.0]: https://github.com/flexkube/terraform-provider-flexkube/compare/v0.5.1...v0.6.0
 [0.5.1]: https://github.com/flexkube/terraform-provider-flexkube/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/flexkube/terraform-provider-flexkube/compare/v0.4.1...v0.5.0
 [0.4.1]: https://github.com/flexkube/terraform-provider-flexkube/compare/v0.4.0...v0.4.1

Vagrantfile

@@ -64,55 +64,14 @@ DNS=8.8.4.4
 UseDNS=false
 EOF
 
-  containerd_config = <<-EOF
-# persistent data location
-root = \\"/var/lib/containerd\\"
-# runtime state information
-state = \\"/run/docker/libcontainerd/containerd\\"
-# set containerd as a subreaper on linux when it is not running as PID 1
-subreaper = true
-# set containerd's OOM score
-oom_score = -999
-# CRI plugin listens on a TCP port by default
-disabled_plugins = []
-
-# grpc configuration
-[grpc]
-address = \\"/run/docker/libcontainerd/docker-containerd.sock\\"
-# socket uid
-uid = 0
-# socket gid
-gid = 0
-
-[plugins.linux]
-# shim binary name/path
-shim = \\"containerd-shim\\"
-# runtime binary name/path
-runtime = \\"runc\\"
-# do not use a shim when starting containers, saves on memory but
-# live restore is not supported
-no_shim = false
-# display shim logs in the containerd daemon's log output
-shim_debug = true
-  EOF
-
-  containerd_override = <<-EOF
-    [Service]
-    Environment=CONTAINERD_CONFIG=/etc/containerd/config.toml
-    ExecStart=
-    ExecStart=/usr/bin/env PATH=\\${TORCX_BINDIR}:\\${PATH} \\${TORCX_BINDIR}/containerd --config \\${CONTAINERD_CONFIG}
-  EOF
-
   common_provisioning_script = <<-EOF
     mkdir -p /etc/systemd/network && echo "#{network_config}" | sudo tee /etc/systemd/network/10-virtualbox.network >/dev/null
-    mkdir -p /etc/systemd/system/containerd.service.d && echo "#{containerd_override}" | sudo tee /etc/systemd/system/containerd.service.d/10-use-custom-config.conf >/dev/null
-    mkdir -p /etc/containerd && echo "#{containerd_config}" | sudo tee /etc/containerd/config.toml >/dev/null
     sudo systemctl daemon-reload
     sudo systemctl enable iptables-store iptables-restore docker containerd systemd-timesyncd
-    sudo systemctl mask update-engine locksmithd
     sudo systemctl stop update-engine locksmithd
+    sudo systemctl mask update-engine locksmithd
     sudo systemctl start docker systemd-timesyncd iptables-store
-    sudo systemctl restart systemd-networkd containerd
+    sudo systemctl restart systemd-networkd
   EOF
 
   # Controllers.