Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up #412

Merged
merged 2 commits into from
Nov 6, 2024
+15 −12
Merged

Clean up #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c07484
Add a Make goal to create a local release:
jacobweinstock Nov 6, 2024
d6d0942
Update image locations:
jacobweinstock Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,9 @@ release-metadata: $(RELEASE_DIR)
release-templates: $(RELEASE_DIR)
cp templates/cluster-template*.yaml $(RELEASE_DIR)/

release-local: ## Builds the manifests for use in local development
$(MAKE) release RELEASE_DIR=out/release/infrastructure-tinkerbell/$(RELEASE_TAG)

## --------------------------------------
## Cleanup / Verification
## --------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_image_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
spec:
containers:
# Change the value of image field below to your controller image URL
- image: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell-amd64:dev
- image: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell:dev
name: manager
2 changes: 1 addition & 1 deletion config/default/manager_pull_policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ spec:
spec:
containers:
- name: manager
imagePullPolicy: Always
imagePullPolicy: IfNotPresent
20 changes: 10 additions & 10 deletions controller/machine/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ tasks:
- /dev/console:/dev/console
- /lib/firmware:/lib/firmware:ro
actions:
- name: "stream-image"
image: quay.io/tinkerbell-actions/oci2disk:v1.0.0
- name: "stream image"
image: quay.io/tinkerbell/actions/oci2disk
timeout: 600
environment:
IMG_URL: {{.ImageURL}}
DEST_DISK: {{.DestDisk}}
COMPRESSED: true
- name: "add-tink-cloud-init-config"
image: quay.io/tinkerbell-actions/writefile:v1.0.0
- name: "add tink cloud-init config"
image: quay.io/tinkerbell/actions/writefile
timeout: 90
environment:
DEST_DISK: {{.DestPartition}}
Expand All @@ -67,8 +67,8 @@ tasks:
manage_etc_hosts: localhost
warnings:
dsid_missing_source: off
- name: "add-tink-cloud-init-ds-config"
image: quay.io/tinkerbell-actions/writefile:v1.0.0
- name: "add tink cloud-init ds-config"
image: quay.io/tinkerbell/actions/writefile
timeout: 90
environment:
DEST_DISK: {{.DestPartition}}
Expand All @@ -80,15 +80,15 @@ tasks:
DIRMODE: 0700
CONTENTS: |
datasource: Ec2
- name: "kexec-image"
image: ghcr.io/jacobweinstock/waitdaemon:0.1.2
- name: "kexec image"
image: ghcr.io/jacobweinstock/waitdaemon:0.2.1
timeout: 90
pid: host
environment:
BLOCK_DEVICE: {{.DestPartition}}
FS_TYPE: ext4
IMAGE: quay.io/tinkerbell-actions/kexec:v1.0.0
WAIT_SECONDS: 10
IMAGE: quay.io/tinkerbell/actions/kexec
WAIT_SECONDS: 5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
`
Expand Down
Loading