Skip to content

Commit

Permalink
Fix URLs in template, fix kubectl apply command in docs (tinkerbell#185)
Browse files Browse the repository at this point in the history
## Description

- fix the URLs in example template
- fix kubectl apply command for kubernetes quickstart

## Why is this needed

Give a good impression to new users.

## Checklist:

I have:

- [x] updated the documentation and/or roadmap (if required)
- [ ] added unit or e2e tests
- [ ] provided instructions on how to upgrade
  • Loading branch information
mergify[bot] authored Apr 11, 2024
2 parents eab4763 + 3c1a1af commit dbf1c9d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions docs/quickstarts/KUBERNETES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
16 changes: 8 additions & 8 deletions vagrant/template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

0 comments on commit dbf1c9d

Please sign in to comment.