Skip to content

Commit

Permalink
Progress
Browse files Browse the repository at this point in the history
  • Loading branch information
majst01 committed Jun 12, 2024
1 parent 003f018 commit b6eb471
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ MINI_LAB_FLAVOR := $(or $(MINI_LAB_FLAVOR),sonic)
MINI_LAB_VM_IMAGE := $(or $(MINI_LAB_VM_IMAGE),ghcr.io/metal-stack/mini-lab-vms:latest)
MINI_LAB_SONIC_IMAGE := $(or $(MINI_LAB_SONIC_IMAGE),ghcr.io/metal-stack/mini-lab-sonic:latest)

MACHINE_OS=ubuntu-22.04
MACHINE_OS=ubuntu-24.04

# Machine flavors
ifeq ($(MINI_LAB_FLAVOR),cumulus)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ The mini-lab is a small, virtual setup to locally run the metal-stack. It deploy
- Linux machine with hardware virtualization support
- kvm as hypervisor for the VMs (you can check through the `kvm-ok` command)
- [docker](https://www.docker.com/) >= 20.10.13 (for using kind and our deployment base image)
- [kind](https://github.com/kubernetes-sigs/kind/releases) == v0.20.0 (for hosting the metal control plane)
- [containerlab](https://containerlab.srlinux.dev/install/) >= v0.47.1
- [kind](https://github.com/kubernetes-sigs/kind/releases) == v0.22.0 (for hosting the metal control plane)
- [containerlab](https://containerlab.dev/install/) >= v0.47.1
- the lab creates a docker network on your host machine (`172.17.0.1`), 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)

Expand Down
4 changes: 2 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ services:
# for developing role dependencies
# TODO: make this a switch
# - ${HOME}/.ansible/roles/ansible-common:/root/.ansible/roles/ansible-common:ro
# - ${HOME}/.ansible/roles/metal-roles:/root/.ansible/roles/metal-roles:ro
- ${HOME}/dev/github.com/metal-stack/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
- ${HOME}/dev/github.com/metal-stack/helm-charts:/helm-charts:ro
environment:
- ANSIBLE_CONFIG=/mini-lab/ansible.cfg
- KUBECONFIG=/mini-lab/.kubeconfig
Expand Down
4 changes: 2 additions & 2 deletions inventories/group_vars/all/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metal_stack_release_version: develop
##

# metal_hammer_image_url: https://images.metal-stack.io/metal-hammer/pull-requests/<pr-number-and-title>/metal-hammer-initrd.img.lz4
# metal_api_image_name:
# metal_api_image_tag:
metal_api_image_name: ghcr.io/metal-stack/metal-api
metal_api_image_tag: ipam-as-service
# metal_metalctl_image_name:
# metal_metalctl_image_tag:
# metal_masterdata_api_image_name:
Expand Down
10 changes: 5 additions & 5 deletions inventories/group_vars/control-plane/metal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
metal_set_resource_limits: no
metal_check_api_health_endpoint: http://api.172.17.0.1.nip.io:8080/metal/v1/health

# metal_helm_chart_local_path: /helm-charts/charts/metal-control-plane
metal_helm_chart_local_path: /helm-charts/charts/metal-control-plane

metal_api_replicas: 1
metal_api_view_key: metal-view
Expand All @@ -20,10 +20,10 @@ metal_api_images:
url: https://images.metal-stack.io/metal-os/{{ metal_api_latest_os_image_release_name }}/firewall/3.0-ubuntu/img.tar.lz4
features:
- firewall
- id: ubuntu-22.04
name: Ubuntu 22.04
description: Ubuntu 22.04 Latest Release
url: https://images.metal-stack.io/metal-os/{{ metal_api_latest_os_image_release_name }}/ubuntu/22.04/img.tar.lz4
- id: ubuntu-24.04
name: Ubuntu 24.04
description: Ubuntu 24.04 Latest Release
url: https://images.metal-stack.io/metal-os/{{ metal_api_latest_os_image_release_name }}/ubuntu/24.04/img.tar.lz4
features:
- machine

Expand Down

0 comments on commit b6eb471

Please sign in to comment.