Merge pull request openshift#24148 from adambkaplan/verify-pullsecret…

…-builds

Bug 1771335: Verify pullsecret builds

test/extended/builds/pullsecret.go

@@ -6,14 +6,19 @@ import (
 	g "github.com/onsi/ginkgo"
 	o "github.com/onsi/gomega"
 
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	exutil "github.com/openshift/origin/test/extended/util"
 )
 
 var _ = g.Describe("[Feature:Builds][Slow] using pull secrets in a build", func() {
 	defer g.GinkgoRecover()
 	var (
-		exampleBuild = exutil.FixturePath("testdata", "builds", "test-docker-app")
-		oc           = exutil.NewCLI("cli-pullsecret-build", exutil.KubeConfigPath())
+		exampleBuild    = exutil.FixturePath("testdata", "builds", "test-docker-app")
+		linkedBuild     = exutil.FixturePath("testdata", "builds", "pullsecret", "linked-nodejs-bc.yaml")
+		pullSecretBuild = exutil.FixturePath("testdata", "builds", "pullsecret", "pullsecret-nodejs-bc.yaml")
+		oc              = exutil.NewCLI("cli-pullsecret-build", exutil.KubeConfigPath())
 	)
 
 	g.Context("", func() {
@@ -38,6 +43,56 @@ var _ = g.Describe("[Feature:Builds][Slow] using pull secrets in a build", func(
 					br.AssertSuccess()
 				})
 			})
+
+			// Test pulling from registry.redhat.io - an authenticated registry
+			// CI clusters should have a pull secret to this registry in order for the samples operator to work
+			// Note that this registry is known to be flaky
+			g.Describe("pulling from an external authenticated registry", func() {
+				g.BeforeEach(func() {
+					g.By("copying the cluster pull secret to the namespace")
+					ps, err := oc.AsAdmin().AdminKubeClient().CoreV1().Secrets("openshift-config").Get("pull-secret", metav1.GetOptions{})
+					o.Expect(err).NotTo(o.HaveOccurred())
+					localPullSecret := &corev1.Secret{
+						ObjectMeta: metav1.ObjectMeta{
+							Name: "local-ps",
+						},
+						Data: ps.Data,
+						Type: ps.Type,
+					}
+					_, err = oc.KubeClient().CoreV1().Secrets(oc.Namespace()).Create(localPullSecret)
+					o.Expect(err).NotTo(o.HaveOccurred())
+				})
+
+				g.AfterEach(func() {
+					g.By("unlinking the cluster pull secret in the namespace")
+					oc.Run("secrets").Args("unlink", "builder", "local-ps").Execute()
+					g.By("deleting the cluster pull secret in the namespace")
+					oc.Run("delete").Args("secret", "local-ps").Execute()
+				})
+
+				g.It("should be able to use a pull secret in a build", func() {
+					g.By("creating build config")
+					err := oc.Run("create").Args("-f", pullSecretBuild).Execute()
+					o.Expect(err).NotTo(o.HaveOccurred())
+					g.By("starting build with a pull secret")
+					br, err := exutil.StartBuildAndWait(oc, "pullsecret-nodejs", "--build-loglevel=6")
+					o.Expect(err).NotTo(o.HaveOccurred())
+					br.AssertSuccess()
+				})
+
+				g.It("should be able to use a pull secret linked to the builder service account", func() {
+					g.By("linking pull secret with the builder service account")
+					err := oc.Run("secrets").Args("link", "builder", "local-ps").Execute()
+					o.Expect(err).NotTo(o.HaveOccurred())
+					g.By("creating build config")
+					err = oc.Run("create").Args("-f", linkedBuild).Execute()
+					o.Expect(err).NotTo(o.HaveOccurred())
+					g.By("starting a build")
+					br, err := exutil.StartBuildAndWait(oc, "linked-nodejs", "--build-loglevel=6")
+					o.Expect(err).NotTo(o.HaveOccurred())
+					br.AssertSuccess()
+				})
+			})
 		})
 	})
 })

test/extended/testdata/builds/pullsecret/linked-nodejs-bc.yaml

@@ -0,0 +1,14 @@
+kind: BuildConfig
+apiVersion: v1
+metadata:
+  name: linked-nodejs
+spec:
+  source:
+    git:
+      uri: "https://github.com/sclorg/nodejs-ex.git"
+  strategy:
+    type: Source
+    sourceStrategy:
+      from:
+        kind: DockerImage
+        name: registry.redhat.io/rhscl/nodejs-10-rhel7:latest

test/extended/testdata/builds/pullsecret/pullsecret-nodejs-bc.yaml

@@ -0,0 +1,16 @@
+kind: BuildConfig
+apiVersion: v1
+metadata:
+  name: pullsecret-nodejs
+spec:
+  source:
+    git:
+      uri: "https://github.com/sclorg/nodejs-ex.git"
+  strategy:
+    type: Source
+    sourceStrategy:
+      from:
+        kind: DockerImage
+        name: registry.redhat.io/rhscl/nodejs-10-rhel7:latest
+      pullSecret:
+        name: local-ps