fix img pull pw

DataDog · Mar 26, 2024 · aa0f95a · aa0f95a
1 parent ff9ce33
commit aa0f95a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -29,7 +29,6 @@ spec:
         args:
         - --enable-leader-election
         - --pprof
-        - --webhookEnabled
         image: controller:latest
         imagePullPolicy: IfNotPresent
         name: manager
@@ -58,7 +57,5 @@ spec:
             path: /healthz/
             port: 8081
           periodSeconds: 10
-      imagePullSecrets:
-        - name: registry-credentials
       terminationGracePeriodSeconds: 10
       serviceAccountName: controller-manager
diff --git a/test/e2e/const.go b/test/e2e/const.go
@@ -67,7 +67,7 @@ func operatorTransformationFunc() func(state map[string]interface{}, opts ...pul
 		if imageTag != "" && state["kind"] == "Deployment" && name == "datadog-operator-manager" {
 			template := state["spec"].(map[string]interface{})["template"]
 			templateSpec := template.(map[string]interface{})["spec"]
-			//templateSpec.(map[string]interface{})["imagePullSecrets"] = []map[string]interface{}{{"name": imagePullSecretName}}
+			templateSpec.(map[string]interface{})["imagePullSecrets"] = []map[string]interface{}{{"name": imagePullSecretName}}
 			containers := templateSpec.(map[string]interface{})["containers"]
 			container := containers.([]interface{})[0]
 			container.(map[string]interface{})["image"] = imageTag

diff --git a/test/e2e/kind_e2e_test.go b/test/e2e/kind_e2e_test.go
@@ -48,6 +48,9 @@ func TestKindSuite(t *testing.T) {
 	if !ok {
 		k8sVersion = "1.26"
 	}
+
+	imgPullPassword, _ = os.LookupEnv("IMAGE_PULL_PASSWORD")
+
 	e2eParams := []e2e.SuiteOption{e2e.WithProvisioner(kindProvisioner(k8sVersion, ddaConfig, namespace)), e2e.WithDevMode(), e2e.WithSkipDeleteOnFailure()}
 	e2e.Run[kindEnv](t, &kindSuite{}, e2eParams...)
 }
@@ -127,7 +130,7 @@ func kindProvisioner(k8sVersion string, ddaConfig string, namespace string) e2e.
 				Transformations: []yaml.Transformation{
 					ddaTransformationFunc(kindClusterName, awsEnv.CommonEnvironment.AgentAPIKey()),
 				},
-			}, pulumi.Provider(kindKubeProvider))
+			}, pulumi.Provider(kindKubeProvider), pulumi.DependsOn([]pulumi.Resource{defaultDir}))
 			if err != nil {
 				return err
 			}
@@ -154,16 +157,13 @@ func (suite *kindSuite) SetupSuite() {
 	// Setup kind E2E test suite with CI environment variables
 	var ok bool
 	imageTag, ok = os.LookupEnv("TARGET_IMAGE")
-	if ok {
-		suite.T().Logf("TARGET_IMAGE: %s", imageTag)
-	} else {
-		suite.T().Logf("Couldn't get TARGET_IMAGE env var.")
+	if !ok {
+		suite.T().Logf("Couldn't get TARGET_IMAGE env var. Using default image `gcr.io/datadoghq/operator:latest`.")
+		imageTag = "gcr.io/datadoghq/operator:latest"
 	}
 
 	imgPullPassword, ok = os.LookupEnv("IMAGE_PULL_PASSWORD")
-	if ok {
-		suite.T().Logf("Got IMAGE_PULL_PASSWORD env var.")
-	} else {
+	if !ok {
 		suite.T().Logf("Couldn't get IMAGE_PULL_PASSWORD env var.")
 	}