Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fixup: Explicitly ensure master tag is always pulled, like latest
  • Loading branch information
maru-ava committed Dec 3, 2025
commit b9c811f4ecfa6a7f461664d3ebe23b9b6561c4be
2 changes: 2 additions & 0 deletions tests/fixture/bootstrapmonitor/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ func getMasterImageDetails(
Command: []string{"./avalanchego"},
Args: []string{"--version-json"},
Image: baseImageName + ":master",
// Ensure the latest image is always pulled for a tag other than `latest`
ImagePullPolicy: corev1.PullAlways,
},
},
RestartPolicy: corev1.RestartPolicyNever,
Expand Down
14 changes: 8 additions & 6 deletions tests/fixture/bootstrapmonitor/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ const (

avalanchegoImage = "localhost:5001/avalanchego"
masterAvalanchegoImage = avalanchegoImage + ":master"
monitorImage = "localhost:5001/bootstrap-monitor"
latestMonitorImage = monitorImage + ":latest"
monitorImage = "localhost:5001/bootstrap-monitor"
masterMonitorImage = monitorImage + ":master"

initContainerName = "init"
monitorContainerName = "monitor"
Expand Down Expand Up @@ -269,6 +269,7 @@ func newNodeStatefulSet(name string, flags tmpnet.FlagsMap) *appsv1.StatefulSet
name,
true, // generateName
masterAvalanchegoImage,
corev1.PullAlways, // Ensure the :master image is always pulled
nodeContainerName,
volumeName,
volumeSize,
Expand Down Expand Up @@ -371,10 +372,11 @@ func createBootstrapTester(tc tests.TestContext, clientset *kubernetes.Clientset
// getMonitorContainer retrieves the common container definition for bootstrap-monitor containers.
func getMonitorContainer(name string, args []string) corev1.Container {
return corev1.Container{
Name: name,
Image: latestMonitorImage,
Command: []string{"./bootstrap-monitor"},
Args: args,
Name: name,
Image: masterMonitorImage,
ImagePullPolicy: corev1.PullAlways, // Ensure the :master image is always pulled
Command: []string{"./bootstrap-monitor"},
Args: args,
Env: []corev1.EnvVar{
{
Name: "POD_NAME",
Expand Down
6 changes: 4 additions & 2 deletions tests/fixture/tmpnet/kube.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ func NewNodeStatefulSet(
name string,
generateName bool,
imageName string,
imagePullPolicy corev1.PullPolicy,
containerName string,
volumeName string,
volumeSize string,
Expand Down Expand Up @@ -115,8 +116,9 @@ func NewNodeStatefulSet(
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: containerName,
Image: imageName,
Name: containerName,
Image: imageName,
ImagePullPolicy: imagePullPolicy,
Ports: []corev1.ContainerPort{
{
Name: "http",
Expand Down
1 change: 1 addition & 0 deletions tests/fixture/tmpnet/kube_runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ func (p *KubeRuntime) Start(ctx context.Context) error {
statefulSetName,
false, // generateName
runtimeConfig.Image,
"", // imagePullPolicy - use default behavior
containerName,
volumeName,
fmt.Sprintf("%dGi", runtimeConfig.VolumeSizeGB),
Expand Down
Loading