Merge pull request #11 from cloudfoundry-incubator/v2-master

Merge upstream master

Author: Irfan Habib

.gitignore

@@ -90,6 +90,7 @@ src/backend/app-core/load_plugins.go
 *.bak
 secrets.yaml
 build/dev_config.json
+e2e-reports/
 
 # Customisations
 

.travis.yml

@@ -7,10 +7,16 @@ services:
 - docker
 addons:
   chrome: stable
+  artifacts:
+    paths:
+    - ./e2e-reports
+    target_paths:
+    - e2e
+    debug: true
 before_install:
- - export DISPLAY=:99.0
- - sh -e /etc/init.d/xvfb start
- - sleep 3 # give xvfb some time to start  
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
+- sleep 3 # give xvfb some time to start  
 install:
 - npm install [email protected] -g
 - npm install
@@ -19,19 +25,20 @@ branches:
   only:
   - master
   - v2-master
+  - e2e-tests
 cache:
   directories:
   - "$HOME/.npm"
   - "$HOME/.cache"
   - node_modules
 stages:
-  - Frontend Lint
-  - Frontend Unit Tests
-  - Backend
-  - name: E2E tests
-    if: type != pull_request
-  - name: E2E tests quick
-    if: type != pull_request OR head_branch =~ ^(?i:e2e)-.*$
+- Frontend Lint
+- Frontend Unit Tests
+- Backend
+- name: E2E tests
+  if: type != pull_request
+- name: E2E tests quick
+  if: type != pull_request OR head_branch =~ ^(?i:e2e)-.*$
 jobs:
   include:
   - stage: Frontend Lint

CHANGELOG.md

@@ -1,4 +1,46 @@
 # Change Log
+## 2.0.0 Release Candidate 2
+[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.0.0-rc1...2.0.0-rc2)
+
+**Improvements:**
+- Use consistent icons [\#2517](https://github.com/cloudfoundry-incubator/stratos/pull/2517)
+- Allow configuration of backend log level [\#2533](https://github.com/cloudfoundry-incubator/stratos/pull/2533)
+
+
+**Fixes:**
+- CF/Org/Space selector widget with 1 org and 1 space - user can not proceed [\#2467](https://github.com/cloudfoundry-incubator/stratos/issues/2467)
+- Error after creating a service instance [\#2473](https://github.com/cloudfoundry-incubator/stratos/issues/2473)
+- Visit App button never appears when a route is mapped/created [\#2518](https://github.com/cloudfoundry-incubator/stratos/issues/2518)
+- Cannot create service instance from marketplace or service pages [\#2519](https://github.com/cloudfoundry-incubator/stratos/issues/2519)
+- Upgrading from v1 to v2 via helm disconnects connected endpoints [\#2527](https://github.com/cloudfoundry-incubator/stratos/issues/2527)
+- Failed to deploy app due to invalid client ID [\#2532](https://github.com/cloudfoundry-incubator/stratos/issues/2532)
+- Exception thrown when creating space [\#2560](https://github.com/cloudfoundry-incubator/stratos/issues/2560)
+- Helm deployment: Upgrade notice can appear for some time if db takes a while to become ready [\#2546](https://github.com/cloudfoundry-incubator/stratos/issues/2546)
+- Fix assign role for non-admin connected user [\#2562](https://github.com/cloudfoundry-incubator/stratos/pull/2562)
+- Fix client and client secret issues when pushing apps [\#2553](https://github.com/cloudfoundry-incubator/stratos/pull/2553)
+- Fix Docker All-in-one image build [\#2552](https://github.com/cloudfoundry-incubator/stratos/pull/2552)
+- Clean entity service [\#2551](https://github.com/cloudfoundry-incubator/stratos/pull/2551)
+- Remove base git package to address CVE 2018-11235 [\#2530](https://github.com/cloudfoundry-incubator/stratos/pull/2530)
+- Entity deletion: Remove child entities [\#2486](https://github.com/cloudfoundry-incubator/stratos/pull/2486)
+
+
+## 2.0.0 Release Candidate 1
+[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.0.0-beta-002...2.0.0-RC-1)
+
+This is the first release candidate of Version 2 of Stratos.
+
+The main focus of this release are bug fixes for release.
+
+**Improvements:**
+- Add ingress example and docs for kubernetes deloyment [\#2510](https://github.com/cloudfoundry-incubator/stratos/pull/2510)
+
+**Fixed bugs:**
+- Fix for app count being stuck after adding an app in org card [\#2511](https://github.com/cloudfoundry-incubator/stratos/pull/2511)
+- Create service instance after connecting a new endpoint did not fetch organisation [\#2472](https://github.com/cloudfoundry-incubator/stratos/issues/2472)
+- Fixed an issue where we failed to store response from 1 or more endpoints [\#2513](https://github.com/cloudfoundry-incubator/stratos/pull/2513)
+- Ensure `Remove User` confirmation modal contains correct role prefix [\#2508](https://github.com/cloudfoundry-incubator/stratos/pull/2508)
+- Fix route schema [\#2506](https://github.com/cloudfoundry-incubator/stratos/pull/2506)
+- Fixes state reset issue when creating a service instance from different modes [\#2515](https://github.com/cloudfoundry-incubator/stratos/pull/2515)
 
 ## 2.0.0 Beta 2
 [Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/v2.0.0-beta-001...2.0.0-beta-002)

deploy/Dockerfile.all-in-one

@@ -1,22 +1,25 @@
 FROM splatform/stratos-aio-base:opensuse
 
-COPY *.json ./
-COPY gulpfile.js ./
-COPY src ./src
-COPY build ./build/
-COPY deploy/tools/generate_cert.sh generate_cert.sh
-COPY deploy/db deploy/db
-COPY deploy/all-in-one/config.all-in-one.properties config.properties
+COPY --chown=stratos:users *.json ./
+COPY --chown=stratos:users gulpfile.js ./
+COPY --chown=stratos:users src ./src
+COPY --chown=stratos:users build ./build/
+COPY --chown=stratos:users deploy/tools/generate_cert.sh generate_cert.sh
+COPY --chown=stratos:users deploy/db deploy/db
+COPY --chown=stratos:users deploy/all-in-one/config.all-in-one.properties config.properties
 
 RUN npm install \
-    && npm run build \
+    && npm run build-cf \
     && npm run build-backend \
     && npm run deploy-cf
 
 # Generate dev-certs
-RUN CERTS_PATH=/go/dev-certs ./generate_cert.sh \
+RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh \
     && chmod +x portal-proxy
 
 EXPOSE 443
 
+# Need to be root to bind to port 443
+USER root
+
 ENTRYPOINT ["./portal-proxy"]

deploy/Dockerfile.bk

@@ -40,4 +40,4 @@ ENTRYPOINT ["/entrypoint.sh"]
 
 # use --target=dev-build to build backend image for docker-compose
 FROM prod-build as dev-build
-COPY dev-certs dev-certs
+RUN CERTS_PATH=dev-certs /generate_cert.sh 

deploy/all-in-one/Dockerfile

@@ -13,9 +13,13 @@ You will need to have installed Docker, see:
 To build the container, change directory to the root of the project and open a command prompt:
 
 ```
-docker build -f deploy/all-in-one/Dockerfile . -t stratos
+docker build -f deploy/Dockerfile.all-in-one . -t stratos
 ```
 
+> Note: The Dockerfile for all-in-one is in the `deploy` folder and not the `deploy/all-in-one` folder.
+
+> Note: If you are using Docker for Macand you get an error 137 when building, you should increase the memory available to Docker (via Preferences > Advanced) and try again.
+
 Bring up the container with:
 
 ```
@@ -26,4 +30,4 @@ Stratos should now be accessible at the following URL:
 
 https://localhost:4443
 
-To login use the following credentials detailed [here](../../docs/access.md).
+You will be presented with the Stratos Setup welcome screen - you will need to enter your UAA information to configure Stratos. Once complete, you will be able to login with your credentials.

deploy/all-in-one/README.md

@@ -1,3 +1,12 @@
+---
+resource_types:
+- name: docker-image
+  type: docker-image
+  privileged: true
+  source:
+    repository: ((docker-image-resource))
+    tag: ((docker-image-resource-tag))
+
 resources:
 - name: stratos
   type: git
@@ -17,6 +26,56 @@ resources:
     start: 12:00 AM
     stop: 2:00 AM
     location: UTC
+    # Docker Images
+- name: jetstream-dc-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-org))/stratos-dc-jetstream
+- name: dc-db-migrator-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-org))/stratos-dc-db-migrator
+- name: mariadb-dc-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-org))/stratos-dc-mariadb
+- name: ui-dc-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-org))/stratos-dc-console
+- name: jetstream-helm-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-org))/stratos-jetstream
+- name: postflight-helm-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-org))/stratos-postflight-job
+- name: mariadb-helm-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-org))/stratos-mariadb
+- name: ui-helm-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-org))/stratos-console
+
 groups:
 - name: tests
   jobs:
@@ -30,33 +89,61 @@ jobs:
   - get: stratos
   - get: after-midnight
     trigger: true
-  - do:
-    - task: generete-certs
-      timeout: 2m
-      file: stratos/deploy/ci/tasks/build-images/generate-certs.yml
-    - task: build
-      privileged: true
-      timeout: 30m
-      file: stratos/deploy/ci/tasks/build-images/build-helm.yml
-      params:
-        DOCKER_USERNAME: ((docker-username))
-        DOCKER_PASSWORD: ((docker-password))
+  - aggregate:
+    - do:
+      - put: jetstream-helm-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.bk
+          build: stratos/
+          target_name:  prod-build
+          tag_as_latest: true
+      - put: postflight-helm-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.bk
+          build: stratos/
+          target_name:  postflight-job
+          tag_as_latest: true
+      - put: mariadb-helm-image
+        params:
+          dockerfile: stratos/deploy/db/Dockerfile.mariadb
+          build: stratos/deploy/db
+          tag_as_latest: true
+      - put: ui-helm-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.ui
+          build: stratos/
+          target_name: prod-build
+          tag_as_latest: true
 - name: build-dc-images
   plan:
   - get: stratos
   - get: after-midnight
     trigger: true
-  - do:
-    - task: generete-certs
-      timeout: 2m
-      file: stratos/deploy/ci/tasks/build-images/generate-certs.yml
-    - task: build
-      privileged: true
-      timeout: 30m
-      file: stratos/deploy/ci/tasks/build-images/build-dc.yml
-      params:
-        DOCKER_USERNAME: ((docker-username))
-        DOCKER_PASSWORD: ((docker-password))
+  - aggregate:
+    - do:
+      - put: jetstream-dc-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.bk
+          build: stratos/
+          target_name:  dev-build
+          tag_as_latest: true
+      - put: dc-db-migrator-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.bk
+          build: stratos/
+          target_name:  db-migrator
+          tag_as_latest: true
+      - put: mariadb-dc-image
+        params:
+          dockerfile: stratos/deploy/db/Dockerfile.mariadb
+          build: stratos/deploy/db
+          tag_as_latest: true
+      - put: ui-dc-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.ui
+          build: stratos/
+          target_name: prod-build
+          tag_as_latest: true
 
 - name: build-aio-image
   public: true

deploy/ci/build-images.yml

@@ -74,6 +74,8 @@ jobs:
   - do:
     - task: generate-tag
       file: stratos/deploy/ci/tasks/dev-releases/generate-tag-files.yml
+      params:
+        TAG_SUFFIX: ((tag-suffix))
     - put: image-tag
       params:
         file: image-tag/*.tar
@@ -139,8 +141,8 @@ jobs:
       params:
         GIT_USER: ((concourse-user))
         GIT_EMAIL: ((concourse-email))
-        GITHUB_ORG: ((github-organization))
-        GITHUB_REPO: ((github-repository))
+        GITHUB_ORG: ((helm-repo-github-organization))
+        GITHUB_REPO: ((helm-repo-github-repository))
         GIT_PRIVATE_KEY: ((github-private-key))
         DOCKER_ORG: ((artifact-docker-organization))
         DOCKER_REGISTRY: ((artifact-docker-registry))

deploy/ci/console-dev-releases.yml

@@ -25,6 +25,8 @@ run:
       source ${STRATOS}/deploy/ci/tasks/dev-releases/create-chart-helper.sh
       HELM_REPO=${ROOT_DIR}/helm-repo/${HELM_REPO_PATH}
       GIT_TAG=$(cat image-tag/v2-alpha-tag)
+      # Required for setupAndPushChange commit message
+      IMAGE_TAG=${GIT_TAG}
       cd ${STRATOS}/deploy/kubernetes/
       patchHelmChart ${GIT_TAG} ${DOCKER_ORG} ${DOCKER_REGISTRY} ./console