Skip to content

Commit

Permalink
Merge branch 'main' of github.com:komodorio/helm-dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
undera committed Jan 16, 2023
2 parents 35421ed + 26e0b1d commit 714c0f9
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Bump versions
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
timeout-minutes: 60
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Docker meta
uses: docker/metadata-action@v3
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Bump versions
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Download the appropriate [release package](https://github.com/komodorio/helm-das

## Execute Helm tests

For all the release(s) (istalled helm charts), you can execute helm tests for that release. For the tests to execute successfully, you need to have existing tests for that helm chart
For all the release(s) (installed helm charts), you can execute helm tests for that release. For the tests to execute successfully, you need to have existing tests for that helm chart.

You can execute `helm test` for the specific release as below:
![](screenshot_run_test.png)
Expand Down
8 changes: 7 additions & 1 deletion pkg/dashboard/static/list-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,15 @@ function buildChartCard(elm) {
</div>`)

let chartName = elm.chart
let match = null
// semver2 regex , add optional v prefix
const chartNameRegex = 'v?(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?'
const match = elm.chart.match(chartNameRegex);
if (!new RegExp(chartNameRegex).test(chartName)) {
alert('Chart name does not match chart name regex.')
} else {
match = chartName.match(chartNameRegex);
}

if (match) {
chartName = elm.chart.substring(0, match.index - 1)
} else {
Expand Down
3 changes: 2 additions & 1 deletion pkg/dashboard/static/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ body > .container-fluid {

#filters {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 0.8rem;
line-height: 175%;
inline-size: auto;
overflow-wrap: break-word;
}

#cluster input, #cluster span {
Expand Down

0 comments on commit 714c0f9

Please sign in to comment.