Skip to content

Commit 30da892

Browse files
author
Nathan Jones
committed
Merge branch 'v2-master' into user-favorites-e2e
* v2-master: (722 commits) When no space quota has been assigned fall back on more realistive quota (#3541) Fix three user provided service create/edit stepper bugs (#3545) Fix SSO connect button not enabled Return default unknown endpoint type (#3517) Metrics chart is in the SUSE repository Ensure we have docker registry variables Fix registry change Final change Fix nav icon Ensure PR uses new branch Last fix Remove upstream specific #4 Add helm chart PR creation Remove upstream specific #3 Remove upstream specific #2 Remove upstream specific #1 Tweak side nav icon padding to align with tabs header Don't log key Fix upload of helm chart More tweaks ...
2 parents dd00b8c + 36e43a3 commit 30da892

File tree

2,195 files changed

+29585
-13964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,195 files changed

+29585
-13964
lines changed

.cfignore

+1
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ deploy/stratos-ui-release/
2020
deploy/uaa/
2121
docs/
2222
build/dev_config.json
23+
e2e-reports/

.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ indent_size=2
2828
[*.md]
2929
max_line_length = off
3030
trim_trailing_whitespace = false
31+
32+
[*.html]
33+
max_line_length = 120

.gitignore

+16-11
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ deploy/hsc-upgrade-volume/
6666
deploy/development.rc
6767
deploy/ci/secrets.yml
6868
deploy/kubernetes/values.yaml
69+
deploy/kubernetes/helm-chart/
6970
deploy/cloud-foundry/db-migration/goose
7071
outputs/
7172
deploy/kubernetes/console/charts/
@@ -92,18 +93,22 @@ src/jetstream/config.properties
9293

9394
# Customisations
9495

95-
src/frontend/favicon.ico
96-
src/frontend/sass/custom.scss
97-
src/frontend/assets/eula.html
98-
src/frontend/assets/logo.png
99-
src/frontend/assets/nav-logo.png
100-
src/frontend/assets/login-bg.jpg
101-
src/frontend/app/custom-import.module.ts
102-
src/frontend/app/custom
103-
src/frontend/assets/custom
104-
src/frontend/sass/custom
105-
src/frontend/index.html
96+
src/frontend/packages/core/favicon.ico
97+
src/frontend/packages/core/sass/custom.scss
98+
src/frontend/packages/core/assets/eula.html
99+
src/frontend/packages/core/assets/logo.png
100+
src/frontend/packages/core/assets/nav-logo.png
101+
src/frontend/packages/core/assets/login-bg.jpg
102+
src/frontend/packages/core/src/custom-import.module.ts
103+
src/frontend/packages/core/src/custom
104+
src/frontend/packages/core/assets/custom
105+
src/frontend/packages/core/sass/custom
106+
src/frontend/packages/core/src/index.html
106107

107108
# Prebuild package
108109

109110
stratos-frontend-prebuild.zip
111+
112+
src/frontend/assets
113+
src/frontend/sass
114+
go-vendor-*.tgz

.travis.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
before_script:
4040
- curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
4141
- chmod +x ~/bin/gimme
42-
- eval "$(gimme 1.9)"
42+
- eval "$(gimme 1.12.4)"
4343
- go get -u golang.org/x/lint/golint
4444
script:
4545
- golint src/jetstream/...
@@ -49,14 +49,13 @@ jobs:
4949
env:
5050
- CI_ENV=true
5151
script:
52-
- npm test
52+
- npm run test
5353
- npm run codecov
5454
- name: Backend Unit Tests
5555
before_script:
5656
- curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
5757
- chmod +x ~/bin/gimme
58-
- eval "$(gimme 1.9)"
59-
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
58+
- eval "$(gimme 1.12.4)"
6059
script:
6160
- npm run test-backend
6261
- name: Helm Chart Unit Tests

CHANGELOG.md

+47-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,55 @@
11
# Change Log
22

3+
## 2.4.0
4+
5+
[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.3.0...2.4.0)
6+
7+
This release contains a number of fixes and improvements:
8+
9+
**Fixes:**
10+
11+
- Fix issue where org level user lists shows space roles from other orgs [\#3399](https://github.com/cloudfoundry-incubator/stratos/pull/3399)
12+
- Fix service broker action [\#3427](https://github.com/cloudfoundry-incubator/stratos/pull/3427)
13+
- Service plan cost truncated in first service display [\#3431](https://github.com/cloudfoundry-incubator/stratos/issues/3431)
14+
- Fix 'unknown locale' error message when viewing service plans [\#3447](https://github.com/cloudfoundry-incubator/stratos/pull/3447)
15+
- Fix Gitlab deploy step [\#3469](https://github.com/cloudfoundry-incubator/stratos/pull/3469)
16+
- Ensure Service Instance counts are correct [\#3448](https://github.com/cloudfoundry-incubator/stratos/pull/3448)
17+
- Fix multiple app stats requests on org & space summary pages [\#3451](https://github.com/cloudfoundry-incubator/stratos/pull/3451)
18+
19+
**Improvements:**
20+
- Change Side Navigation [\#3449](https://github.com/cloudfoundry-incubator/stratos/pull/3449)
21+
- Use side nav instead of top tabs throughout [\#3289](https://github.com/cloudfoundry-incubator/stratos/pull/3289)
22+
- Add support for inviting users to an org or space [\#3377](https://github.com/cloudfoundry-incubator/stratos/pull/3377)
23+
- Add support for User Favourites [\#3255](https://github.com/cloudfoundry-incubator/stratos/pull/3255)
24+
- Add support for User Provided Service Instances [\#3415](https://github.com/cloudfoundry-incubator/stratos/pull/3415)
25+
- Autocomplete git repository name [\#3372](https://github.com/cloudfoundry-incubator/stratos/pull/3372)
26+
- Scale Users in CF Summary section [\#3371](https://github.com/cloudfoundry-incubator/stratos/pull/3371)
27+
- Allow Stratos to be configured with via a User Provided Service [\#3405](https://github.com/cloudfoundry-incubator/stratos/pull/3405)
28+
- Update front-end to Angular 7 [\#3418](https://github.com/cloudfoundry-incubator/stratos/pull/3418)
29+
- Also show forked repositories when suggesting GitHub repositories in deploy app [\#3403](https://github.com/cloudfoundry-incubator/stratos/pull/3403)
30+
- Hide User Favorites when using SQLite [\#3419](https://github.com/cloudfoundry-incubator/stratos/pull/3419)
31+
- Hide Endpoints Page when using SQLite [\#3463](https://github.com/cloudfoundry-incubator/stratos/pull/3463)
32+
- Add card view to endpoint list [\#3422](https://github.com/cloudfoundry-incubator/stratos/pull/3422)
33+
- Add support for endpoint sub type \(and metadata\) [\#3423](https://github.com/cloudfoundry-incubator/stratos/pull/3423)
34+
- Add tile selector to register endpoint stepper [\#3432](https://github.com/cloudfoundry-incubator/stratos/pull/3432)
35+
- Add cf/org/space links to service instance table using common components [\#3436](https://github.com/cloudfoundry-incubator/stratos/pull/3436)
36+
- Add a user provided service instance tab & list to the space page [\#3443](https://github.com/cloudfoundry-incubator/stratos/pull/3443)
37+
- Ensure unknown endpoint types are handled correctly [\#3445](https://github.com/cloudfoundry-incubator/stratos/pull/3445)
38+
- Add created and updated dates to organization/space summary [\#3460](https://github.com/cloudfoundry-incubator/stratos/pull/3460)
39+
- Add support for slide-in side help and write in to endpoint connect dialog [\#3433](https://github.com/cloudfoundry-incubator/stratos/pull/3433)
40+
- Improve no users message [\#3327](https://github.com/cloudfoundry-incubator/stratos/issues/3327)
41+
342
## 2.3.0
443

544
[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.2.0...2.3.0)
645

46+
### Important Security Fixes
47+
48+
This release fixes two CVEs identified in Stratos related to the Session Cookie - we recommend you update to 2.3.0.
49+
50+
* [CVE-2019-3783: Stratos Deploys With Public Default Session Store Secret](https://www.cloudfoundry.org/blog/cve-2019-3783)
51+
* [CVE-2019-3784: Stratos contains a Session Collision Vulnerability](https://www.cloudfoundry.org/blog/cve-2019-3784/)
52+
753
This release contains a number of fixes and improvements:
854

955
**Fixes:**
@@ -324,7 +370,7 @@ This is the first release candidate of Version 2 of Stratos.
324370
The main focus of this release are bug fixes for release.
325371

326372
**Improvements:**
327-
- Add ingress example and docs for kubernetes deloyment [\#2510](https://github.com/cloudfoundry-incubator/stratos/pull/2510)
373+
- Add ingress example and docs for kubernetes deployment [\#2510](https://github.com/cloudfoundry-incubator/stratos/pull/2510)
328374

329375
**Fixed bugs:**
330376
- Fix for app count being stuck after adding an app in org card [\#2511](https://github.com/cloudfoundry-incubator/stratos/pull/2511)

0 commit comments

Comments
 (0)