Component updates, new deployment image. (#53)

* Component updates, new deployment image.

* Download images through HTTPS.

Author: Gerrit91

Makefile

@@ -30,9 +30,7 @@ control-plane: control-plane-bake env
 
 .PHONY: partition-bake
 partition-bake:
-ifeq (,$(wildcard ./.vagrant_version_host_system))
 	@vagrant version | grep "Installed Version" | cut -d: -f 2 | tr -d '[:space:]' > .vagrant_version_host_system
-endif
 	vagrant up
 
 .PHONY: partition

README.md

@@ -21,15 +21,15 @@ This project can also be used as a template for writing your own metal-stack dep
 ## Requirements
 
 - Linux machine with hardware virtualization support
-- [Vagrant](https://www.vagrantup.com/) == 2.2.9 with vagrant-libvirt plugin >= 0.1.2 (for running the switch and machine VMs)
+- [Vagrant](https://www.vagrantup.com/) == 2.2.14 with vagrant-libvirt plugin >= 0.3.0 (for running the switch and machine VMs)
 - kvm as hypervisor for the VMs
   - Ubuntu 20.04:
 
         sudo apt install -y qemu qemu-kvm libvirt-daemon bridge-utils virtinst libvirt-dev
 
 - [docker](https://www.docker.com/) >= 18.09 (for using kind and our deployment base image)
 - [docker-compose](https://docs.docker.com/compose/) >= 1.25.4 (for ease of use and for parallelizing control plane and partition deployment)
-- [kind](https://github.com/kubernetes-sigs/kind/releases) == v0.8.1 (for hosting the metal control plane on a kubernetes cluster v1.18.2)
+- [kind](https://github.com/kubernetes-sigs/kind/releases) == v0.9.0 (for hosting the metal control plane on a kubernetes cluster v1.19.1)
 - [ovmf](https://wiki.ubuntu.com/UEFI/OVMF) to have a uefi firmware for virtual machines
 - the lab creates a virtual network 192.168.121.0/24 on your host machine, this hopefully does not overlap with other networks you have
 - (recommended) haveged to have enough random entropy (only needed if the PXE process does not work)

docker-compose.yml

@@ -14,6 +14,7 @@ services:
       # - ${HOME}/.ansible/roles/ansible-common:/root/.ansible/roles/ansible-common:ro
       # - ${HOME}/.ansible/roles/metal-roles:/root/.ansible/roles/metal-roles:ro
       # - ${HOME}/.ansible/roles/metal-ansible-modules:/root/.ansible/roles/metal-ansible-modules:ro
+      # - ${HOME}/git/github.com/metal-stack/helm-charts:/helm-charts:ro
     environment:
       - ANSIBLE_CONFIG=/mini-lab/ansible.cfg
       - KUBECONFIG=/mini-lab/.kubeconfig

env.sh

@@ -9,7 +9,7 @@ yq_shell() {
 METAL_STACK_RELEASE_VERSION=$(yq_shell "yq r inventories/group_vars/all/images.yaml 'metal_stack_release_version'")
 RELEASE_YAML=$(curl -s https://raw.githubusercontent.com/metal-stack/releases/${METAL_STACK_RELEASE_VERSION}/release.yaml)
 METALCTL_IMAGE_TAG=$(yq_shell "echo \"${RELEASE_YAML}\" | yq r - docker-images.metal-stack.control-plane.metalctl.tag")
-DEPLOYMENT_BASE_IMAGE_TAG=$(yq_shell "echo \"${RELEASE_YAML}\" | yq r - docker-images.metal-stack.generic.deployment-base.tag")
+DEPLOYMENT_BASE_IMAGE_TAG=$(yq_shell "echo \"${RELEASE_YAML}\" | yq r - docker-images.metal-stack.generic.deployment-base.tag")-vagrant
 
 cat << EOF > .env
 METALCTL_IMAGE_TAG=${METALCTL_IMAGE_TAG}

inventories/group_vars/all/images.yaml

@@ -1 +1,3 @@
-metal_stack_release_version: v0.4.1
+---
+# FIXME: has to be pinned to next metal-stack version before next release
+metal_stack_release_version: develop

inventories/group_vars/control-plane/metal.yml

@@ -2,6 +2,8 @@
 metal_set_resource_limits: no
 metal_check_api_health_endpoint: http://api.0.0.0.0.xip.io:8080/metal/v1/health
 
+# metal_helm_chart_local_path: /helm-charts/charts/metal-control-plane
+
 metal_api_replicas: 1
 metal_api_view_key: metal-view
 metal_api_edit_key: metal-edit
@@ -13,13 +15,13 @@ metal_api_images:
 - id: firewall-ubuntu-2.0.20201126
   name: Firewall 2 Ubuntu 20201126
   description: Firewall 2 Ubuntu 20201126
-  url: http://images.metal-stack.io/metal-os/master/firewall/2.0-ubuntu/20201126/img.tar.lz4
+  url: https://images.metal-stack.io/metal-os/master/firewall/2.0-ubuntu/20201126/img.tar.lz4
   features:
     - firewall
 - id: ubuntu-20.04.20201126
   name: Ubuntu 20.04 20201126
   description: Ubuntu 20.04 20201126
-  url: http://images.metal-stack.io/metal-os/master/ubuntu/20.04/20201126/img.tar.lz4
+  url: https://images.metal-stack.io/metal-os/master/ubuntu/20.04/20201126/img.tar.lz4
   features:
     - machine