Skip to content

Commit

Permalink
Ensure that itest.cluster uses self.
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Hallgren <thomas@datawire.io>
  • Loading branch information
thallgren committed May 6, 2024
1 parent 599e294 commit 1d0e76a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions integration_test/itest/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ func (s *cluster) SetSelf(self Cluster) {
}

func (s *cluster) imagesFromEnv(ctx context.Context) context.Context {
v := s.TelepresenceVersion()[1:]
r := s.Registry()
v := s.self.TelepresenceVersion()[1:]
r := s.self.Registry()
if img := ImageFromEnv(ctx, "DEV_MANAGER_IMAGE", v, r); img != nil {
ctx = WithImage(ctx, img)
}
Expand All @@ -142,7 +142,7 @@ func (s *cluster) imagesFromEnv(ctx context.Context) context.Context {
}

func (s *cluster) AgentVersion(ctx context.Context) string {
return s.TelepresenceVersion()[1:]
return s.self.TelepresenceVersion()[1:]
}

func (s *cluster) Initialize(ctx context.Context) context.Context {
Expand Down Expand Up @@ -353,7 +353,7 @@ func (s *cluster) withBasicConfig(c context.Context, t *testing.T) context.Conte
to.PrivateTrafficManagerConnect = 180 * time.Second

images := config.Images()
images.PrivateRegistry = s.Registry()
images.PrivateRegistry = s.self.Registry()
if agentImage := GetAgentImage(c); agentImage != nil {
images.PrivateAgentImage = agentImage.FQName()
images.PrivateWebhookRegistry = agentImage.Registry
Expand Down Expand Up @@ -648,7 +648,7 @@ func (s *cluster) installChart(ctx context.Context, release bool, chartFilename
}

func (s *cluster) TelepresenceHelmInstallOK(ctx context.Context, upgrade bool, settings ...string) string {
logFile, err := s.TelepresenceHelmInstall(ctx, upgrade, settings...)
logFile, err := s.self.TelepresenceHelmInstall(ctx, upgrade, settings...)
require.NoError(getT(ctx), err)
return logFile
}
Expand Down

0 comments on commit 1d0e76a

Please sign in to comment.