ensure secret after kots is installed

replicatedhq · Oct 2, 2023 · c6bf49a · c6bf49a
1 parent b60a068
commit c6bf49a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -185,7 +185,6 @@ var _ = Describe("E2E", func() {
 					adminConsolePort = kotsInstaller.AdminConsolePortForward(c.GetKubeconfig(), test, kotsadmForwardPort)
 				} else {
 					GinkgoWriter.Println("Installing KOTS")
-					kotsInstaller.EnsureSecret(c.GetKubeconfig(), test)
 					adminConsolePort = kotsInstaller.Install(c.GetKubeconfig(), test, kotsadmForwardPort)
 				}
 

diff --git a/e2e/kots/kots.go b/e2e/kots/kots.go
@@ -40,21 +40,15 @@ func NewInstaller(imageRegistry, imageNamespace, imageTag string, airgap bool, d
 	}
 }
 
-func (i *Installer) EnsureSecret(kubeconfig string, test inventory.Test) {
-	if i.dockerhubUsername == "" || i.dockerhubPassword == "" {
-		fmt.Println("Skipping dockerhub ensure-secret because no credentials were provided")
-		return
-	}
-	session, err := i.ensureSecret(kubeconfig, test)
-	Expect(err).WithOffset(1).Should(Succeed(), "Kots docker ensure-secret failed")
-	Eventually(session).WithOffset(1).WithTimeout(InstallWaitDuration).Should(gexec.Exit(0), "Kots docker ensure-secret failed with non-zero exit code")
-}
-
 func (i *Installer) Install(kubeconfig string, test inventory.Test, adminConsolePort string) string {
 	session, err := i.install(kubeconfig, test)
 	Expect(err).WithOffset(1).Should(Succeed(), "Kots install failed")
 	Eventually(session).WithOffset(1).WithTimeout(InstallWaitDuration).Should(gexec.Exit(0), "Kots install failed with non-zero exit code")
 
+	session, err = i.ensureSecret(kubeconfig, test)
+	Expect(err).WithOffset(1).Should(Succeed(), "Kots docker ensure-secret failed")
+	Eventually(session).WithOffset(1).WithTimeout(InstallWaitDuration).Should(gexec.Exit(0), "Kots docker ensure-secret failed with non-zero exit code")
+
 	return i.AdminConsolePortForward(kubeconfig, test, adminConsolePort)
 }