Skip to content

Commit 29325b7

Browse files
Merge pull request #412 from jacobweinstock/iso-mounting
Clean up: ## Description <!--- Please describe what this PR is going to change --> Add a Make goal for creating a local release. This is helpful for CAPT development. Updated Action image references. ## Why is this needed <!--- Link to issue you have raised --> Fixes: # ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## How are existing users impacted? What migration steps/scripts do we need? <!--- Fixes a bug, unblocks installation, removes a component of the stack etc --> <!--- Requires a DB migration script, etc. --> ## Checklist: I have: - [ ] updated the documentation and/or roadmap (if required) - [ ] added unit or e2e tests - [ ] provided instructions on how to upgrade
2 parents 649b7d6 + d6d0942 commit 29325b7

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,9 @@ release-metadata: $(RELEASE_DIR)
301301
release-templates: $(RELEASE_DIR)
302302
cp templates/cluster-template*.yaml $(RELEASE_DIR)/
303303

304+
release-local: ## Builds the manifests for use in local development
305+
$(MAKE) release RELEASE_DIR=out/release/infrastructure-tinkerbell/$(RELEASE_TAG)
306+
304307
## --------------------------------------
305308
## Cleanup / Verification
306309
## --------------------------------------

config/default/manager_image_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ spec:
88
spec:
99
containers:
1010
# Change the value of image field below to your controller image URL
11-
- image: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell-amd64:dev
11+
- image: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell:dev
1212
name: manager

config/default/manager_pull_policy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ spec:
88
spec:
99
containers:
1010
- name: manager
11-
imagePullPolicy: Always
11+
imagePullPolicy: IfNotPresent

controller/machine/template.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ tasks:
3535
- /dev/console:/dev/console
3636
- /lib/firmware:/lib/firmware:ro
3737
actions:
38-
- name: "stream-image"
39-
image: quay.io/tinkerbell-actions/oci2disk:v1.0.0
38+
- name: "stream image"
39+
image: quay.io/tinkerbell/actions/oci2disk
4040
timeout: 600
4141
environment:
4242
IMG_URL: {{.ImageURL}}
4343
DEST_DISK: {{.DestDisk}}
4444
COMPRESSED: true
45-
- name: "add-tink-cloud-init-config"
46-
image: quay.io/tinkerbell-actions/writefile:v1.0.0
45+
- name: "add tink cloud-init config"
46+
image: quay.io/tinkerbell/actions/writefile
4747
timeout: 90
4848
environment:
4949
DEST_DISK: {{.DestPartition}}
@@ -67,8 +67,8 @@ tasks:
6767
manage_etc_hosts: localhost
6868
warnings:
6969
dsid_missing_source: off
70-
- name: "add-tink-cloud-init-ds-config"
71-
image: quay.io/tinkerbell-actions/writefile:v1.0.0
70+
- name: "add tink cloud-init ds-config"
71+
image: quay.io/tinkerbell/actions/writefile
7272
timeout: 90
7373
environment:
7474
DEST_DISK: {{.DestPartition}}
@@ -80,15 +80,15 @@ tasks:
8080
DIRMODE: 0700
8181
CONTENTS: |
8282
datasource: Ec2
83-
- name: "kexec-image"
84-
image: ghcr.io/jacobweinstock/waitdaemon:0.1.2
83+
- name: "kexec image"
84+
image: ghcr.io/jacobweinstock/waitdaemon:0.2.1
8585
timeout: 90
8686
pid: host
8787
environment:
8888
BLOCK_DEVICE: {{.DestPartition}}
8989
FS_TYPE: ext4
90-
IMAGE: quay.io/tinkerbell-actions/kexec:v1.0.0
91-
WAIT_SECONDS: 10
90+
IMAGE: quay.io/tinkerbell/actions/kexec
91+
WAIT_SECONDS: 5
9292
volumes:
9393
- /var/run/docker.sock:/var/run/docker.sock
9494
`

0 commit comments

Comments
 (0)