Skip to content

Commit 35924f4

Browse files
Rahul Ganesheks-distro-pr-bot
authored andcommitted
Pull locally embedded tink-worker image
Tink-worker image gets embedded into Hook-OS at build time. Pull the locally embedded image to circumvent against airgapped scenarios. Signed-off-by: Rahul Ganesh <[email protected]>
1 parent 9e3fd3f commit 35924f4

17 files changed

+23
-20
lines changed

pkg/providers/tinkerbell/stack/stack.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ const (
4747
service = "service"
4848
relay = "relay"
4949
smeeHTTPPort = "7171"
50+
51+
// localTinkWorkerImage is the path to the tink-worker image in the hook-OS.
52+
localTinkWorkerImage = "127.0.0.1/embedded/tink-worker"
5053
)
5154

5255
type Docker interface {
@@ -297,7 +300,7 @@ func (s *Installer) installBootsOnDocker(ctx context.Context, bundle releasev1al
297300
func (s *Installer) getSmeeKernelArgs(bundle releasev1alpha1.TinkerbellStackBundle) []string {
298301
extraKernelArgs := []string{}
299302
if s.bootsOnDocker {
300-
extraKernelArgs = append(extraKernelArgs, fmt.Sprintf("tink_worker_image=%s", s.localRegistryURL(bundle.Tink.TinkWorker.URI)))
303+
extraKernelArgs = append(extraKernelArgs, fmt.Sprintf("tink_worker_image=%s", localTinkWorkerImage))
301304
}
302305

303306
if s.registryMirror != nil {
@@ -597,7 +600,7 @@ func (s *Installer) createValuesOverride(bundle releasev1alpha1.TinkerbellBundle
597600
},
598601
"additionalKernelArgs": bootEnv,
599602
},
600-
"tinkWorkerImage": s.localRegistryURL(bundle.TinkerbellStack.Tink.TinkWorker.URI),
603+
"tinkWorkerImage": localTinkWorkerImage,
601604
"iso": map[string]interface{}{
602605
// it's safe to populate the URL and default to true as rufio jobs for mounting and booting
603606
// from iso happens only when bootmode is set to iso on tinkerbellmachinetemplate

pkg/providers/tinkerbell/stack/testdata/expected_tinkerbell_chart_overrides_with_all_options.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ boots:
1111
- name: TINKERBELL_GRPC_AUTHORITY
1212
value: 1.2.3.4:42113
1313
- name: BOOTS_EXTRA_KERNEL_ARGS
14-
value: tink_worker_image=public.ecr.aws/eks-anywhere/tink-worker:latest
14+
value: tink_worker_image=127.0.0.1/embedded/tink-worker
1515
image: public.ecr.aws/eks-anywhere/boots:latest
1616
createNamespace: true
1717
envoy:

pkg/providers/tinkerbell/stack/testdata/expected_upgrade.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ smee:
3535
singleNodeClusterConfig:
3636
controlPlaneTolerationsEnabled: true
3737
nodeAffinityWeight: 1
38-
tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest
38+
tinkWorkerImage: 127.0.0.1/embedded/tink-worker
3939
trustedProxies:
4040
- 192.168.0.0/16
4141
stack:

pkg/providers/tinkerbell/stack/testdata/expected_upgrade_with_proxy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ smee:
3838
singleNodeClusterConfig:
3939
controlPlaneTolerationsEnabled: true
4040
nodeAffinityWeight: 1
41-
tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest
41+
tinkWorkerImage: 127.0.0.1/embedded/tink-worker
4242
trustedProxies:
4343
- 192.168.0.0/16
4444
stack:

pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_docker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ smee:
1717
deploy: false
1818
http:
1919
additionalKernelArgs:
20-
- tink_worker_image=public.ecr.aws/eks-anywhere/tink-worker:latest
20+
- tink_worker_image=127.0.0.1/embedded/tink-worker
2121
osieUrl:
2222
host: anywhere-assests.eks.amazonaws.com
2323
path: /tinkerbell/hook
@@ -36,7 +36,7 @@ smee:
3636
singleNodeClusterConfig:
3737
controlPlaneTolerationsEnabled: true
3838
nodeAffinityWeight: 1
39-
tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest
39+
tinkWorkerImage: 127.0.0.1/embedded/tink-worker
4040
trustedProxies:
4141
- 192.168.0.0/16
4242
stack:

pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_kubernetes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ smee:
3535
singleNodeClusterConfig:
3636
controlPlaneTolerationsEnabled: true
3737
nodeAffinityWeight: 1
38-
tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest
38+
tinkWorkerImage: 127.0.0.1/embedded/tink-worker
3939
trustedProxies:
4040
- 192.168.0.0/16
4141
stack:

pkg/providers/tinkerbell/stack/testdata/expected_with_docker_options.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ smee:
1717
deploy: false
1818
http:
1919
additionalKernelArgs:
20-
- tink_worker_image=public.ecr.aws/eks-anywhere/tink-worker:latest
20+
- tink_worker_image=127.0.0.1/embedded/tink-worker
2121
osieUrl:
2222
host: anywhere-assests.eks.amazonaws.com
2323
path: /tinkerbell/hook
@@ -36,7 +36,7 @@ smee:
3636
singleNodeClusterConfig:
3737
controlPlaneTolerationsEnabled: true
3838
nodeAffinityWeight: 1
39-
tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest
39+
tinkWorkerImage: 127.0.0.1/embedded/tink-worker
4040
trustedProxies:
4141
- 192.168.0.0/16
4242
stack:

pkg/providers/tinkerbell/stack/testdata/expected_with_hook_iso_override.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ smee:
3535
singleNodeClusterConfig:
3636
controlPlaneTolerationsEnabled: true
3737
nodeAffinityWeight: 1
38-
tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest
38+
tinkWorkerImage: 127.0.0.1/embedded/tink-worker
3939
trustedProxies:
4040
- 192.168.0.0/16
4141
stack:

pkg/providers/tinkerbell/stack/testdata/expected_with_hook_override.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ smee:
3535
singleNodeClusterConfig:
3636
controlPlaneTolerationsEnabled: true
3737
nodeAffinityWeight: 1
38-
tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest
38+
tinkWorkerImage: 127.0.0.1/embedded/tink-worker
3939
trustedProxies:
4040
- 192.168.0.0/16
4141
stack:

pkg/providers/tinkerbell/stack/testdata/expected_with_host_port_enabled_false.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ smee:
3535
singleNodeClusterConfig:
3636
controlPlaneTolerationsEnabled: true
3737
nodeAffinityWeight: 1
38-
tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest
38+
tinkWorkerImage: 127.0.0.1/embedded/tink-worker
3939
trustedProxies:
4040
- 192.168.0.0/16
4141
stack:

0 commit comments

Comments
 (0)