Rebase master-next

README.md

@@ -137,21 +137,6 @@ Must set env vars `DOCKER_USER` and `DOCKER_PASSWORD` or have a valid `.dockercf
 ./build-docker-push.sh
 ```
 
-### Jenkins automation
-
-Master branch:
-
-* Runs a build, pushes an image to Quay tagged with the commit sha
-
-Pull requests:
-
-* Runs a build when PRs are created or PR commits are pushed
-* Comment with `Jenkins rebuild` to manually trigger a re-build
-* Comment with `Jenkins push` to push an image to Quay, tagged with:
-    `pr_[pr #]_build_[jenkins build #]`
-
-If changes are ever required for the Jenkins job configuration, apply them to both the [regular console job](https://jenkins-tectonic.prod.coreos.systems/job/console-build/) and [PR image job](https://jenkins-tectonic.prod.coreos.systems/job/console-pr-image/).
-
 ## Hacking
 
 See [CONTRIBUTING](CONTRIBUTING.md) for workflow & convention details.

cmd/bridge/main.go

@@ -31,6 +31,9 @@ const (
 	// Well-known location of Prometheus service for OpenShift. This is only accessible in-cluster.
 	openshiftPrometheusHost = "prometheus-k8s.openshift-monitoring.svc:9091"
 
+	// The tenancy service port (9092) performs RBAC checks for namespace-specific queries.
+	openshiftPrometheusTenancyHost = "prometheus-k8s.openshift-monitoring.svc:9092"
+
 	// Well-known location of Alert Manager service for OpenShift. This is only accessible in-cluster.
 	openshiftAlertManagerHost = "alertmanager-main.openshift-monitoring.svc:9094"
 )
@@ -262,6 +265,11 @@ func main() {
 				HeaderBlacklist: []string{"Cookie", "X-CSRFToken"},
 				Endpoint:        &url.URL{Scheme: "https", Host: openshiftPrometheusHost, Path: "/api"},
 			}
+			srv.PrometheusTenancyProxyConfig = &proxy.Config{
+				TLSClientConfig: monitoringProxyTLSConfig,
+				HeaderBlacklist: []string{"Cookie", "X-CSRFToken"},
+				Endpoint:        &url.URL{Scheme: "https", Host: openshiftPrometheusTenancyHost, Path: "/api"},
+			}
 			srv.AlertManagerProxyConfig = &proxy.Config{
 				TLSClientConfig: monitoringProxyTLSConfig,
 				HeaderBlacklist: []string{"Cookie", "X-CSRFToken"},

frontend/__mocks__/operatorHubItemsMocks.ts

@@ -307,6 +307,7 @@ export const operatorHubTileViewPageProps = {
   items: [
     {
       obj: amqPackageManifest,
+      installState: 'Installed',
       kind: 'PackageManifest',
       name: 'amq-streams',
       uid: 'amq-streams/openshift-operator-lifecycle-manager',
@@ -327,6 +328,7 @@ export const operatorHubTileViewPageProps = {
     },
     {
       obj: etcdPackageManifest,
+      installState: 'Not Installed',
       kind: 'PackageManifest',
       name: 'etcd',
       uid: 'etcd/openshift-operator-lifecycle-manager',
@@ -346,6 +348,7 @@ export const operatorHubTileViewPageProps = {
       categories: ['database'],
     },
     { obj: federationv2PackageManifest,
+      installState: 'Not Installed',
       kind: 'PackageManifest',
       name: 'federationv2',
       uid: 'federationv2/openshift-operator-lifecycle-manager',
@@ -365,6 +368,7 @@ export const operatorHubTileViewPageProps = {
       categories: [],
     },
     { obj: prometheusPackageManifest,
+      installState: 'Not Installed',
       kind: 'PackageManifest',
       name: 'prometheus',
       uid: 'prometheus/openshift-operator-lifecycle-manager',
@@ -384,6 +388,7 @@ export const operatorHubTileViewPageProps = {
       categories: ['monitoring', 'alerting'],
     },
     { obj: svcatPackageManifest,
+      installState: 'Not Installed',
       kind: 'PackageManifest',
       name: 'svcat',
       uid: 'svcat/openshift-operator-lifecycle-manager',
@@ -440,6 +445,8 @@ export const operatorHubTileViewPagePropsWithDummy = {
 export const filterCounts = {
   CoreOS: 1,
   'Red Hat': 4,
+  Installed: 1,
+  'Not Installed': 4,
 };
 
 export const operatorHubCategories = [

frontend/__tests__/components/operator-hub/operator-hub.spec.tsx

@@ -95,7 +95,7 @@ describe(OperatorHubTileView.displayName, () => {
     const filterItems = wrapper.find(FilterSidePanel.CategoryItem);
     expect(filterItems.exists()).toBe(true);
 
-    expect(filterItems.length).toBe(2); // Filter by Provider
+    expect(filterItems.length).toBe(4); // Filter by Provider and Install State
     filterItems.forEach((filter) => {
       expect(filter.props().count).toBe(filterCounts[_.split(filter.childAt(0).text(), '(')[0]]);
     });
@@ -107,14 +107,14 @@ describe(OperatorHubTileView.displayName, () => {
     const filterItemsChanged = wrapper.find(FilterSidePanel.CategoryItem);
     expect(filterItemsChanged.exists()).toBe(true);
 
-    expect(filterItemsChanged.length).toEqual(3); // Filter by Provider
+    expect(filterItemsChanged.length).toEqual(5); // Filter by Provider and Install State
 
     wrapper.setProps(operatorHubTileViewPageProps);
     wrapper.update();
     const filterItemsFinal = wrapper.find(FilterSidePanel.CategoryItem);
     expect(filterItemsFinal.exists()).toBe(true);
 
-    expect(filterItemsFinal.length).toEqual(2); // Filter by Provider
+    expect(filterItemsFinal.length).toEqual(4); // Filter by Provider and Install State
   });
 
   it('renders category tabs', () => {

frontend/__tests__/components/operator-lifecycle-manager/clusterserviceversion.spec.tsx

@@ -8,7 +8,7 @@ import * as _ from 'lodash-es';
 import { ClusterServiceVersionsDetailsPage, ClusterServiceVersionsDetailsPageProps, ClusterServiceVersionDetails, ClusterServiceVersionDetailsProps, ClusterServiceVersionsPage, ClusterServiceVersionsPageProps, ClusterServiceVersionList, ClusterServiceVersionHeader, ClusterServiceVersionRow, ClusterServiceVersionRowProps, CRDCard, CRDCardRow } from '../../../public/components/operator-lifecycle-manager/clusterserviceversion';
 import { ClusterServiceVersionKind, ClusterServiceVersionLogo, ClusterServiceVersionLogoProps, referenceForProvidedAPI, CSVConditionReason } from '../../../public/components/operator-lifecycle-manager';
 import { DetailsPage, ListPage, ListHeader, ColHead, List, ListInnerProps } from '../../../public/components/factory';
-import { testClusterServiceVersion, testModel } from '../../../__mocks__/k8sResourcesMocks';
+import { testClusterServiceVersion } from '../../../__mocks__/k8sResourcesMocks';
 import { Timestamp, MsgBox, ResourceLink, ResourceKebab, ErrorBoundary, LoadingBox, ScrollToTopOnMount, SectionHeading } from '../../../public/components/utils';
 import { referenceForModel } from '../../../public/module/k8s';
 import { ClusterServiceVersionModel } from '../../../public/models';
@@ -120,8 +120,6 @@ describe(ClusterServiceVersionLogo.displayName, () => {
   it('renders logo image from given base64 encoded image string', () => {
     const image: ReactWrapper<React.ImgHTMLAttributes<any>> = wrapper.find('img');
 
-    expect(image.props().height).toEqual('40');
-    expect(image.props().width).toEqual('40');
     expect(image.props().src).toEqual(`data:${testClusterServiceVersion.spec.icon.mediatype};base64,${testClusterServiceVersion.spec.icon.base64data}`);
   });
 
@@ -130,8 +128,6 @@ describe(ClusterServiceVersionLogo.displayName, () => {
     const fallbackImg: ReactWrapper<React.ImgHTMLAttributes<any>> = wrapper.find('img');
 
     expect(fallbackImg.props().src).toEqual(operatorLogo);
-    expect(fallbackImg.props().height).toEqual('40');
-    expect(fallbackImg.props().width).toEqual('40');
   });
 
   it('renders ClusterServiceVersion name and provider from given spec', () => {
@@ -181,22 +177,21 @@ describe(CRDCard.displayName, () => {
   const crd = testClusterServiceVersion.spec.customresourcedefinitions.owned[0];
 
   it('renders a card with title, body, and footer', () => {
-    const wrapper = shallow(<CRDCard.WrappedComponent crd={crd} csv={testClusterServiceVersion} kindObj={testModel} />);
+    const wrapper = shallow(<CRDCard canCreate={true} crd={crd} csv={testClusterServiceVersion} />);
 
     expect(wrapper.find('.co-crd-card__title').exists()).toBe(true);
     expect(wrapper.find('.co-crd-card__body').exists()).toBe(true);
     expect(wrapper.find('.co-crd-card__footer').exists()).toBe(true);
   });
 
   it('renders a link to create a new instance', () => {
-    const kindObj = _.cloneDeep({...testModel, verbs: ['create']});
-    const wrapper = shallow(<CRDCard.WrappedComponent crd={crd} csv={testClusterServiceVersion} kindObj={kindObj} />);
+    const wrapper = shallow(<CRDCard canCreate={true} crd={crd} csv={testClusterServiceVersion} />);
 
     expect(wrapper.find('.co-crd-card__footer').find(Link).props().to).toEqual(`/k8s/ns/${testClusterServiceVersion.metadata.namespace}/${ClusterServiceVersionModel.plural}/${testClusterServiceVersion.metadata.name}/${referenceForProvidedAPI(crd)}/new`);
   });
 
-  it('does not render link to create new instance if "create" not included in verbs for the model', () => {
-    const wrapper = shallow(<CRDCard.WrappedComponent crd={crd} csv={testClusterServiceVersion} kindObj={testModel} />);
+  it('does not render link to create new instance if `props.canCreate` is false', () => {
+    const wrapper = shallow(<CRDCard canCreate={false} crd={crd} csv={testClusterServiceVersion} />);
 
     expect(wrapper.find('.co-crd-card__footer').find(Link).exists()).toBe(false);
   });

frontend/integration-tests/protractor.conf.ts

@@ -4,16 +4,19 @@ import { Config, browser, logging } from 'protractor';
 import { execSync } from 'child_process';
 import * as HtmlScreenshotReporter from 'protractor-jasmine2-screenshot-reporter';
 import * as _ from 'lodash';
-import { TapReporter } from 'jasmine-reporters';
+import { TapReporter, JUnitXmlReporter } from 'jasmine-reporters';
 import * as ConsoleReporter from 'jasmine-console-reporter';
 import * as failFast from 'protractor-fail-fast';
+import { createWriteStream} from 'fs';
+import { format } from 'util';
 
 const tap = !!process.env.TAP;
 
 export const appHost = `${process.env.BRIDGE_BASE_ADDRESS || 'http://localhost:9000'}${(process.env.BRIDGE_BASE_PATH || '/').replace(/\/$/, '')}`;
 export const testName = `test-${Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 5)}`;
 
 const htmlReporter = new HtmlScreenshotReporter({dest: './gui_test_screenshots', inlineImages: true, captureOnlyFailedSpecs: true, filename: 'test-gui-report.html'});
+const junitReporter = new JUnitXmlReporter({savePath: './gui_test_screenshots', consolidateAll: true});
 const browserLogs: logging.Entry[] = [];
 
 export const config: Config = {
@@ -49,30 +52,20 @@ export const config: Config = {
   onPrepare: () => {
     browser.waitForAngularEnabled(false);
     jasmine.getEnv().addReporter(htmlReporter);
+    jasmine.getEnv().addReporter(junitReporter);
     if (tap) {
       jasmine.getEnv().addReporter(new TapReporter());
     } else {
       jasmine.getEnv().addReporter(new ConsoleReporter());
     }
   },
   onComplete: async() => {
-    console.log('BEGIN BROWSER LOGS');
+    const consoleLogStream = createWriteStream('gui_test_screenshots/browser.log', { flags: 'a' });
     browserLogs.forEach(log => {
       const {level, message} = log;
       const messageStr = _.isArray(message) ? message.join(' ') : message;
-      switch (level.name) {
-        case 'DEBUG':
-          console.log(level, messageStr);
-          break;
-        case 'SEVERE':
-          console.warn(level, messageStr);
-          break;
-        case 'INFO':
-        default:
-          console.info(level, messageStr);
-      }
+      consoleLogStream.write(`${format.apply(null, [`[${level.name}]`, messageStr])}\n`);
     });
-    console.log('END BROWSER LOGS');
 
     // Use projects if OpenShift so non-admin users can run tests. We need the fully-qualified name
     // since we're using kubectl instead of oc.
@@ -95,8 +88,7 @@ export const config: Config = {
     olm: ['tests/base.scenario.ts', 'tests/olm/descriptors.scenario.ts', 'tests/olm/catalog.scenario.ts', 'tests/olm/etcd.scenario.ts'],
     olmUpgrade: ['tests/base.scenario.ts', 'tests/olm/update-channel-approval.scenario.ts'],
     performance: ['tests/base.scenario.ts', 'tests/performance.scenario.ts'],
-    serviceCatalog: ['tests/base.scenario.ts', 'tests/service-catalog/service-catalog.scenario.ts', 'tests/service-catalog/service-broker.scenario.ts', 'tests/service-catalog/service-class.scenario.ts', 'tests/service-catalog/service-binding.scenario.ts'],
-    catalog: ['tests/base.scenario.ts', 'tests/catalog.scenario.ts'],
+    serviceCatalog: ['tests/base.scenario.ts', 'tests/service-catalog/service-catalog.scenario.ts', 'tests/service-catalog/service-broker.scenario.ts', 'tests/service-catalog/service-class.scenario.ts', 'tests/service-catalog/service-binding.scenario.ts', 'tests/developer-catalog.scenario.ts'],
     operatorHub: ['tests/base.scenario.ts', 'tests/operator-hub/operator-hub.scenario.ts'],
     overview: ['tests/base.scenario.ts', 'tests/overview/overview.scenario.ts'],
     e2e: ['tests/base.scenario.ts',
@@ -124,7 +116,7 @@ export const config: Config = {
       'tests/source-to-image.scenario.ts',
       'tests/deploy-image.scenario.ts',
       'tests/operator-hub/operator-hub.scenario.ts',
-      'tests/catalog.scenario.ts'],
+      'tests/developer-catalog.scenario.ts'],
   },
   params: {
     // Set to 'true' to enable OpenShift resources in the crud scenario.
@@ -157,3 +149,10 @@ export const waitForCount = (elementArrayFinder, expectedCount) => {
     return expectedCount >= actualCount;
   };
 };
+
+export const waitForNone = (elementArrayFinder) => {
+  return async() => {
+    const count = await elementArrayFinder.count();
+    return count === 0;
+  };
+};