mirror of
https://github.com/Luzifer/hetzner-alpine-k8s.git
synced 2024-12-21 02:11:19 +00:00
Cleanup, rename kernel_features to match purpose
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
parent
0b482401e9
commit
e4cd2dd84f
4 changed files with 70 additions and 83 deletions
|
@ -1,27 +1,5 @@
|
||||||
# Please see default.json for default values for these
|
# Please see default.json for default values for these
|
||||||
variable "apk_tools_url" {}
|
|
||||||
variable "apk_tools_arch" {}
|
|
||||||
variable "apk_tools_version" {}
|
|
||||||
variable "apk_tools_checksum" {}
|
|
||||||
|
|
||||||
variable "alpine_mirror" {}
|
|
||||||
variable "alpine_repositories" {}
|
|
||||||
variable "alpine_repository_keys" {}
|
|
||||||
|
|
||||||
variable "boot_size" {}
|
|
||||||
variable "root_size" {}
|
|
||||||
variable "hostname" {}
|
variable "hostname" {}
|
||||||
variable "dhcp_interfaces" {}
|
|
||||||
|
|
||||||
variable "packages" {}
|
|
||||||
variable "services" {}
|
|
||||||
variable "nameservers" {}
|
|
||||||
variable "extlinux_modules" {}
|
|
||||||
variable "kernel_features" {}
|
|
||||||
variable "kernel_modules" {}
|
|
||||||
variable "default_kernel_opts" {}
|
|
||||||
variable "sysctl" {}
|
|
||||||
variable "chroot_commands" {}
|
|
||||||
|
|
||||||
locals {
|
locals {
|
||||||
timestamp = formatdate("YYYYMMDD-hhmmss", timestamp())
|
timestamp = formatdate("YYYYMMDD-hhmmss", timestamp())
|
||||||
|
|
|
@ -1,61 +1,70 @@
|
||||||
{
|
{
|
||||||
"apk_tools_version": "v2.12.9",
|
"apk_tools_version": "v2.12.9",
|
||||||
"apk_tools_arch": "x86_64",
|
"apk_tools_arch": "x86_64",
|
||||||
"apk_tools_url": "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//{{ apk_tools_version }}/{{ apk_tools_arch }}/apk.static",
|
"apk_tools_url": "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//{{ apk_tools_version }}/{{ apk_tools_arch }}/apk.static",
|
||||||
"apk_tools_checksum": "sha256:5176da3d4c41f12a08b82809aca8e7e2e383b7930979651b8958eca219815af5",
|
"apk_tools_checksum": "sha256:5176da3d4c41f12a08b82809aca8e7e2e383b7930979651b8958eca219815af5",
|
||||||
|
"alpine_repositories": [
|
||||||
"alpine_repositories": [
|
{
|
||||||
{"tag":"", "url": "http://dl-cdn.alpinelinux.org/alpine/edge/main"},
|
"tag": "",
|
||||||
{"tag":"", "url": "http://dl-cdn.alpinelinux.org/alpine/edge/community"},
|
"url": "http://dl-cdn.alpinelinux.org/alpine/edge/main"
|
||||||
],
|
|
||||||
"alpine_repository_keys": [],
|
|
||||||
|
|
||||||
"boot_size": "+100m",
|
|
||||||
"root_size": "0",
|
|
||||||
|
|
||||||
"hostname": "alpine",
|
|
||||||
|
|
||||||
"dhcp_interfaces": ["eth0"],
|
|
||||||
|
|
||||||
"packages": {
|
|
||||||
"openssh": "=8.8_p1-r1",
|
|
||||||
"syslinux": "=6.04_pre1-r9",
|
|
||||||
"linux-virt": "=5.15.16-r0",
|
|
||||||
"cloud-init": "@community=21.4-r0"
|
|
||||||
},
|
},
|
||||||
|
{
|
||||||
"services": {
|
"tag": "",
|
||||||
"devfs": "sysinit",
|
"url": "http://dl-cdn.alpinelinux.org/alpine/edge/community"
|
||||||
"dmesg": "sysinit",
|
}
|
||||||
"mdev": "sysinit",
|
],
|
||||||
"hwdrivers": "sysinit",
|
"alpine_repository_keys": [],
|
||||||
|
"boot_size": "+100m",
|
||||||
"hwclock": "boot",
|
"root_size": "0",
|
||||||
"modules": "boot",
|
"hostname": "alpine",
|
||||||
"sysctl": "boot",
|
"dhcp_interfaces": [
|
||||||
"hostname": "boot",
|
"eth0"
|
||||||
"bootmisc": "boot",
|
],
|
||||||
"syslog": "boot",
|
"packages": {
|
||||||
"networking": "boot",
|
"openssh": "=8.8_p1-r1",
|
||||||
|
"syslinux": "=6.04_pre1-r9",
|
||||||
"mount-ro": "shutdown",
|
"linux-virt": "=5.15.16-r0",
|
||||||
"killprocs": "shutdown",
|
"cloud-init": "@community=21.4-r0"
|
||||||
"savecache": "shutdown",
|
},
|
||||||
|
"services": {
|
||||||
"sshd": "default"
|
"devfs": "sysinit",
|
||||||
},
|
"dmesg": "sysinit",
|
||||||
|
"mdev": "sysinit",
|
||||||
"nameservers": [
|
"hwdrivers": "sysinit",
|
||||||
"185.12.64.1",
|
"hwclock": "boot",
|
||||||
"185.12.64.2",
|
"modules": "boot",
|
||||||
"2a01:4ff:ff00::add:1",
|
"sysctl": "boot",
|
||||||
"2a01:4ff:ff00::add:2"
|
"hostname": "boot",
|
||||||
],
|
"bootmisc": "boot",
|
||||||
|
"syslog": "boot",
|
||||||
"sysctl": {},
|
"networking": "boot",
|
||||||
"extlinux_modules": ["ext4"],
|
"mount-ro": "shutdown",
|
||||||
"kernel_features": ["base", "ext4", "keymap", "virtio"],
|
"killprocs": "shutdown",
|
||||||
"kernel_modules": ["ipv6", "af_packet"],
|
"savecache": "shutdown",
|
||||||
"default_kernel_opts": ["quiet"],
|
"sshd": "default"
|
||||||
"chroot_commands": []
|
},
|
||||||
|
"nameservers": [
|
||||||
|
"185.12.64.1",
|
||||||
|
"185.12.64.2",
|
||||||
|
"2a01:4ff:ff00::add:1",
|
||||||
|
"2a01:4ff:ff00::add:2"
|
||||||
|
],
|
||||||
|
"sysctl": {},
|
||||||
|
"extlinux_modules": [
|
||||||
|
"ext4"
|
||||||
|
],
|
||||||
|
"mkinitfs_features": [
|
||||||
|
"base",
|
||||||
|
"ext4",
|
||||||
|
"keymap",
|
||||||
|
"virtio"
|
||||||
|
],
|
||||||
|
"kernel_modules": [
|
||||||
|
"ipv6",
|
||||||
|
"af_packet"
|
||||||
|
],
|
||||||
|
"default_kernel_opts": [
|
||||||
|
"quiet"
|
||||||
|
],
|
||||||
|
"chroot_commands": []
|
||||||
}
|
}
|
|
@ -177,7 +177,7 @@
|
||||||
copy:
|
copy:
|
||||||
dest: "{{ chroot_directory }}/etc/mkinitfs/mkinitfs.conf"
|
dest: "{{ chroot_directory }}/etc/mkinitfs/mkinitfs.conf"
|
||||||
content: |
|
content: |
|
||||||
features="{{ kernel_features | join(" ") }}"
|
features="{{ mkinitfs_features | join(" ") }}"
|
||||||
|
|
||||||
- name: install boot
|
- name: install boot
|
||||||
shell: |
|
shell: |
|
||||||
|
|
|
@ -117,7 +117,7 @@ sysctl:
|
||||||
extlinux_modules:
|
extlinux_modules:
|
||||||
- ext4
|
- ext4
|
||||||
|
|
||||||
kernel_features:
|
mkinitfs_features:
|
||||||
- ata
|
- ata
|
||||||
- base
|
- base
|
||||||
- ext4
|
- ext4
|
||||||
|
|
Loading…
Reference in a new issue