Hello community,
here is the log from the commit of package openSUSE-Tumbleweed-Kubic for
openSUSE:Factory checked in at 2019-02-17 12:20:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-Tumbleweed-Kubic (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-Tumbleweed-Kubic.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-Tumbleweed-Kubic"
Sun Feb 17 12:20:58 2019 rev:2 rq:676363 version:15.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-Tumbleweed-Kubic/openSUSE-Tumbleweed-Kubic.changes
2019-02-11 21:23:05.651154456 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-Tumbleweed-Kubic.new.28833/openSUSE-Tumbleweed-Kubic.changes
2019-02-17 12:21:00.244206121 +0100
@@ -1,0 +2,37 @@
+Wed Feb 13 13:52:22 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Drop the data partition, disable quotas entirely instead
+ (we'd need a seperate /var partition, but kiwi can't do it)
+- Change profile configuration: MicroOS+podman and MicroOS+cri-o+kubeadm
+- Use glibc-locale-base instead of glibc-locale
+- Fix etc overlay with new transactional-update and read-only-root-fs
+- Add cloud-init and cloud-init-config-casp directly
+
+-------------------------------------------------------------------
+Fri Feb 1 11:25:06 UTC 2019 - Fabian Vogt <[email protected]>
+
+- VMware image was apparently not read-only, fixed
+
+-------------------------------------------------------------------
+Fri Feb 1 09:59:11 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Add apparmor pattern to cri-o profile directly
+
+-------------------------------------------------------------------
+Tue Jan 31 19:13:00 UTC 2019 - Denis Kondratenko <[email protected]>
+
+- correct owner for vagrant home directory
+
+-------------------------------------------------------------------
+Tue Jan 31 16:35:00 UTC 2019 - Denis Kondratenko <[email protected]>
+
+- unpredictable kernel-native ethX naming for Vagrant box to come up for
+ ssh config
+
+-------------------------------------------------------------------
+Mon Jan 28 14:10:36 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Remove docker profiles
+- Only install cri-o-kubeadm-criconfig on kubeadm
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-Tumbleweed-Kubic.kiwi ++++++
--- /var/tmp/diff_new_pack.0qns8y/_old 2019-02-17 12:21:00.904205939 +0100
+++ /var/tmp/diff_new_pack.0qns8y/_new 2019-02-17 12:21:00.904205939 +0100
@@ -9,11 +9,13 @@
<profiles>
<!-- Profiles used as dependencies of actual image profiles -->
<!-- Flavors -->
- <profile name="MicroOS" description="MicroOS"/>
- <profile name="kubeadm" description="kubeadm"/>
- <!-- Runtimes -->
- <profile name="cri-o" description="CRI-O"/>
- <profile name="docker" description="Docker Engine"/>
+ <profile name="MicroOS" description="MicroOS (aka Transactional
Server)"/>
+ <profile name="MicroOS-podman" description="MicroOS with Podman">
+ <requires profile="MicroOS"/>
+ </profile>
+ <profile name="MicroOS-kubeadm" description="MicroOS with CRI-O and
kubeadm">
+ <requires profile="MicroOS"/>
+ </profile>
<!-- Platforms -->
<profile name="kvm-and-xen-x86_64" description="kvm-and-xen for
x86_64" arch="x86_64"/>
<profile name="XEN-x86_64" description="XEN for x86_64" arch="x86_64"/>
@@ -25,185 +27,77 @@
<profile name="Vagrant-x86_64" description="Vagrant for x86_64"
arch="x86_64"/>
<profile name="hardware-x86_64" description="physical x86_64 hardware"
arch="x86_64"/>
<!-- Images (flavor + platform) -->
- <profile name="MicroOS-cri-o-kvm-and-xen" description="MicroOS with
CRI-O for KVM and HVM Xen" arch="x86_64">
+ <profile name="MicroOS-podman-kvm-and-xen" description="MicroOS with
Podman for KVM and HVM Xen" arch="x86_64">
<requires profile="kvm-and-xen-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-podman"/>
</profile>
- <profile name="MicroOS-cri-o-XEN" description="MicroOS with CRI-O for
PV Xen" arch="x86_64">
+ <profile name="MicroOS-podman-XEN" description="MicroOS with Podman
for PV Xen" arch="x86_64">
<requires profile="XEN-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-podman"/>
</profile>
- <profile name="MicroOS-cri-o-VMware" description="MicroOS with CRI-O
for VMware" arch="x86_64">
+ <profile name="MicroOS-podman-VMware" description="MicroOS with Podman
for VMware" arch="x86_64">
<requires profile="VMware-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-podman"/>
</profile>
- <profile name="MicroOS-cri-o-MS-HyperV" description="MicroOS with
CRI-O for Hyper-V" arch="x86_64">
+ <profile name="MicroOS-podman-MS-HyperV" description="MicroOS with
Podman for Hyper-V" arch="x86_64">
<requires profile="MS-HyperV-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-podman"/>
</profile>
- <profile name="MicroOS-cri-o-OpenStack-Cloud" description="MicroOS
with CRI-O for OpenStack Cloud" arch="x86_64">
+ <profile name="MicroOS-podman-OpenStack-Cloud" description="MicroOS
with Podman for OpenStack Cloud" arch="x86_64">
<requires profile="OpenStack-Cloud-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-podman"/>
</profile>
- <profile name="MicroOS-cri-o-Pine64" description="MicroOS with CRI-O
for the Pine64" arch="aarch64">
+ <profile name="MicroOS-podman-Pine64" description="MicroOS with Podman
for the Pine64" arch="aarch64">
<requires profile="Pine64"/>
- <requires profile="MicroOS"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-podman"/>
</profile>
- <profile name="MicroOS-cri-o-RaspberryPi" description="MicroOS with
CRI-O for the Raspberry Pi" arch="aarch64">
+ <profile name="MicroOS-podman-RaspberryPi" description="MicroOS with
Podman for the Raspberry Pi" arch="aarch64">
<requires profile="RaspberryPi"/>
- <requires profile="MicroOS"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-podman"/>
</profile>
- <profile name="MicroOS-cri-o-Vagrant-x86_64" description="MicroOS with
CRI-O for Vagrant" arch="x86_64">
+ <profile name="MicroOS-podman-Vagrant-x86_64" description="MicroOS
with Podman for Vagrant" arch="x86_64">
<requires profile="Vagrant-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-podman"/>
</profile>
- <profile name="MicroOS-cri-o-hardware-x86_64" description="MicroOS
with CRI-O for physical x86_64 hardware" arch="x86_64">
+ <profile name="MicroOS-podman-hardware-x86_64" description="MicroOS
with Podman for physical x86_64 hardware" arch="x86_64">
<requires profile="hardware-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-podman"/>
</profile>
<profile name="kubeadm-cri-o-kvm-and-xen" description="kubeadm with
CRI-O for KVM and HVM Xen" arch="x86_64">
<requires profile="kvm-and-xen-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-kubeadm"/>
</profile>
<profile name="kubeadm-cri-o-XEN" description="kubeadm with CRI-O for
PV Xen" arch="x86_64">
<requires profile="XEN-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-kubeadm"/>
</profile>
<profile name="kubeadm-cri-o-VMware" description="kubeadm with CRI-O
for VMware" arch="x86_64">
<requires profile="VMware-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-kubeadm"/>
</profile>
<profile name="kubeadm-cri-o-MS-HyperV" description="kubeadm with
CRI-O for Hyper-V" arch="x86_64">
<requires profile="MS-HyperV-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-kubeadm"/>
</profile>
<profile name="kubeadm-cri-o-OpenStack-Cloud" description="kubeadm
with CRI-O for OpenStack Cloud" arch="x86_64">
<requires profile="OpenStack-Cloud-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-kubeadm"/>
</profile>
<profile name="kubeadm-cri-o-Pine64" description="kubeadm with CRI-O
for the Pine64" arch="aarch64">
<requires profile="Pine64"/>
- <requires profile="kubeadm"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-kubeadm"/>
</profile>
<profile name="kubeadm-cri-o-RaspberryPi" description="kubeadm with
CRI-O for the Raspberry Pi" arch="aarch64">
<requires profile="RaspberryPi"/>
- <requires profile="kubeadm"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-kubeadm"/>
</profile>
<profile name="kubeadm-cri-o-Vagrant-x86_64" description="kubeadm with
CRI-O for Vagrant" arch="x86_64">
<requires profile="Vagrant-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="cri-o"/>
+ <requires profile="MicroOS-kubeadm"/>
</profile>
<profile name="kubeadm-cri-o-hardware-x86_64" description="kubeadm
with CRI-O for physical x86_64 hardware" arch="x86_64">
<requires profile="hardware-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="cri-o"/>
- </profile>
- <profile name="MicroOS-docker-kvm-and-xen" description="MicroOS with
Docker Engine for KVM and HVM Xen" arch="x86_64">
- <requires profile="kvm-and-xen-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="docker"/>
- </profile>
- <profile name="MicroOS-docker-XEN" description="MicroOS with Docker
Engine for PV Xen" arch="x86_64">
- <requires profile="XEN-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="docker"/>
- </profile>
- <profile name="MicroOS-docker-VMware" description="MicroOS with Docker
Engine for VMware" arch="x86_64">
- <requires profile="VMware-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="docker"/>
- </profile>
- <profile name="MicroOS-docker-MS-HyperV" description="MicroOS with
Docker Engine for Hyper-V" arch="x86_64">
- <requires profile="MS-HyperV-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="docker"/>
- </profile>
- <profile name="MicroOS-docker-OpenStack-Cloud" description="MicroOS
with Docker Engine for OpenStack Cloud" arch="x86_64">
- <requires profile="OpenStack-Cloud-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="docker"/>
- </profile>
- <profile name="MicroOS-docker-Pine64" description="MicroOS with Docker
Engine for the Pine64" arch="aarch64">
- <requires profile="Pine64"/>
- <requires profile="MicroOS"/>
- <requires profile="docker"/>
- </profile>
- <profile name="MicroOS-docker-RaspberryPi" description="MicroOS with
Docker Engine for the Raspberry Pi" arch="aarch64">
- <requires profile="RaspberryPi"/>
- <requires profile="MicroOS"/>
- <requires profile="docker"/>
- </profile>
- <profile name="MicroOS-docker-Vagrant-x86_64" description="MicroOS
with Docker Engine for Vagrant" arch="x86_64">
- <requires profile="Vagrant-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="docker"/>
- </profile>
- <profile name="MicroOS-docker-hardware-x86_64" description="MicroOS
with Docker Engine for physical x86_64 hardware" arch="x86_64">
- <requires profile="hardware-x86_64"/>
- <requires profile="MicroOS"/>
- <requires profile="docker"/>
- </profile>
- <profile name="kubeadm-docker-kvm-and-xen" description="kubeadm with
Docker Engine for KVM and HVM Xen" arch="x86_64">
- <requires profile="kvm-and-xen-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="docker"/>
- </profile>
- <profile name="kubeadm-docker-XEN" description="kubeadm with Docker
Engine for PV Xen" arch="x86_64">
- <requires profile="XEN-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="docker"/>
- </profile>
- <profile name="kubeadm-docker-VMware" description="kubeadm with Docker
Engine for VMware" arch="x86_64">
- <requires profile="VMware-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="docker"/>
- </profile>
- <profile name="kubeadm-docker-MS-HyperV" description="kubeadm with
Docker Engine for Hyper-V" arch="x86_64">
- <requires profile="MS-HyperV-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="docker"/>
- </profile>
- <profile name="kubeadm-docker-OpenStack-Cloud" description="kubeadm
with Docker Engine for OpenStack Cloud" arch="x86_64">
- <requires profile="OpenStack-Cloud-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="docker"/>
- </profile>
- <profile name="kubeadm-docker-Pine64" description="kubeadm with Docker
Engine for the Pine64" arch="aarch64">
- <requires profile="Pine64"/>
- <requires profile="kubeadm"/>
- <requires profile="docker"/>
- </profile>
- <profile name="kubeadm-docker-RaspberryPi" description="kubeadm with
Docker Engine for the Raspberry Pi" arch="aarch64">
- <requires profile="RaspberryPi"/>
- <requires profile="kubeadm"/>
- <requires profile="docker"/>
- </profile>
- <profile name="kubeadm-docker-Vagrant-x86_64" description="kubeadm
with Docker Engine for Vagrant" arch="x86_64">
- <requires profile="Vagrant-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="docker"/>
- </profile>
- <profile name="kubeadm-docker-hardware-x86_64" description="kubeadm
with Docker Engine for physical x86_64 hardware" arch="x86_64">
- <requires profile="hardware-x86_64"/>
- <requires profile="kubeadm"/>
- <requires profile="docker"/>
+ <requires profile="MicroOS-kubeadm"/>
</profile>
</profiles>
<preferences profiles="kvm-and-xen-x86_64">
@@ -225,7 +119,7 @@
devicepersistency="by-label"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="true"
+ btrfs_quota_groups="false"
>
<systemdisk>
<volume name="home"/>
@@ -260,7 +154,7 @@
devicepersistency="by-label"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="true"
+ btrfs_quota_groups="false"
>
<systemdisk>
<volume name="home"/>
@@ -299,7 +193,8 @@
bootkernel="custom"
devicepersistency="by-label"
btrfs_root_is_snapshot="true"
- btrfs_quota_groups="true"
+ btrfs_root_is_readonly_snapshot="true"
+ btrfs_quota_groups="false"
>
<systemdisk>
<volume name="home"/>
@@ -335,7 +230,7 @@
devicepersistency="by-label"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="true"
+ btrfs_quota_groups="false"
>
<systemdisk>
<volume name="home"/>
@@ -371,7 +266,7 @@
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="true"
+ btrfs_quota_groups="false"
>
<systemdisk>
<volume name="home"/>
@@ -408,7 +303,7 @@
efipartsize="16"
editbootinstall="editbootinstall_pine64.sh"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="true"
+ btrfs_quota_groups="false"
>
<systemdisk>
<volume name="home"/>
@@ -448,7 +343,7 @@
efipartsize="16"
editbootinstall="editbootinstall_rpi.sh"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="true"
+ btrfs_quota_groups="false"
>
<systemdisk>
<volume name="home"/>
@@ -480,13 +375,13 @@
bootloader="grub2"
bootloader_console="gfxterm"
firmware="uefi"
- kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
swapaccount=1"
+ kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
swapaccount=1 net.ifnames=0"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-label"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="true"
+ btrfs_quota_groups="false"
>
<systemdisk>
<volume name="home"/>
@@ -522,7 +417,7 @@
devicepersistency="by-label"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="true"
+ btrfs_quota_groups="false"
>
<systemdisk>
<volume name="home"/>
@@ -555,36 +450,55 @@
<packages type="image" profiles="MicroOS">
<namedCollection name="SUSE-MicroOS"/>
<package name="patterns-caasp-MicroOS"/>
- <package name="data-partition-service"/>
- </packages>
- <packages type="image" profiles="kubeadm">
- <namedCollection name="kubeadm"/>
- <package name="patterns-caasp-kubeadm"/>
+
<namedCollection name="SUSE-MicroOS-apparmor"/>
<package name="patterns-caasp-apparmor"/>
- <!-- The profile dep is not handled correctly by OBS, so
- it fails to resolve deps without this -->
+
+ <!-- Needed for initial configuration -->
+ <package name="cloud-init"/>
+ <package name="cloud-init-config-caasp"/>
+ </packages>
+ <packages type="image" profiles="MicroOS-podman">
+ <!-- Need to duplicate the MicroOS profile here due to
+ https://github.com/openSUSE/obs-build/issues/442 -->
<namedCollection name="SUSE-MicroOS"/>
<package name="patterns-caasp-MicroOS"/>
- <package name="data-partition-service"/>
- </packages>
- <packages type="image" profiles="cri-o">
+
+ <namedCollection name="SUSE-MicroOS-apparmor"/>
+ <package name="patterns-caasp-apparmor"/>
+
+ <!-- Needed for initial configuration -->
+ <package name="cloud-init"/>
+ <package name="cloud-init-config-caasp"/>
+
+ <package name="podman"/>
+ <package name="podman-cni-config"/>
+ </packages>
+ <packages type="image" profiles="MicroOS-kubeadm">
+ <!-- Need to duplicate the MicroOS profile here due to
+ https://github.com/openSUSE/obs-build/issues/442 -->
+ <namedCollection name="SUSE-MicroOS"/>
+ <package name="patterns-caasp-MicroOS"/>
+
+ <namedCollection name="SUSE-MicroOS-apparmor"/>
+ <package name="patterns-caasp-apparmor"/>
+
+ <!-- Needed for initial configuration -->
+ <package name="cloud-init"/>
+ <package name="cloud-init-config-caasp"/>
+
<namedCollection name="SUSE-MicroOS-container-runtime"/>
<package name="patterns-caasp-container-runtime"/>
+ <namedCollection name="kubeadm"/>
+ <package name="patterns-caasp-kubeadm"/>
<package name="cri-o-kubeadm-criconfig"/>
</packages>
- <packages type="image" profiles="docker">
- <namedCollection name="SUSE-MicroOS-alt-container-runtime"/>
- <package name="patterns-caasp-alt-container-runtime"/>
- <package name="docker-kubic-kubeadm-criconfig"/>
- </packages>
<packages type="image" profiles="kvm-and-xen-x86_64,XEN-x86_64">
<!-- XEN specific packages -->
<package name="xen-tools-domU" arch="x86_64"/>
<package name="grub2-x86_64-xen" arch="x86_64"/>
<package name="xen-libs" arch="x86_64"/>
<package name="kernel-default"/>
- <package name="kernel-default"/>
<package name="qemu-guest-agent"/>
</packages>
<packages type="image" profiles="VMware-x86_64">
@@ -593,12 +507,11 @@
</packages>
<packages type="image" profiles="MS-HyperV-x86_64">
<package name="hyper-v" arch="x86_64"/>
- <package name="kernel-default-base"/>
- <!--<package name="python-azure-agent"/> disabled until bsc#1061584 is
fixed -->
+ <package name="kernel-default"/>
</packages>
<packages type="image" profiles="OpenStack-Cloud-x86_64">
- <package name="cloud-init" />
- <package name="xfsprogs" />
+ <package name="cloud-init"/>
+ <package name="xfsprogs"/>
<package name="kernel-default"/>
</packages>
<packages type="image" profiles="Pine64">
@@ -614,8 +527,9 @@
<package name="u-boot-rpi3" arch="aarch64"/>
<package name="dracut-kiwi-oem-repart"/>
<package name="kernel-default"/>
- <package name="ntp"/>
<package name="bcm43xx-firmware"/>
+ <package name="wireless-tools"/>
+ <package name="wpa_supplicant"/>
</packages>
<packages type="image" profiles="Vagrant-x86_64">
<package name="kernel-default"/>
@@ -629,7 +543,7 @@
<packages type="bootstrap">
<package name="udev"/>
<package name="filesystem"/>
- <package name="glibc-locale"/>
+ <package name="glibc-locale-base"/>
<package name="ca-certificates"/>
</packages>
<packages type="bootstrap">
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.0qns8y/_old 2019-02-17 12:21:00.980205918 +0100
+++ /var/tmp/diff_new_pack.0qns8y/_new 2019-02-17 12:21:00.984205917 +0100
@@ -1,31 +1,13 @@
<multibuild>
- <flavor>MicroOS-docker-kvm-and-xen</flavor>
- <flavor>MicroOS-docker-XEN</flavor>
- <flavor>MicroOS-docker-VMware</flavor>
- <flavor>MicroOS-docker-MS-HyperV</flavor>
- <flavor>MicroOS-docker-OpenStack-Cloud</flavor>
- <flavor>MicroOS-docker-Pine64</flavor>
- <flavor>MicroOS-docker-RaspberryPi</flavor>
- <flavor>MicroOS-docker-Vagrant-x86_64</flavor>
- <flavor>MicroOS-docker-hardware-x86_64</flavor>
- <flavor>kubeadm-docker-kvm-and-xen</flavor>
- <flavor>kubeadm-docker-XEN</flavor>
- <flavor>kubeadm-docker-VMware</flavor>
- <flavor>kubeadm-docker-MS-HyperV</flavor>
- <flavor>kubeadm-docker-OpenStack-Cloud</flavor>
- <flavor>kubeadm-docker-Pine64</flavor>
- <flavor>kubeadm-docker-RaspberryPi</flavor>
- <flavor>kubeadm-docker-Vagrant-x86_64</flavor>
- <flavor>kubeadm-docker-hardware-x86_64</flavor>
- <flavor>MicroOS-cri-o-kvm-and-xen</flavor>
- <flavor>MicroOS-cri-o-XEN</flavor>
- <flavor>MicroOS-cri-o-VMware</flavor>
- <flavor>MicroOS-cri-o-MS-HyperV</flavor>
- <flavor>MicroOS-cri-o-OpenStack-Cloud</flavor>
- <flavor>MicroOS-cri-o-Pine64</flavor>
- <flavor>MicroOS-cri-o-RaspberryPi</flavor>
- <flavor>MicroOS-cri-o-Vagrant-x86_64</flavor>
- <flavor>MicroOS-cri-o-hardware-x86_64</flavor>
+ <flavor>MicroOS-podman-kvm-and-xen</flavor>
+ <flavor>MicroOS-podman-XEN</flavor>
+ <flavor>MicroOS-podman-VMware</flavor>
+ <flavor>MicroOS-podman-MS-HyperV</flavor>
+ <flavor>MicroOS-podman-OpenStack-Cloud</flavor>
+ <flavor>MicroOS-podman-Pine64</flavor>
+ <flavor>MicroOS-podman-RaspberryPi</flavor>
+ <flavor>MicroOS-podman-Vagrant-x86_64</flavor>
+ <flavor>MicroOS-podman-hardware-x86_64</flavor>
<flavor>kubeadm-cri-o-kvm-and-xen</flavor>
<flavor>kubeadm-cri-o-XEN</flavor>
<flavor>kubeadm-cri-o-VMware</flavor>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.0qns8y/_old 2019-02-17 12:21:01.000205913 +0100
+++ /var/tmp/diff_new_pack.0qns8y/_new 2019-02-17 12:21:01.008205910 +0100
@@ -22,13 +22,14 @@
#======================================
# Functions...
#--------------------------------------
+set -x
+
test -f /.kconfig && . /.kconfig
test -f /.profile && . /.profile
-mkdir /var/lib/misc/reconfig_system
+set -euo pipefail
-set -eo pipefail
-set -x
+mkdir /var/lib/misc/reconfig_system
#======================================
# Greeting...
@@ -104,10 +105,6 @@
echo '** Rehashing SSL Certificates...'
update-ca-certificates
-if [ ! -s /var/log/zypper.log ]; then
- > /var/log/zypper.log
-fi
-
#======================================
# Import trusted rpm keys
#--------------------------------------
@@ -123,31 +120,12 @@
fi
#======================================
-# Enable kubelet
+# Enable kubelet if installed
#--------------------------------------
-suseInsertService kubelet
-
-#======================================
-# Configure setup for /var/lib/docker partition
-#--------------------------------------
-# Not compatible, breaks MBR
-if [[ "$kiwi_profiles" != *"RaspberryPi"* && "$kiwi_profiles" != *"Pine64"*
]]; then
- # /var/lib/docker on a separate btrfs partition without quotas enabled
- # as docker is not usable with those (too much "traffic")
- cat >/etc/data_part.cfg <<EOF
-data_fs=btrfs
-data_label=docker
-EOF
-
- mkdir -p /var/lib/docker
- echo "LABEL=docker /var/lib/docker btrfs defaults 0 0"
>>/etc/fstab.append
-
- suseInsertService data_part
+if rpm -q kubernetes-kubelet >/dev/null; then
+ suseInsertService kubelet
fi
-# /etc/fstab.sys for dracut to mount overlayfs
-/usr/sbin/setup-fstab.sys-for-overlayfs
-
# Adjust zypp conf
sed -i 's/.*solver.onlyRequires.*/solver.onlyRequires = true/g'
/etc/zypp/zypp.conf
sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g'
/etc/zypp/zypp.conf
@@ -156,7 +134,7 @@
#=====================================
# Configure snapper
#-------------------------------------
-if [ "$kiwi_btrfs_root_is_snapshot" = 'true' ]; then
+if [ "${kiwi_btrfs_root_is_snapshot-false}" = 'true' ]; then
echo "creating initial snapper config ..."
cp /etc/snapper/config-templates/default /etc/snapper/configs/root
baseUpdateSysConfig /etc/sysconfig/snapper SNAPPER_CONFIGS root
@@ -167,6 +145,11 @@
sed -i''
's/^NUMBER_LIMIT_IMPORTANT=.*$/NUMBER_LIMIT_IMPORTANT="4-10"/g'
/etc/snapper/configs/root
fi
+# Hack: Use the legacy fstab.sys for now to work around
https://github.com/SUSE/kiwi/issues/945
+cat << EOF >> /etc/fstab.sys
+LABEL=ROOT /var btrfs defaults,subvol=@/var 0 0
+overlay /etc overlay
defaults,lowerdir=/sysroot/etc,upperdir=/sysroot/var/lib/overlay/1/etc,workdir=/sysroot/var/lib/overlay/work-etc
0 0
+EOF
#======================================
# Configure Pine64 specifics
@@ -210,7 +193,7 @@
ssh-rsa
AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ==
vagrant insecure public key
EOF
chmod 0600 /home/vagrant/.ssh/authorized_keys
- chown -R vagrant /home/vagrant/.ssh
+ chown -R vagrant /home/vagrant
fi
if [ "${kiwi_profiles}" = "*OpenStack-Cloud*" ]; then
