Skip to content

Commit e6a6985

Browse files
authored
Merge branch 'master' into feat/data-planes/reflect_feature-bind-outbounds
2 parents 7565350 + aa0fbca commit e6a6985

File tree

28 files changed

+823
-945
lines changed

28 files changed

+823
-945
lines changed

.github/renovate.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,21 @@
4141
"groupName": "patch",
4242
"matchUpdateTypes": [
4343
"patch"
44-
]
44+
],
45+
"minimumReleaseAge": "3 days"
4546
},
4647
{
4748
"groupName": "minor",
4849
"matchUpdateTypes": [
4950
"minor"
50-
]
51+
],
52+
"minimumReleaseAge": "3 days"
53+
},
54+
{
55+
"matchUpdateTypes": [
56+
"major"
57+
],
58+
"minimumReleaseAge": "3 days"
5159
},
5260
{
5361
"matchPackageNames": [

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
- run: |
8484
make -C ${{ matrix.package.path }} build
8585
86-
- uses: Kong/public-shared-actions/security-actions/sca@916a6f6221b7eab6f5ae53d061274d588c965ae6 # v5.1.1
86+
- uses: Kong/public-shared-actions/security-actions/sca@7040193cacd1787991b11b6b2ddb0a9719cbb533 # v5.1.3
8787
id: sbom
8888
env:
8989
SYFT_SOURCE_NAME: ${{ github.repository }}

package-lock.json

Lines changed: 252 additions & 556 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"devDependencies": {
1010
"@kumahq/config": "*",
1111
"husky": "^9.1.7",
12-
"lint-staged": "^16.1.6"
12+
"lint-staged": "^16.2.0"
1313
},
1414
"engines": {
1515
"node": ">=22.19.0",

packages/config/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
"./tsconfig/node": "./tsconfig/node.json"
3030
},
3131
"dependencies": {
32-
"@badeball/cypress-cucumber-preprocessor": "^23.1.0",
32+
"@badeball/cypress-cucumber-preprocessor": "^23.2.0",
3333
"@bahmutov/cypress-esbuild-preprocessor": "^2.2.6",
3434
"@cucumber/gherkin-utils": "^10.0.0",
35-
"@eslint/js": "^9.35.0",
36-
"@stylistic/eslint-plugin": "^5.3.1",
35+
"@eslint/js": "^9.36.0",
36+
"@stylistic/eslint-plugin": "^5.4.0",
3737
"@stylistic/stylelint-plugin": "^4.0.0",
3838
"@types/markdown-it": "^14.1.2",
3939
"@vue/eslint-config-typescript": "^14.6.0",
@@ -45,13 +45,13 @@
4545
"deepmerge": "^4.3.1",
4646
"esbuild": "^0.25.10",
4747
"escape-string-regexp": "^4.0.0",
48-
"eslint": "^9.35.0",
48+
"eslint": "^9.36.0",
4949
"eslint-import-resolver-alias": "^1.1.2",
5050
"eslint-import-resolver-typescript": "^4.4.4",
5151
"eslint-plugin-import": "^2.32.0",
5252
"eslint-plugin-json-schema-validator": "^5.4.1",
5353
"eslint-plugin-no-unsanitized": "^4.1.4",
54-
"eslint-plugin-vue": "^10.4.0",
54+
"eslint-plugin-vue": "^10.5.0",
5555
"globals": "^16.4.0",
5656
"js-yaml": "^4.1.0",
5757
"lockfile-lint": "^4.14.1",
@@ -60,7 +60,7 @@
6060
"stylelint-config-recommended-scss": "^16.0.1",
6161
"stylelint-config-recommended-vue": "^1.6.1",
6262
"typescript": "^5.9.2",
63-
"vite": "^7.1.6",
63+
"vite": "^7.1.7",
6464
"vitepress": "^2.0.0-alpha.12",
6565
"vitest": "^3.2.4",
6666
"vue-tsc": "^3.0.7"

packages/fake-api/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
"path-to-regexp": "^8.3.0",
2828
"urlpattern-polyfill": "^10.1.0",
2929
"deepmerge": "^4.3.1",
30-
"msw": "^2.11.2"
30+
"msw": "^2.11.3"
3131
},
3232
"devDependencies": {
3333
"@kumahq/config": "*",
34-
"vite": "^7.1.6"
34+
"vite": "^7.1.7"
3535
}
3636
}

packages/kuma-gui/features/mesh/dataplanes/overview/Traffic.feature

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ Feature: mesh / dataplanes / connections / Traffic
2525
protocol: http
2626
proxyResourceName: self_inbound_httpport
2727
outbounds:
28-
- kri: kri_dp_default_scenario_kuma-system_service-less_ipv6
28+
- kri: kri_msvc_default_scenario_kuma-system_service-less_ipv6
2929
port: 54321
3030
protocol: tcp
31-
proxyResourceName: kri_dp_default_scenario_kuma-system_service-less_ipv6
31+
proxyResourceName: kri_msvc_default_scenario_kuma-system_service-less_ipv6
3232
"""
3333
When I visit the "/meshes/default/data-planes/service-less/overview" URL
3434
And the "$traffic" element exists
@@ -37,4 +37,4 @@ Feature: mesh / dataplanes / connections / Traffic
3737
And the "$inbound" element contains "self_inbound_httpport"
3838
And the "$outbound" element exists 1 times
3939
And the "$outbound" element contains "ipv6"
40-
And the "$outbound" element contains "kri_dp_default_scenario_kuma-system_service-less_ipv6"
40+
And the "$outbound" element contains "kri_msvc_default_scenario_kuma-system_service-less_ipv6"

packages/kuma-gui/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
"object.groupby": "^1.0.3",
2525
"openapi-fetch": "^0.14.0",
2626
"path-to-regexp": "^8.3.0",
27-
"pretty-bytes": "^7.0.1",
27+
"pretty-bytes": "^7.1.0",
2828
"set.prototype.difference": "^1.1.7",
29-
"shiki": "^3.12.2",
29+
"shiki": "^3.13.0",
3030
"urlpattern-polyfill": "^10.1.0",
3131
"vue": "^3.5.21",
3232
"vue-github-button": "^3.1.3",
3333
"vue-router": "^4.5.1"
3434
},
3535
"devDependencies": {
36-
"@badeball/cypress-cucumber-preprocessor": "^23.1.0",
36+
"@badeball/cypress-cucumber-preprocessor": "^23.2.0",
3737
"@kong/design-tokens": "^1.18.0",
3838
"@kumahq/config": "*",
3939
"@kumahq/fake-api": "*",
@@ -49,9 +49,9 @@
4949
"gray-matter": "^4.0.3",
5050
"jsdom": "^27.0.0",
5151
"markdown-it": "^14.1.0",
52-
"msw": "^2.11.2",
53-
"sass": "^1.92.1",
54-
"vite": "^7.1.6",
52+
"msw": "^2.11.3",
53+
"sass": "^1.93.0",
54+
"vite": "^7.1.7",
5555
"vite-svg-loader": "^5.1.0",
5656
"vitepress": "^2.0.0-alpha.12",
5757
"vitest": "^3.2.4"

packages/kuma-gui/src/app/connections/components/connection-traffic/ConnectionCard.vue

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
<template>
22
<DataCard
33
class="service-traffic-card"
4-
@click="click"
54
>
65
<template #title>
7-
<TagList
8-
v-if="props.service.length > 0"
9-
:tags="[{label: 'kuma.io/service', value: props.service}]"
10-
/>
6+
<div
7+
class="aside"
8+
>
9+
<slot name="aside">
10+
<TagList
11+
v-if="props.service.length > 0"
12+
:tags="[{label: 'kuma.io/service', value: props.service}]"
13+
/>
14+
</slot>
15+
</div>
1116
<div class="title">
17+
<slot name="state" />
18+
1219
<XBadge
1320
v-if="props.protocol !== ''"
1421
class="protocol"
@@ -175,22 +182,10 @@ const props = withDefaults(defineProps<{
175182
direction: 'downstream',
176183
portName: undefined,
177184
})
178-
const click = (e: MouseEvent) => {
179-
const $target = e.target as HTMLElement
180-
if (e.isTrusted && $target.nodeName.toLowerCase() !== 'a') {
181-
const $el = $target.closest('.service-traffic-card, a')
182-
if ($el) {
183-
const $a = $el.nodeName.toLowerCase() === 'a' ? $el : $el.querySelector('[data-action]')
184-
if ($a !== null && 'click' in $a && typeof $a.click === 'function') {
185-
$a.click()
186-
}
187-
}
188-
}
189-
}
190185
191186
</script>
192187
<style lang="scss" scoped>
193-
.tag-list {
188+
.aside {
194189
float: right;
195190
margin-bottom: $kui-space-40;
196191
margin-left: $kui-space-40;
@@ -199,6 +194,7 @@ const click = (e: MouseEvent) => {
199194
float: left;
200195
font-size: $kui-font-size-40;
201196
display: flex;
197+
align-items: center;
202198
flex: 1 1 auto;
203199
gap: $kui-space-40;
204200
}

packages/kuma-gui/src/app/data-planes/locales/en-us/index.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ data-planes:
110110
health:
111111
ready: 'Healthy'
112112
not_ready: 'Unhealthy'
113-
unhealthy_inbound: 'Inbound on port {port} is not ready (kuma.io/service: {service})'
113+
unhealthy_inbound: 'Inbound on port {port} is not ready'
114114
mtls:
115115
title: 'TLS'
116116
expiration_time:

0 commit comments

Comments
 (0)