Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #392

Merged
merged 84 commits into from
Jun 23, 2020
Merged
Changes from 1 commit
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
052d53a
WIP
richard-cox May 21, 2020
cc35806
First pass at permission effects
richard-cox May 22, 2020
94135c1
First pass at reducer
richard-cox May 22, 2020
eca176d
Final set of cloud-foundry code out of common
richard-cox May 26, 2020
790b889
Renames, todos
richard-cox May 27, 2020
5f12456
Minor fixes
richard-cox May 27, 2020
62248fc
Fix unit tests
richard-cox May 27, 2020
4814eec
Tweaks
richard-cox May 28, 2020
bd60914
Merge remote-tracking branch 'origin/master' into filemoves-permissions
richard-cox May 28, 2020
7a584a8
Finish todos
richard-cox May 28, 2020
5093799
Fix transition from space summary to app summary page
richard-cox May 28, 2020
ac762cd
Add comment, tidy up rootUpdatingKey
richard-cox May 28, 2020
6e7576a
Fix issue where gitlab summary tab threw errors in console
richard-cox May 28, 2020
8c09aed
Fix misaligned user button
richard-cox May 28, 2020
4d33c4d
Temporarily add branch v3.2.1 to travis
richard-cox May 29, 2020
839cc2f
check sso whitelist in more places
bengerman13 May 21, 2020
28920c0
refactor sso state checks into single function
bengerman13 May 21, 2020
87c6bf8
Update version
richard-cox May 29, 2020
4ede977
First pass at changelog (additional SSO fix required)
richard-cox May 29, 2020
da89276
Merge pull request #4328 from cloudfoundry/sso-whitelist
richard-cox May 29, 2020
e970d88
Update changelog
richard-cox May 29, 2020
ca4f7be
Merge pull request #4329 from cloudfoundry/v3.2.1-release-notes
richard-cox May 29, 2020
4b037b2
Push combine of permission configs into checkers
richard-cox May 29, 2020
d9deb52
Fix issue where default add/remove setting in change role by username…
richard-cox May 29, 2020
a3c17c1
Merge remote-tracking branch 'origin/fix-add-remove-role-by-username'…
richard-cox May 29, 2020
c82a8a8
Merge remote-tracking branch 'origin/master' into entity-service-fixes
richard-cox Jun 1, 2020
eceb2c3
Fix store-test-helper
richard-cox Jun 1, 2020
798eed7
Merge remote-tracking branch 'origin/v3.2.1' into merge-v3.2.1
richard-cox Jun 1, 2020
80ad363
Fix package-lock.json
richard-cox Jun 1, 2020
36670d2
Remove v3.2.1 was .travis.taml
richard-cox Jun 1, 2020
9dab0de
Merge pull request #4337 from cloudfoundry/merge-v3.2.1
richard-cox Jun 1, 2020
e01405d
Merge remote-tracking branch 'origin/master' into filemoves-permissions
richard-cox Jun 1, 2020
dd578a1
Merge remote-tracking branch 'origin/master' into entity-service-fixes
richard-cox Jun 1, 2020
6447b3b
Remove need for --recreate-pods when upgrading
nwmac Jun 1, 2020
a0fbb70
Update readme following move to Travis-ci.com
nwmac Jun 1, 2020
ac76942
Add support for helm chart customizations
nwmac Jun 2, 2020
799124c
Removed change not needed
nwmac Jun 2, 2020
9011c81
Ensure the correct key is used metacard favourite info (#4321)
richard-cox Jun 2, 2020
0741ba6
Merge pull request #4340 from cloudfoundry/travisci-com-move
richard-cox Jun 2, 2020
5a76775
Merge pull request #4339 from cloudfoundry/helm-recreate-pods
richard-cox Jun 2, 2020
c1c46ae
Merge remote-tracking branch 'origin/master' into fix-git-summary
richard-cox Jun 2, 2020
630f2b5
Fix display of details in endpoint card in endpoint list (#4319)
richard-cox Jun 2, 2020
16fff4d
Merge remote-tracking branch 'origin/master' into fix-add-remove-role…
richard-cox Jun 2, 2020
f4d6df9
Clean default/blocked logic
richard-cox Jun 2, 2020
8e08234
Merge pull request #4320 from cloudfoundry/entity-service-fixes
richard-cox Jun 2, 2020
4c92c83
Rename @stratos to @stratosui
nwmac Jun 2, 2020
8828d89
FIx references in tsconfig.json
nwmac Jun 2, 2020
65a69a9
Merge pull request #4326 from cloudfoundry/fix-git-summary
richard-cox Jun 2, 2020
c3bcc93
Merge pull request #4334 from cloudfoundry/fix-add-remove-role-by-use…
richard-cox Jun 3, 2020
d7bb6fa
Merge pull request #4341 from cloudfoundry/stratosui
richard-cox Jun 3, 2020
44716d3
Merge remote-tracking branch 'origin/master' into filemoves-permissions
richard-cox Jun 3, 2020
75d0f4f
Fix endpoint connect
richard-cox Jun 3, 2020
74f5d93
Fix unit test
richard-cox Jun 3, 2020
df2a958
Fix e2e test
richard-cox Jun 3, 2020
619e9b3
Change following review #1
richard-cox Jun 4, 2020
01d5025
Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstre…
dependabot-preview[bot] Jun 4, 2020
cf3a004
Fix errors in console log during setup screens
nwmac Jun 4, 2020
0fca667
Helm: Change default image pull policy to Always
nwmac Jun 4, 2020
29a1887
Add copy address and edit to endpoint list view
nwmac Jun 4, 2020
6930b23
Use icon that is less confusing with refresh
nwmac Jun 4, 2020
4d21e5a
Change following review #2
richard-cox Jun 4, 2020
ac2e441
Add newline at end for codeclimate
nwmac Jun 4, 2020
1799e8e
Fix for buildpack filename wrapping on card
nwmac Jun 4, 2020
afb9df2
Fix code climate issue
nwmac Jun 4, 2020
cfb64d5
Update endpoint-list.helpers.ts
nwmac Jun 4, 2020
2ac957e
Improve naming
nwmac Jun 4, 2020
b814838
Tidy up
nwmac Jun 4, 2020
5be880b
Merge pull request #4314 from cloudfoundry/filemoves-permissions
richard-cox Jun 5, 2020
7d2946e
Merge pull request #4345 from cloudfoundry/image-pull-policy
richard-cox Jun 5, 2020
d3c1160
Merge pull request #4344 from cloudfoundry/fix-setup-console-log
richard-cox Jun 5, 2020
5918989
Change following review
richard-cox Jun 5, 2020
09c16da
Merge remote-tracking branch 'origin/master' into endpoint-list-actions
richard-cox Jun 5, 2020
7ba4027
Merge pull request #4353 from cloudfoundry/recent-activity-icon
richard-cox Jun 5, 2020
cfb41b6
Merge pull request #4354 from cloudfoundry/fix-buildpack-filename-wra…
richard-cox Jun 5, 2020
6a4fbd8
Merge pull request #4350 from cloudfoundry/endpoint-list-actions
richard-cox Jun 5, 2020
531bd0d
Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream (#4336)
dependabot-preview[bot] Jun 5, 2020
d1237cc
[Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (#4356)
dependabot-preview[bot] Jun 8, 2020
a5d1de0
Fail CI build if imagelist generation fails
nwmac Jun 11, 2020
ead3453
Merge pull request #4364 from cloudfoundry/ci-imagelist
richard-cox Jun 16, 2020
f742503
Merge remote-tracking branch 'upstream/master' into merge-upstream
richard-cox Jun 16, 2020
fffb4d5
Updated __stratos.tpl as per changes in deploy/kubernetes/console/tem…
richard-cox Jun 16, 2020
dd758d5
Fix build
richard-cox Jun 17, 2020
f475dae
Helm Chart: Icon is missing
richard-cox Jun 17, 2020
cfb30b6
Fixes following review
richard-cox Jun 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions deploy/kubernetes/console/templates/__stratos.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,14 @@

# Extra env vars for the Jetstream Pod in deployment.yaml
{{- define "stratosJetstreamEnv" }}
- name: MONOCULAR_CRT_PATH
value: "/etc/monocular-certs/tls.crt"
- name: MONOCULAR_KEY_PATH
value: "/etc/monocular-certs/tls.key"
- name: MONOCULAR_CA_CRT_PATH
value: "/etc/monocular-certs/ca.crt"
- name: FDB_URL
value: "mongodb://{{ .Release.Name }}-fdbdoclayer:27016"
- name: SYNC_SERVER_URL
value: "http://{{ .Release.Name }}-chartsync:8080"
{{- end }}