Skip to content

Commit

Permalink
Merge Downstream (#3494)
Browse files Browse the repository at this point in the history
* Fix endpoint table --> card error

* Fix tidy up bug

* Add frontend endpoint sub types, wire up to k8s types
- Note - Missing k8s images pending review

* Update icon font

* Fix lint issue

* Update icons

* Fixed lint error, tweaked naming and access

* Allow endpoint types to reference common core endpoint auth types
- stops references of package code in common code
- prep for moving metrics into own package (just need to register metricType obj via decorators)

* Add images for k8s

* Kube dashboard

* Post merge fixes

* Updates

* Editor config change

* Applciation sub nav and sub nav changes

* Fix backend build script

* Fix helm module

* Add favorite to kube endpoint

* Fix endpoint card favorite star

* Remove unneeded favorite config

* Add API to determine if kube dashboard is installed

* Fix compilation issues

* Fix for endpoint favorite card when endpoint type is not known

* Add support for icon mode and a few tidy ups

* Add base kubernetes summary view

* WIP Kube summary charts

* Fix after merge

* Various fixes and tweaks

* Added simple usage chart and pod usage

* Add status graphs

* Little bit of tidy up on kube summary page

* Fix unit tests

* Tidy up kube summary

* Fix code climate issues

* Fix lint issue

* Fix merge issues

* Fix multiple app stats requests on org & space summary pages
- Recent changes to obs chains make them more emitty
- Ensure when we watch apps collection changes that we only fire stats off once

* Fix endpoint card details

* Update GKE given subtype changes

* Add smoother tile layout breakpoints
(once nav side bar changes come in there should be no cut off tile)

* Latest updates

* Add tab labels and icons

* Fix delete button missing and missing icon

* PR Fixes

* Remove warning on startup

* Changes following review

* Fixes and updates

* Fix compilation errors

* Temp fix for tables with cells that use `white-space: nowrap;` and have a loooong words

* Merge fixes

* chip pills are now not bold

* Endpoint status updates

* Disable connect of endpoint types that don't support it

* Sidenav icon

* Add helm status to endpoint lists
- Note - we may want to find another pluggable way of showing custom status text/icons

* Move view namespace in dashboard link to own column, only show if we have the dashboard

* Add loading indicator to k8s summary page to avoid graph flicker

* Split out yaml overrides into second step in install helm chart
- moved step1 into core step as there's not a lot of code
- could also split out name/namespace

* Update all metrics icons to `equalizer`

* Release status & ensure all GetAllEndpoints actions result in a GetSystemSuccess
- use same endpoint status on helm/releases as endpoint list
- we were using the GetAllEndpoints action when working with lists of endpoints..
however this actually did nothing. Now we fire off a GetSystemSuccess whenever
we dispatch GetAllEndpoints

* Remove pod image & tag columns, add `Ready Containers` using `containerStatuses`

* Various updates

* Fix endpoint notification. Tidy up logging

* Add helm versions list to helm config tab

* Also show 'not installed' in helm config versions table

* Fix release resource parsing

* Add pods page & list to helm release page

* Add majority of helm release services page & list
Only thing missing should be the populate of fields in the card, the data is available though just a bit of wiring needed

* susecon script

* Tidy up kube summary page

* Tweaks/Fixes to Helm Release Services

* Tidy up release loading indicators

* Ensure all padding is consistent with dashboard component

* Add services view to kubernetes namespace page
- to do so made base kube services list config and data source classes
- Tweaked kuberetes 'application' name to be inline with labels on how to get there

* Minor improvements regarding kube/helm row uniqueness. Handle helm errors better

* Show helm release service cards quicker

* Only show install button if we have connected k8s & only show connected k8s in install stepper

* Improve helm install yaml overrides text box
- onEnterOverrides unglyness needed due to..
  - size of textbox not autosizing properly
  - visuals of textbox without focus not so nice

* fetchHelmReleaseFromKubernetes --> fetchHelmReleaseServiceFromKubernetes

* Update kube service info when refreshing helm release service list

* Add service link in helm release services list
- will not show as link in other services lists

* Fix sub header title with url param

* Fix no-margin style name change

* Status updates

* Add base step to application creation.

* CC Fixes

* E2e fixes

* Unit test fixes

* Unit test fix

* Unit test fix

* Change cf favorite deploy menu item to create

* Fix home page margins

* Fix kubeService$ error on start up
- works fine, just the compiler being strict

* Add wait for release status to release summary loading indicator
- also unsub from pod data chain

* Fix deleting indicator on helm release page

* Removed debug console.log

* Tidy up helm release summary tab

* Make the kube summary layout reusable and apply to helm release summary

* Improve helm views incluing release and chart summary

* Missed file updates

* Added theme for entity title summary component

* Tighten up the side nav and revert hover change

* Added icon mode to new nav

* Fix mobile nav closing

* WIP

* Impove sidenav auto hiding

* WIP

* Fix unit tests

* Fix auth type select width

* Fix side nav on firefox

* Improve sidenav styling

* Overflow fix for nav top section

* Fix e2e tests, add one more for connect in stepper

* Small tidies/fixes

* helm install reduxing

* Remove HelmReleaseLinkComponent and use cellDefinition link config

* Remove unused HelmRepositoryCountComponent

* Improve typing

* fix imports

* Use common page size with defaultHelmKubeListPageSize

* small tidy ups

* Changes following review

* Small fixes, cater for endpoints that don't require connecting when showing 'no connected' snackbard

* Ensure health check respects doesNotSupportConnect

* more minor tidy ups

* Use app-no-content-message in release notes & values pages

* Fix and use common `unique` function for helm entities & data sources

* minor tidyups

* More fixes
- ensure all helm & kube entity & row unique functions are correct
- update some lists to use valuePath instead of getValue
- typo fixes
- note on dashboard & margin bug
- comment out some todos

* Improve kube typing and use common getKubeAPIResourceGuid

* Re-add shared connection icon to endpoint name
- TODO: add to endpoint card

* Show shared connection notification in endpoint card

* Fix endpoint checking label

* Show cancel/close button on connect endpoint dialog
- if the cf is dodgy and not responding the user should be able to exit the modal

* Fix lint errors

* Fix test compile

* Fix unit tests - Round 1

* Avoid close-->cancel blip on successful connection

* Fix unit tests - Round 2

* Fix unit tests - Round 3

* Fix unit tests - Round 4

* Removed sanitise todo, which happens in [innerHTML]

* Bump go version to 1.12 in travis tests

* Imporve endpoint connect step messaging

* Minor text change to connect endpoint step

* Add plugin info to the info call

* Remove reuse component override on monocular page

* Fix no margin class

* Ensure we don't try to fetch sub nav items too many times

* Remove console log

* User Invite tweaks and helm support

* Fix side nav help

* Fix sidenav help overflow

* Address/update todos

* Address review comments

* Disable demo menu action if plugin is disabled

* Disable helm (see #150)

* Remove unused uiFullView

* Disable kube dashboard functionality via plugin config setting
- plugin config - `kubeDashboardEnabled`
- ensure we don't check to see if dashboard installed in kube if dashboard functionality is disabled
- fix kube service ports (can be used in kube namespace servies list even without helm module)

* Fix lint issues

* Fix finnish as cancel & e2e tests

* Fix metrics e2e test

* Minor fixes

* e2e fixes - Changes to reflect tabs to side and new sub header with action items

* Fix locator

* More specific selector

* Fix merge issues

* Add disabled state to file-input

* Merge fixes - NOTE - help slide out does not block content underneath

* Fix unit test

* remove fdescribe

* Fix e2e tests

* Fix kube summary icon bleed & unit tests

* Fixes after merge

* Fixes after merge

* Fix new unit test failure #1

* Fix new unit test failure #2

* Fix new unit test failure #3

* Fix new unit test failure #4

* Fix failing backend tests

* Update all go references to 12.4

* Changes following merge

* Changes after merge

* Remove custom-src

* Remove kube/helm from backend & docs

* Remove backend downstream deps

* cc fixes

* Changes after merge
  • Loading branch information
richard-cox authored Apr 25, 2019
1 parent fc57bde commit 8bc1495
Show file tree
Hide file tree
Showing 266 changed files with 6,504 additions and 4,052 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ indent_size=2
[*.md]
max_line_length = off
trim_trailing_whitespace = false

[*.html]
max_line_length = 120
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ src/frontend/packages/core/sass/custom.scss
src/frontend/packages/core/assets/eula.html
src/frontend/packages/core/assets/logo.png
src/frontend/packages/core/assets/nav-logo.png
src/frontend/packages/core/assets/nav-logo-icon.png
src/frontend/packages/core/assets/login-bg.jpg
src/frontend/packages/core/src/custom-import.module.ts
src/frontend/packages/core/src/custom
Expand All @@ -108,4 +109,7 @@ src/frontend/packages/core/src/index.html
# Prebuild package

stratos-frontend-prebuild.zip
go-vendor-*.tgz

src/frontend/assets
src/frontend/sass
go-vendor-*.tgz
28 changes: 25 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
"polyfills": "src/frontend/packages/core/src/polyfills.ts",
"assets": [
"src/frontend/packages/core/assets",
{
"glob": "**/*",
"input": "custom-src/frontend/assets/custom",
"output": "/core/assets/custom"
},
"src/frontend/packages/core/favicon.ico"
],
"styles": [
Expand Down Expand Up @@ -93,14 +98,20 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"preserveSymlinks": true,
"outputPath": "dist/core",
"index": "src/frontend/packages/core/src/index.html",
"main": "src/frontend/packages/core/src/main.ts",
"polyfills": "src/frontend/packages/core/src/polyfills.ts",
"tsConfig": "src/frontend/packages/core/tsconfig.app.json",
"assets": [
"src/frontend/packages/core/favicon.ico",
"src/frontend/packages/core/assets"
"src/frontend/packages/core/assets",
{
"glob": "**/*",
"input": "custom-src/frontend/assets/custom",
"output": "/core/assets/custom"
}
],
"styles": [
"src/frontend/packages/core/src/styles.css"
Expand Down Expand Up @@ -145,6 +156,7 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"preserveSymlinks": true,
"main": "src/frontend/packages/core/src/test.ts",
"polyfills": "src/frontend/packages/core/src/polyfills.ts",
"tsConfig": "src/frontend/packages/core/tsconfig.spec.json",
Expand All @@ -155,7 +167,16 @@
"scripts": [],
"assets": [
"src/frontend/packages/core/src/favicon.ico",
"src/frontend/packages/core/src/assets"
{
"glob": "**/*",
"input": "src/frontend/packages/core/assets",
"output": "/core/assets/custom"
},
{
"glob": "**/*",
"input": "custom-src/frontend/assets/custom",
"output": "/core/assets/custom"
}
]
}
},
Expand All @@ -165,7 +186,8 @@
"tsConfig": ["src/tsconfig.json"],
"tslintConfig": "src/frontend/packages/core/tslint.json",
"files": [
"src/frontend/packages/core/src/**/*.ts"
"src/frontend/packages/core/src/**/*.ts",
"src/frontend/packages/core/src/custom/**/*.ts"
]
}
}
Expand Down
9 changes: 4 additions & 5 deletions docs/invite-user-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ The following configuration is required in order to configure the SMTP server an

To use custom email templates, create a folder and add the two templates with the following file names:

1. user-invite-email.txt = Plain text template
1. user-invite-email.helm = HTML text template
1. user-invite-email.txt = Plain text template
1. user-invite-email.helm = HTML text template

When deploying Stratos with `cf push` set the environment variable `TEMPLATE_DIR` to the folder name where your custom templates are located. This can be done on the command line or by adding this environment variable to the `manifest.yml` file.

Expand All @@ -107,7 +107,6 @@ The following configuration is required in order to configure the SMTP server an

If you wish to use custom email templates for user invitation, follow these steps:


Create the namespace that you are going to use when installing Stratos:

```
Expand All @@ -116,8 +115,8 @@ kubectl create namespace stratos

Create a Config Map for the template files - this assumes you have the following two files in the current directory:

1. user-invite-email.txt = Plain text template
1. user-invite-email.helm = HTML text template
1. user-invite-email.txt = Plain text template
1. user-invite-email.helm = HTML text template

Create the Config Map with:

Expand Down
Loading

0 comments on commit 8bc1495

Please sign in to comment.