Do not include elemental-toolkit sources

Signed-off-by: David Cassany <dcassany@suse.com>
rancher · Oct 6, 2022 · 578b666 · 578b666
1 parent 5c4e2ef
commit 578b666
Show file tree

Hide file tree

Showing 41 changed files with 17 additions and 1,160 deletions.
diff --git a/Dockerfile.image b/Dockerfile.image
@@ -10,12 +10,23 @@ COPY framework/files/etc/luet/luet.yaml /etc/luet/luet.yaml
 ENV LUET_NOLOCK=true
 SHELL ["/usr/bin/luet", "install", "-y", "--system-target", "/framework"]
 
+# elemental-toolkit essentials
+RUN system/immutable-rootfs
+RUN system/cos-setup
+RUN cloud-config/network
+RUN cloud-config/recovery
+RUN cloud-config/live
+RUN cloud-config/boot-assessment
+RUN cloud-config/default-services
+RUN system/grub2-config
+RUN system/base-dracut-modules
+
+# elemental-toolkit utilities
 RUN utils/k9s
 RUN utils/nerdctl
 RUN toolchain/cosign
 RUN selinux/rancher
 
-
 # elemental-operator
 FROM $OPERATOR_IMAGE as elemental-operator
 
@@ -45,11 +56,10 @@ COPY --from=system-agent /usr/bin/rancher-system-agent /usr/sbin/elemental-syste
 COPY --from=elemental-cli /usr/bin/elemental /usr/bin/elemental
 
 # Copy local framework files
-COPY framework/cos/ /
 COPY framework/files/ /
 
 # Enable services
-RUN systemctl enable NetworkManager
+RUN systemctl enable NetworkManager sshd elemental-populate-node-labels 
 
 ARG IMAGE_TAG=latest
 ARG IMAGE_COMMIT=""

diff --git a/Makefile b/Makefile
@@ -137,13 +137,3 @@ build_all: build iso extract_kernel_init_squash ipxe
 .PHONY: docs
 docs:
 	mkdocs build
-
-_FW_CMD=apk add curl && ( curl -L https://raw.githubusercontent.com/rancher-sandbox/cOS-toolkit/master/scripts/get_luet.sh | sh ) && luet install --system-target /framework -y $(FRAMEWORK_PACKAGES) && rm -rf /framework/var/luet
-update-cos-framework:
-	@echo "Cleanup generated files"
-	$(SUDO) rm -rf $(ROOT_DIR)/framework/cos
-	docker run --rm --entrypoint /bin/sh \
-		-v $(ROOT_DIR)/framework/cos:/framework \
-		alpine -c \
-		"$(_FW_CMD)"
-	$(SUDO) chown -R $$(id -u) $(ROOT_DIR)/framework/cos
diff --git a/framework/README.md b/framework/README.md
diff --git a/framework/cos/etc/cos/bootargs.cfg b/framework/cos/etc/cos/bootargs.cfg
diff --git a/framework/cos/etc/cos/config b/framework/cos/etc/cos/config
diff --git a/framework/cos/etc/cos/grub.cfg b/framework/cos/etc/cos/grub.cfg
diff --git a/framework/cos/etc/cos/grubenv_firstboot b/framework/cos/etc/cos/grubenv_firstboot
diff --git a/framework/cos/etc/dracut.conf.d/02-cos-immutable-rootfs.conf b/framework/cos/etc/dracut.conf.d/02-cos-immutable-rootfs.conf
diff --git a/framework/cos/etc/dracut.conf.d/02-cos-setup-initramfs.conf b/framework/cos/etc/dracut.conf.d/02-cos-setup-initramfs.conf
diff --git a/framework/cos/etc/dracut.conf.d/50-cos-initrd.conf b/framework/cos/etc/dracut.conf.d/50-cos-initrd.conf
diff --git a/framework/cos/etc/systemd/system/initrd-fs.target.requires/cos-setup-rootfs.service b/framework/cos/etc/systemd/system/initrd-fs.target.requires/cos-setup-rootfs.service
diff --git a/framework/cos/etc/systemd/system/initrd.target.requires/cos-setup-initramfs.service b/framework/cos/etc/systemd/system/initrd.target.requires/cos-setup-initramfs.service
diff --git a/framework/cos/etc/systemd/system/multi-user.target.wants/cos-setup-boot.service b/framework/cos/etc/systemd/system/multi-user.target.wants/cos-setup-boot.service
diff --git a/framework/cos/etc/systemd/system/multi-user.target.wants/cos-setup-network.service b/framework/cos/etc/systemd/system/multi-user.target.wants/cos-setup-network.service
diff --git a/framework/cos/etc/systemd/system/multi-user.target.wants/cos-setup-reconcile.timer b/framework/cos/etc/systemd/system/multi-user.target.wants/cos-setup-reconcile.timer
diff --git a/framework/cos/etc/systemd/system/sysinit.target.wants/cos-setup-fs.service b/framework/cos/etc/systemd/system/sysinit.target.wants/cos-setup-fs.service
diff --git a/framework/cos/etc/systemd/system/tmp.mount b/framework/cos/etc/systemd/system/tmp.mount
diff --git a/framework/cos/lib/systemd/system/cos-setup-boot.service b/framework/cos/lib/systemd/system/cos-setup-boot.service
diff --git a/framework/cos/lib/systemd/system/cos-setup-fs.service b/framework/cos/lib/systemd/system/cos-setup-fs.service
diff --git a/framework/cos/lib/systemd/system/cos-setup-initramfs.service b/framework/cos/lib/systemd/system/cos-setup-initramfs.service
diff --git a/framework/cos/lib/systemd/system/cos-setup-network.service b/framework/cos/lib/systemd/system/cos-setup-network.service
diff --git a/framework/cos/lib/systemd/system/cos-setup-reconcile.service b/framework/cos/lib/systemd/system/cos-setup-reconcile.service
diff --git a/framework/cos/lib/systemd/system/cos-setup-reconcile.timer b/framework/cos/lib/systemd/system/cos-setup-reconcile.timer