diff --git a/test/extended/operators/service_catalog.go b/test/extended/operators/service_catalog.go deleted file mode 100644 index 55f84bae75e8..000000000000 --- a/test/extended/operators/service_catalog.go +++ /dev/null @@ -1,253 +0,0 @@ -package operators - -import ( - "fmt" - g "github.com/onsi/ginkgo" - o "github.com/onsi/gomega" - exutil "github.com/openshift/origin/test/extended/util" - "k8s.io/apimachinery/pkg/util/wait" - e2e "k8s.io/kubernetes/test/e2e/framework" - "path/filepath" - "strings" - "time" -) - -var _ = g.Describe("[Feature:Platform] Service Catalog should", func() { - defer g.GinkgoRecover() - - var ( - oc = exutil.NewCLI("service-catalog", exutil.KubeConfigPath()) - // serviceCatalogWait is how long to wait for Service Catalog operations to be ready - serviceCatalogWait = 120 * time.Second - err error - buildPruningBaseDir = exutil.FixturePath("testdata", "service_catalog") - upsBroker = filepath.Join(buildPruningBaseDir, "ups-broker.yaml") - upsDeployment = filepath.Join(buildPruningBaseDir, "ups-deployment.yaml") - upsService = filepath.Join(buildPruningBaseDir, "ups-service.yaml") - upsInstance = filepath.Join(buildPruningBaseDir, "ups-instance.yaml") - upsBinding = filepath.Join(buildPruningBaseDir, "ups-binding.yaml") - ) - - enableServiceCatalogResources := [][]string{ - {"servicecatalogapiserver", "openshift-service-catalog-apiserver", "apiserver"}, - {"servicecatalogcontrollermanager", "openshift-service-catalog-controller-manager", "controller-manager"}, - } - - // Enable Service Catalog - g.BeforeEach(func() { - g.By("Enable Service Catalog") - for _, v := range enableServiceCatalogResources { - _, err := oc.AsAdmin().Run("patch").Args(v[0], "cluster", "-p", `{"spec":{"managementState":"Managed"}}`, "--type=merge").Output() - if err != nil { - e2e.Failf("Unable to create: %s, error:%v", v[0], err) - } - - err = wait.Poll(3*time.Second, serviceCatalogWait, func() (bool, error) { - output, err := oc.AsAdmin().Run("get").Args("pods", "-n", v[1], "-o=jsonpath={.items[0].status.phase}").Output() - if err != nil && !strings.Contains(output, "out of bounds") { - e2e.Failf("output string: %s", output) - return false, err - } - if output == "Running" { - e2e.Logf("%s works well!", v[0]) - return true, nil - } - return false, nil - }) - - o.Expect(err).NotTo(o.HaveOccurred()) - } - }, 120) - - // The below steps will cover OCP-24049, author: jiazha@redhat.com - // Disable these servicecatalogoperator resource - g.AfterEach(func() { - g.By("delete this ups broker") - output, err := oc.AsAdmin().Run("get").Args("clusterservicebroker").Output() - if strings.Contains(output, "ups-broker") { - _, err = oc.AsAdmin().Run("delete").Args("clusterservicebroker", "ups-broker").Output() - o.Expect(err).NotTo(o.HaveOccurred()) - err = wait.Poll(3*time.Second, serviceCatalogWait, func() (bool, error) { - output, err = oc.AsAdmin().Run("get").Args("clusterserviceclass").Output() - if err != nil { - e2e.Failf("Failed to delete ups-broker, error:%v", err) - return false, err - } - if !strings.Contains(output, "user-provided-service") { - return true, nil - } - return false, nil - }) - o.Expect(err).NotTo(o.HaveOccurred()) - } - for _, v := range enableServiceCatalogResources { - g.By("disable " + v[0]) - _, err := oc.AsAdmin().Run("patch").Args(v[0], "cluster", "-p", `{"spec":{"managementState":"Removed"}}`, "--type=merge").Output() - o.Expect(err).NotTo(o.HaveOccurred()) - err = wait.Poll(3*time.Second, serviceCatalogWait, func() (bool, error) { - output, err := oc.AsAdmin().Run("get").Args("ns", v[1]).Output() - if err != nil { - if strings.Contains(output, "not found") { - e2e.Logf("Disable %s successfully.", v[0]) - return true, nil - } - } - return false, nil - }) - o.Expect(err).NotTo(o.HaveOccurred()) - } - }, 120) - - g.It("check basic usages: OCP-24062, OCP-24049, OCP-15600", func() { - g.By("Check Service Catalog apiservice") - err = wait.Poll(3*time.Second, serviceCatalogWait, func() (bool, error) { - output, err := oc.AsAdmin().Run("get").Args("apiservices", "v1beta1.servicecatalog.k8s.io", "-o=jsonpath={.status.conditions[0].reason}").Output() - if err != nil { - if strings.Contains(output, "not found") { - return false, nil - } - } - if strings.Contains(output, "Passed") { - e2e.Logf("v1beta1.servicecatalog.k8s.io apiservice works well!") - return true, nil - } - return false, nil - }) - o.Expect(err).NotTo(o.HaveOccurred()) - - // The below steps will cover test case: OCP-15600, author: jiazha@redhat.com - g.By("Deploy a fake broker") - - upsFiles := []string{upsDeployment, upsService, upsBroker} - e2e.Logf("current namespace:%s", oc.Namespace()) - for _, v := range upsFiles { - configFile, err := oc.AsAdmin().Run("process").Args("-f", v, "-p", fmt.Sprintf("NAMESPACE=%s", oc.Namespace())).OutputToFile("config.json") - o.Expect(err).NotTo(o.HaveOccurred()) - err = oc.AsAdmin().Run("create").Args("-f", configFile).Execute() - o.Expect(err).NotTo(o.HaveOccurred()) - } - err = wait.Poll(3*time.Second, serviceCatalogWait, func() (bool, error) { - output, err := oc.AsAdmin().Run("get").Args("clusterservicebroker", "ups-broker", "-o=jsonpath={.status.conditions[0].status}").Output() - if err != nil { - e2e.Failf("Failed to install ups-broker, error:%v", err) - return false, err - } - if strings.Contains(output, "True") { - return true, nil - } - return false, nil - }) - o.Expect(err).NotTo(o.HaveOccurred()) - - g.By("create a ups instance") - configFile, err := oc.AsAdmin().Run("process").Args("-f", upsInstance, "-p", fmt.Sprintf("NAMESPACE=%s", oc.Namespace())).OutputToFile("config.json") - err = oc.AsAdmin().Run("create").Args("-f", configFile).Execute() - o.Expect(err).NotTo(o.HaveOccurred()) - err = wait.Poll(3*time.Second, serviceCatalogWait, func() (bool, error) { - output, err := oc.AsAdmin().Run("get").Args("serviceinstance", "-n", oc.Namespace(), "ups-instance", "-o=jsonpath={.status.conditions[0].reason}").Output() - if err != nil && !strings.Contains(output, "executing jsonpath") { - e2e.Failf("Failed to install ups-instance, error:%v", err) - return false, err - } - if strings.Contains(output, "ProvisionedSuccessfully") { - return true, nil - } - return false, nil - }) - o.Expect(err).NotTo(o.HaveOccurred()) - - g.By("bind to this instance") - configFile, err = oc.AsAdmin().Run("process").Args("-f", upsBinding, "-p", fmt.Sprintf("NAMESPACE=%s", oc.Namespace())).OutputToFile("config.json") - err = oc.AsAdmin().Run("create").Args("-f", configFile).Execute() - o.Expect(err).NotTo(o.HaveOccurred()) - err = wait.Poll(3*time.Second, serviceCatalogWait, func() (bool, error) { - output, err := oc.AsAdmin().Run("get").Args("servicebinding", "-n", oc.Namespace(), "ups-binding", "-o=jsonpath={.status.conditions[0].reason}").Output() - if err != nil && !strings.Contains(output, "executing jsonpath") { - e2e.Failf("Failed to create servicebinding, error:%v", err) - return false, err - } - if strings.Contains(output, "InjectedBindResult") { - return true, nil - } - return false, nil - }) - o.Expect(err).NotTo(o.HaveOccurred()) - output, err := oc.AsAdmin().Run("get").Args("secret", "-n", oc.Namespace()).Output() - o.Expect(err).NotTo(o.HaveOccurred()) - o.Expect(output).To(o.ContainSubstring("my-secret")) - - g.By("unbind from this instance") - output, err = oc.AsAdmin().Run("delete").Args("servicebinding", "-n", oc.Namespace(), "ups-binding").Output() - o.Expect(err).NotTo(o.HaveOccurred()) - err = wait.Poll(3*time.Second, serviceCatalogWait, func() (bool, error) { - output, err := oc.AsAdmin().Run("get").Args("servicebinding", "-n", oc.Namespace()).Output() - if err != nil { - e2e.Failf("Failed to delete servicebinding, error:%v", err) - return false, err - } - if !strings.Contains(output, "ups-binding") { - return true, nil - } - return false, nil - }) - o.Expect(err).NotTo(o.HaveOccurred()) - output, err = oc.AsAdmin().Run("get").Args("secret", "-n", oc.Namespace()).Output() - o.Expect(err).NotTo(o.HaveOccurred()) - o.Expect(output).NotTo(o.ContainSubstring("my-secret")) - - g.By("delete this ups instance") - _, err = oc.AsAdmin().Run("delete").Args("serviceinstance", "-n", oc.Namespace(), "ups-instance").Output() - o.Expect(err).NotTo(o.HaveOccurred()) - err = wait.Poll(3*time.Second, serviceCatalogWait, func() (bool, error) { - output, err = oc.AsAdmin().Run("get").Args("serviceinstance", "-n", oc.Namespace()).Output() - if err != nil { - e2e.Failf("Failed to delete serviceinstance, error:%v", err) - return false, err - } - if !strings.Contains(output, "ups-instance") { - return true, nil - } - return false, nil - }) - o.Expect(err).NotTo(o.HaveOccurred()) - - // The below steps will cover OCP-24062, author: jiazha@redhat.com - // TODO: once https://bugzilla.redhat.com/show_bug.cgi?id=1712297 fix, we should cover the `Force` managementState - // Unmanage these servicecatalogoperator resource - g.By("set Service Catalog to Unmanaged") - for _, v := range enableServiceCatalogResources { - _, err := oc.AsAdmin().Run("patch").Args(v[0], "cluster", "-p", `{"spec":{"managementState":"Unmanaged"}}`, "--type=merge").Output() - o.Expect(err).NotTo(o.HaveOccurred()) - err = wait.Poll(3*time.Second, serviceCatalogWait, func() (bool, error) { - output, err = oc.AsAdmin().Run("get").Args(v[0], "-n", v[1], "cluster", "-o=jsonpath={.spec.managementState}").Output() - if err != nil && !strings.Contains(output, "executing jsonpath") { - e2e.Failf("Failed to set the Unmanaged for Service Catalog, error:%v", err) - return false, err - } - if strings.Contains(output, "Unmanaged") { - return true, nil - } - return false, nil - }) - o.Expect(err).NotTo(o.HaveOccurred()) - - output, err := oc.AsAdmin().Run("patch").Args("daemonset", v[2], "-n", v[1], "-p", `{"spec":{"template":{"spec":{"priorityClassName":"test"}}}}`).Output() - o.Expect(err).NotTo(o.HaveOccurred()) - o.Expect(output).To(o.ContainSubstring("patched")) - - err = wait.Poll(3*time.Second, serviceCatalogWait, func() (bool, error) { - output, err = oc.AsAdmin().Run("get").Args("daemonset", v[2], "-n", v[1], "-o=jsonpath={.spec.template.spec.priorityClassName}").Output() - if err != nil && !strings.Contains(output, "executing jsonpath") { - e2e.Failf("Failed to check the priority of the daemonset, error:%v", err) - return false, err - } - if strings.Contains(output, "test") { - return true, nil - } - return false, nil - }) - o.Expect(err).NotTo(o.HaveOccurred()) - } - }) - -}) diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index ffd7ab94a163..241b2ddf61b3 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -443,11 +443,6 @@ // test/extended/testdata/sample-image-stream.json // test/extended/testdata/samplepipeline-withenvs.yaml // test/extended/testdata/service-serving-cert/nginx-serving-cert.conf -// test/extended/testdata/service_catalog/ups-binding.yaml -// test/extended/testdata/service_catalog/ups-broker.yaml -// test/extended/testdata/service_catalog/ups-deployment.yaml -// test/extended/testdata/service_catalog/ups-instance.yaml -// test/extended/testdata/service_catalog/ups-service.yaml // test/extended/testdata/signer-buildconfig.yaml // test/extended/testdata/templates/crunchydata-pod.json // test/extended/testdata/templates/guestbook.json @@ -55691,232 +55686,6 @@ func testExtendedTestdataServiceServingCertNginxServingCertConf() (*asset, error return a, nil } -var _testExtendedTestdataService_catalogUpsBindingYaml = []byte(`--- -apiVersion: v1 -kind: Template -metadata: - name: upsBinding-template -objects: -- apiVersion: servicecatalog.k8s.io/v1beta1 - kind: ServiceBinding - metadata: - name: ups-binding - namespace: "${NAMESPACE}" - spec: - instanceRef: - name: ups-instance - secretName: my-secret -parameters: -- name: NAMESPACE -`) - -func testExtendedTestdataService_catalogUpsBindingYamlBytes() ([]byte, error) { - return _testExtendedTestdataService_catalogUpsBindingYaml, nil -} - -func testExtendedTestdataService_catalogUpsBindingYaml() (*asset, error) { - bytes, err := testExtendedTestdataService_catalogUpsBindingYamlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "test/extended/testdata/service_catalog/ups-binding.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _testExtendedTestdataService_catalogUpsBrokerYaml = []byte(`--- -apiVersion: v1 -kind: Template -metadata: - name: ups-broker-template -objects: -- apiVersion: servicecatalog.k8s.io/v1beta1 - kind: ClusterServiceBroker - metadata: - name: ups-broker - spec: - url: http://ups-broker.${NAMESPACE}.svc.cluster.local -parameters: -- name: NAMESPACE -`) - -func testExtendedTestdataService_catalogUpsBrokerYamlBytes() ([]byte, error) { - return _testExtendedTestdataService_catalogUpsBrokerYaml, nil -} - -func testExtendedTestdataService_catalogUpsBrokerYaml() (*asset, error) { - bytes, err := testExtendedTestdataService_catalogUpsBrokerYamlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "test/extended/testdata/service_catalog/ups-broker.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _testExtendedTestdataService_catalogUpsDeploymentYaml = []byte(`--- -apiVersion: v1 -kind: Template -metadata: - name: ups-deployment-template -objects: -- apiVersion: apps/v1 - kind: Deployment - metadata: - labels: - app: ups-broker - chart: ups-broker-0.0.1 - heritage: Tiller - release: ups-broker - name: ups-broker - namespace: "${NAMESPACE}" - spec: - replicas: 1 - selector: - matchLabels: - app: ups-broker - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 1 - type: RollingUpdate - template: - metadata: - creationTimestamp: null - labels: - app: ups-broker - chart: ups-broker-0.0.1 - heritage: Tiller - release: ups-broker - spec: - containers: - - args: - - -alsologtostderr - - --port - - "8080" - image: quay.io/kubernetes-service-catalog/user-broker:latest - imagePullPolicy: Always - livenessProbe: - failureThreshold: 3 - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - tcpSocket: - port: 8080 - timeoutSeconds: 2 - name: ups-broker - ports: - - containerPort: 8080 - protocol: TCP - readinessProbe: - failureThreshold: 1 - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - tcpSocket: - port: 8080 - timeoutSeconds: 2 - dnsPolicy: ClusterFirst - restartPolicy: Always - terminationGracePeriodSeconds: 30 -parameters: -- name: NAMESPACE -`) - -func testExtendedTestdataService_catalogUpsDeploymentYamlBytes() ([]byte, error) { - return _testExtendedTestdataService_catalogUpsDeploymentYaml, nil -} - -func testExtendedTestdataService_catalogUpsDeploymentYaml() (*asset, error) { - bytes, err := testExtendedTestdataService_catalogUpsDeploymentYamlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "test/extended/testdata/service_catalog/ups-deployment.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _testExtendedTestdataService_catalogUpsInstanceYaml = []byte(`--- -apiVersion: v1 -kind: Template -metadata: - name: upsInstance-template -objects: -- apiVersion: servicecatalog.k8s.io/v1beta1 - kind: ServiceInstance - metadata: - name: ups-instance - namespace: "${NAMESPACE}" - spec: - clusterServiceClassExternalName: user-provided-service - clusterServicePlanExternalName: default -parameters: -- name: NAMESPACE -`) - -func testExtendedTestdataService_catalogUpsInstanceYamlBytes() ([]byte, error) { - return _testExtendedTestdataService_catalogUpsInstanceYaml, nil -} - -func testExtendedTestdataService_catalogUpsInstanceYaml() (*asset, error) { - bytes, err := testExtendedTestdataService_catalogUpsInstanceYamlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "test/extended/testdata/service_catalog/ups-instance.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _testExtendedTestdataService_catalogUpsServiceYaml = []byte(`--- -apiVersion: v1 -kind: Template -metadata: - name: ups-service-template -objects: -- apiVersion: v1 - kind: Service - metadata: - labels: - app: ups-broker - chart: ups-broker-0.0.1 - heritage: Tiller - release: ups-broker - name: ups-broker - namespace: "${NAMESPACE}" - spec: - ports: - - port: 80 - protocol: TCP - targetPort: 8080 - selector: - app: ups-broker - sessionAffinity: None - type: ClusterIP -parameters: -- name: NAMESPACE -`) - -func testExtendedTestdataService_catalogUpsServiceYamlBytes() ([]byte, error) { - return _testExtendedTestdataService_catalogUpsServiceYaml, nil -} - -func testExtendedTestdataService_catalogUpsServiceYaml() (*asset, error) { - bytes, err := testExtendedTestdataService_catalogUpsServiceYamlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "test/extended/testdata/service_catalog/ups-service.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - var _testExtendedTestdataSignerBuildconfigYaml = []byte(`kind: List apiVersion: v1 items: @@ -58784,11 +58553,6 @@ var _bindata = map[string]func() (*asset, error){ "test/extended/testdata/sample-image-stream.json": testExtendedTestdataSampleImageStreamJson, "test/extended/testdata/samplepipeline-withenvs.yaml": testExtendedTestdataSamplepipelineWithenvsYaml, "test/extended/testdata/service-serving-cert/nginx-serving-cert.conf": testExtendedTestdataServiceServingCertNginxServingCertConf, - "test/extended/testdata/service_catalog/ups-binding.yaml": testExtendedTestdataService_catalogUpsBindingYaml, - "test/extended/testdata/service_catalog/ups-broker.yaml": testExtendedTestdataService_catalogUpsBrokerYaml, - "test/extended/testdata/service_catalog/ups-deployment.yaml": testExtendedTestdataService_catalogUpsDeploymentYaml, - "test/extended/testdata/service_catalog/ups-instance.yaml": testExtendedTestdataService_catalogUpsInstanceYaml, - "test/extended/testdata/service_catalog/ups-service.yaml": testExtendedTestdataService_catalogUpsServiceYaml, "test/extended/testdata/signer-buildconfig.yaml": testExtendedTestdataSignerBuildconfigYaml, "test/extended/testdata/templates/crunchydata-pod.json": testExtendedTestdataTemplatesCrunchydataPodJson, "test/extended/testdata/templates/guestbook.json": testExtendedTestdataTemplatesGuestbookJson, @@ -59534,13 +59298,6 @@ var _bintree = &bintree{nil, map[string]*bintree{ "service-serving-cert": &bintree{nil, map[string]*bintree{ "nginx-serving-cert.conf": &bintree{testExtendedTestdataServiceServingCertNginxServingCertConf, map[string]*bintree{}}, }}, - "service_catalog": &bintree{nil, map[string]*bintree{ - "ups-binding.yaml": &bintree{testExtendedTestdataService_catalogUpsBindingYaml, map[string]*bintree{}}, - "ups-broker.yaml": &bintree{testExtendedTestdataService_catalogUpsBrokerYaml, map[string]*bintree{}}, - "ups-deployment.yaml": &bintree{testExtendedTestdataService_catalogUpsDeploymentYaml, map[string]*bintree{}}, - "ups-instance.yaml": &bintree{testExtendedTestdataService_catalogUpsInstanceYaml, map[string]*bintree{}}, - "ups-service.yaml": &bintree{testExtendedTestdataService_catalogUpsServiceYaml, map[string]*bintree{}}, - }}, "signer-buildconfig.yaml": &bintree{testExtendedTestdataSignerBuildconfigYaml, map[string]*bintree{}}, "templates": &bintree{nil, map[string]*bintree{ "crunchydata-pod.json": &bintree{testExtendedTestdataTemplatesCrunchydataPodJson, map[string]*bintree{}}, diff --git a/test/extended/testdata/service_catalog/ups-binding.yaml b/test/extended/testdata/service_catalog/ups-binding.yaml deleted file mode 100644 index 4d76c3d9766e..000000000000 --- a/test/extended/testdata/service_catalog/ups-binding.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: Template -metadata: - name: upsBinding-template -objects: -- apiVersion: servicecatalog.k8s.io/v1beta1 - kind: ServiceBinding - metadata: - name: ups-binding - namespace: "${NAMESPACE}" - spec: - instanceRef: - name: ups-instance - secretName: my-secret -parameters: -- name: NAMESPACE diff --git a/test/extended/testdata/service_catalog/ups-broker.yaml b/test/extended/testdata/service_catalog/ups-broker.yaml deleted file mode 100644 index ed584739716f..000000000000 --- a/test/extended/testdata/service_catalog/ups-broker.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: v1 -kind: Template -metadata: - name: ups-broker-template -objects: -- apiVersion: servicecatalog.k8s.io/v1beta1 - kind: ClusterServiceBroker - metadata: - name: ups-broker - spec: - url: http://ups-broker.${NAMESPACE}.svc.cluster.local -parameters: -- name: NAMESPACE diff --git a/test/extended/testdata/service_catalog/ups-deployment.yaml b/test/extended/testdata/service_catalog/ups-deployment.yaml deleted file mode 100644 index db6518935c27..000000000000 --- a/test/extended/testdata/service_catalog/ups-deployment.yaml +++ /dev/null @@ -1,67 +0,0 @@ ---- -apiVersion: v1 -kind: Template -metadata: - name: ups-deployment-template -objects: -- apiVersion: apps/v1 - kind: Deployment - metadata: - labels: - app: ups-broker - chart: ups-broker-0.0.1 - heritage: Tiller - release: ups-broker - name: ups-broker - namespace: "${NAMESPACE}" - spec: - replicas: 1 - selector: - matchLabels: - app: ups-broker - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 1 - type: RollingUpdate - template: - metadata: - creationTimestamp: null - labels: - app: ups-broker - chart: ups-broker-0.0.1 - heritage: Tiller - release: ups-broker - spec: - containers: - - args: - - -alsologtostderr - - --port - - "8080" - image: quay.io/kubernetes-service-catalog/user-broker:latest - imagePullPolicy: Always - livenessProbe: - failureThreshold: 3 - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - tcpSocket: - port: 8080 - timeoutSeconds: 2 - name: ups-broker - ports: - - containerPort: 8080 - protocol: TCP - readinessProbe: - failureThreshold: 1 - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - tcpSocket: - port: 8080 - timeoutSeconds: 2 - dnsPolicy: ClusterFirst - restartPolicy: Always - terminationGracePeriodSeconds: 30 -parameters: -- name: NAMESPACE diff --git a/test/extended/testdata/service_catalog/ups-instance.yaml b/test/extended/testdata/service_catalog/ups-instance.yaml deleted file mode 100644 index 0ba112f785a3..000000000000 --- a/test/extended/testdata/service_catalog/ups-instance.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: v1 -kind: Template -metadata: - name: upsInstance-template -objects: -- apiVersion: servicecatalog.k8s.io/v1beta1 - kind: ServiceInstance - metadata: - name: ups-instance - namespace: "${NAMESPACE}" - spec: - clusterServiceClassExternalName: user-provided-service - clusterServicePlanExternalName: default -parameters: -- name: NAMESPACE diff --git a/test/extended/testdata/service_catalog/ups-service.yaml b/test/extended/testdata/service_catalog/ups-service.yaml deleted file mode 100644 index 3d25c6cd9953..000000000000 --- a/test/extended/testdata/service_catalog/ups-service.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -apiVersion: v1 -kind: Template -metadata: - name: ups-service-template -objects: -- apiVersion: v1 - kind: Service - metadata: - labels: - app: ups-broker - chart: ups-broker-0.0.1 - heritage: Tiller - release: ups-broker - name: ups-broker - namespace: "${NAMESPACE}" - spec: - ports: - - port: 80 - protocol: TCP - targetPort: 8080 - selector: - app: ups-broker - sessionAffinity: None - type: ClusterIP -parameters: -- name: NAMESPACE