From 0eeee1f55330dba8d371c49990e6197cc12e23c6 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 11 Apr 2024 16:09:41 +0200 Subject: [PATCH 1/2] Fix image URLs in template Signed-off-by: Natanael Copa --- vagrant/template.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/vagrant/template.yaml b/vagrant/template.yaml index 17369ba..cb16360 100644 --- a/vagrant/template.yaml +++ b/vagrant/template.yaml @@ -16,14 +16,14 @@ spec: - /lib/firmware:/lib/firmware:ro actions: - name: "stream-ubuntu-image" - image: quay.io/tinkerbell-actions/image2disk:v1.0.0 + image: quay.io/tinkerbell/actions/image2disk:v1.0.0 timeout: 600 environment: DEST_DISK: {{ index .Hardware.Disks 0 }} IMG_URL: "http://$TINKERBELL_HOST_IP:8080/jammy-server-cloudimg-amd64.raw.gz" COMPRESSED: true - name: "grow-partition" - image: quay.io/tinkerbell-actions/cexec:v1.0.0 + image: quay.io/tinkerbell/actions/cexec:v1.0.0 timeout: 90 environment: BLOCK_DEVICE: {{ index .Hardware.Disks 0 }}1 @@ -32,7 +32,7 @@ spec: DEFAULT_INTERPRETER: "/bin/sh -c" CMD_LINE: "growpart {{ index .Hardware.Disks 0 }} 1 && resize2fs {{ index .Hardware.Disks 0 }}1" - name: "install-openssl" - image: quay.io/tinkerbell-actions/cexec:v1.0.0 + image: quay.io/tinkerbell/actions/cexec:v1.0.0 timeout: 90 environment: BLOCK_DEVICE: {{ index .Hardware.Disks 0 }}1 @@ -41,7 +41,7 @@ spec: DEFAULT_INTERPRETER: "/bin/sh -c" CMD_LINE: "apt -y update && apt -y install openssl" - name: "create-user" - image: quay.io/tinkerbell-actions/cexec:v1.0.0 + image: quay.io/tinkerbell/actions/cexec:v1.0.0 timeout: 90 environment: BLOCK_DEVICE: {{ index .Hardware.Disks 0 }}1 @@ -50,7 +50,7 @@ spec: DEFAULT_INTERPRETER: "/bin/sh -c" CMD_LINE: "useradd -p $(openssl passwd -1 tink) -s /bin/bash -d /home/tink/ -m -G sudo tink" - name: "enable-ssh" - image: quay.io/tinkerbell-actions/cexec:v1.0.0 + image: quay.io/tinkerbell/actions/cexec:v1.0.0 timeout: 90 environment: BLOCK_DEVICE: {{ index .Hardware.Disks 0 }}1 @@ -59,7 +59,7 @@ spec: DEFAULT_INTERPRETER: "/bin/sh -c" CMD_LINE: "ssh-keygen -A; systemctl enable ssh.service; echo 'PasswordAuthentication yes' > /etc/ssh/sshd_config.d/60-cloudimg-settings.conf" - name: "disable-apparmor" - image: quay.io/tinkerbell-actions/cexec:v1.0.0 + image: quay.io/tinkerbell/actions/cexec:v1.0.0 timeout: 90 environment: BLOCK_DEVICE: {{ index .Hardware.Disks 0 }}1 @@ -68,7 +68,7 @@ spec: DEFAULT_INTERPRETER: "/bin/sh -c" CMD_LINE: "systemctl disable apparmor; systemctl disable snapd" - name: "write-netplan" - image: quay.io/tinkerbell-actions/writefile:v1.0.0 + image: quay.io/tinkerbell/actions/writefile:v1.0.0 timeout: 90 environment: DEST_DISK: {{ index .Hardware.Disks 0 }}1 @@ -94,7 +94,7 @@ spec: environment: BLOCK_DEVICE: {{ formatPartition ( index .Hardware.Disks 0 ) 1 }} FS_TYPE: ext4 - IMAGE: quay.io/tinkerbell-actions/kexec:v1.0.0 + IMAGE: quay.io/tinkerbell/actions/kexec:v1.0.0 WAIT_SECONDS: 10 volumes: - /var/run/docker.sock:/var/run/docker.sock From 48514e1e4ba18606f39f7f1cc2ef4b3de2ced096 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 11 Apr 2024 16:12:00 +0200 Subject: [PATCH 2/2] Fix kubectl apply command in kubernetes quickstart This is similar to what is in vagrant quickstart docs. Signed-off-by: Natanael Copa --- docs/quickstarts/KUBERNETES.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/quickstarts/KUBERNETES.md b/docs/quickstarts/KUBERNETES.md index 9cc52ac..5b571b5 100644 --- a/docs/quickstarts/KUBERNETES.md +++ b/docs/quickstarts/KUBERNETES.md @@ -43,16 +43,16 @@ You will need to bring your own hardware (machine) for this guide. 1. Download and convert a cloud image to a raw image ```bash - kubectl apply -f https://raw.githubusercontent.com/tinkerbell/sandbox/main/vagrant/ubuntu-download.yaml + kubectl apply -n tink-system -f https://raw.githubusercontent.com/tinkerbell/sandbox/main/vagrant/ubuntu-download.yaml # This will download and convert the Ubuntu Jammy 22.04 cloud image. ``` 1. Create and/or customize Hardware, Template, and Workflow objects and apply them to the cluster. You can use the Hardware, Template, and Workflow in this repo, in the `vagrant/` directory, as a base from which to start. ```bash - kubectl apply -f my-hardware.yaml - kubectl apply -f my-template.yaml - kubectl apply -f my-workflow.yaml + kubectl apply -n tink-system -f my-hardware.yaml + kubectl apply -n tink-system -f my-template.yaml + kubectl apply -n tink-system -f my-workflow.yaml ``` 1. Start the machine provision process by rebooting, into a netbooting state, the machine you have specified in the Hardware object above.