{{ t('data-planes.routes.item.subscriptions.title') }}
@@ -214,6 +302,7 @@ import { useCan } from '@/app/application'
import DefinitionCard from '@/app/common/DefinitionCard.vue'
import StatusBadge from '@/app/common/StatusBadge.vue'
import TagList from '@/app/common/TagList.vue'
+import TextWithCopyButton from '@/app/common/TextWithCopyButton.vue'
import SubscriptionList from '@/app/subscriptions/components/SubscriptionList.vue'
import type { DataPlaneOverview } from '@/types/index.d'
import { useI18n } from '@/utilities'
@@ -222,7 +311,6 @@ import {
COMPATIBLE,
dpTags,
getStatusAndReason,
- getVersions,
INCOMPATIBLE_WRONG_FORMAT,
} from '@/utilities/dataplane'
@@ -234,8 +322,18 @@ const props = defineProps<{
}>()
const statusWithReason = computed(() => getStatusAndReason(props.data.dataplane, props.data.dataplaneInsight))
-const dataPlaneTags = computed(() => dpTags(props.data.dataplane))
-const dataPlaneVersions = computed(() => getVersions(props.data.dataplaneInsight))
+
+const lastUpdatedTime = computed(() => {
+ const subscriptions = props.data.dataplaneInsight?.subscriptions ?? []
+
+ if (subscriptions.length === 0) {
+ return null
+ }
+
+ const lastSubscription = subscriptions[subscriptions.length - 1]
+
+ return formatIsoDate(lastSubscription.status.lastUpdateTime)
+})
const warnings = computed(() => {
const subscriptions = props.data.dataplaneInsight?.subscriptions ?? []
@@ -299,4 +397,10 @@ const warnings = computed(() => {
display: flex;
align-items: center;
}
+
+.inbound-list>*+* {
+ margin-block-start: $kui-space-60;
+ border-top: $kui-border-width-10 solid $kui-color-border;
+ padding-block-start: $kui-space-60;
+}
diff --git a/src/test-support/FakeKuma.ts b/src/test-support/FakeKuma.ts
index 0bbcff1256..a9ec86a728 100644
--- a/src/test-support/FakeKuma.ts
+++ b/src/test-support/FakeKuma.ts
@@ -2,7 +2,7 @@ import { Faker } from '@faker-js/faker'
import deepmerge from 'deepmerge'
import type {
- DataPlaneNetworking as DataplaneNetworking,
+ DataplaneNetworking,
DataPlaneProxyStatus,
DataplaneGateway,
DataplaneInbound,
@@ -182,7 +182,7 @@ export class KumaModule {
}
dataplaneNetworking({ type = 'proxy', inbounds = 0, isMultizone = false, service }: { type?: 'gateway_builtin' | 'gateway_delegated' | 'proxy', inbounds?: number, isMultizone?: boolean, service?: string } = {}): DataplaneNetworking {
- const address = this.faker.internet.ip()
+ const address = this.faker.internet.ipv4()
const serviceName = service || (this.faker.datatype.boolean() ? this.serviceName(type === 'proxy' ? 'internal' : type) : undefined)
const zoneName = isMultizone && this.faker.datatype.boolean() ? this.faker.hacker.noun() : undefined
@@ -234,7 +234,7 @@ export class KumaModule {
: {}
const port = this.faker.internet.port()
const servicePort = this.faker.internet.port()
- const serviceAddress = this.faker.internet.ip()
+ const serviceAddress = this.faker.internet.ipv4()
return {
...healthObject,
@@ -242,7 +242,7 @@ export class KumaModule {
servicePort,
serviceAddress,
tags: {
- 'kuma.io/service': service ?? this.serviceName('internal'),
+ 'kuma.io/service': service ?? this.serviceName(),
'kuma.io/protocol': this.protocol(),
...(zone && { 'kuma.io/zone': zone }),
},
@@ -253,7 +253,7 @@ export class KumaModule {
return {
port: this.faker.internet.port(),
tags: {
- 'kuma.io/service': service ?? this.serviceName('internal'),
+ 'kuma.io/service': service ?? this.serviceName(),
},
}
}
@@ -263,13 +263,11 @@ export class KumaModule {
const supportedBackends = [issuedBackend].concat(this.faker.helpers.multiple(this.faker.hacker.noun))
return {
- mTLS: {
- certificateExpirationTime: this.faker.date.anytime(),
- lastCertificateRegeneration: '2023-10-02T12:40:13.956741929Z',
- certificateRegenerations: this.faker.number.int(),
- issuedBackend,
- supportedBackends,
- },
+ certificateExpirationTime: this.faker.date.anytime(),
+ lastCertificateRegeneration: '2023-10-02T12:40:13.956741929Z',
+ certificateRegenerations: this.faker.number.int(),
+ issuedBackend,
+ supportedBackends,
}
}
}
diff --git a/src/test-support/mocks/src/dataplanes.ts b/src/test-support/mocks/src/dataplanes.ts
index 0f739a6e74..19d5902652 100644
--- a/src/test-support/mocks/src/dataplanes.ts
+++ b/src/test-support/mocks/src/dataplanes.ts
@@ -11,7 +11,7 @@ export default ({ env, fake, pager }: EndpointDependencies): MockResponder => (r
'/dataplanes',
)
- const inbounds = parseInt(env('KUMA_DATAPLANEINBOUND_COUNT', `${fake.number.int({ min: 1, max: 3 })}`))
+ const inbounds = parseInt(env('KUMA_DATAPLANEINBOUND_COUNT', `${fake.number.int({ min: 1, max: 5 })}`))
const tags = _tags !== ''
? Object.fromEntries([_tags]
diff --git a/src/test-support/mocks/src/dataplanes/_overview.ts b/src/test-support/mocks/src/dataplanes/_overview.ts
index 5f83fbe3c4..86da28d1b4 100644
--- a/src/test-support/mocks/src/dataplanes/_overview.ts
+++ b/src/test-support/mocks/src/dataplanes/_overview.ts
@@ -6,9 +6,9 @@ export default ({ fake, pager, env }: EndpointDependencies): MockResponder => (r
const _name = query.get('name') ?? ''
const _tags = query.get('tag') ?? ''
- const inbounds = parseInt(env('KUMA_DATAPLANEINBOUND_COUNT', `${fake.number.int({ min: 1, max: 3 })}`))
+ const inbounds = parseInt(env('KUMA_DATAPLANEINBOUND_COUNT', `${fake.number.int({ min: 1, max: 5 })}`))
const subscriptionCount = parseInt(env('KUMA_SUBSCRIPTION_COUNT', `${fake.number.int({ min: 1, max: 10 })}`))
- const isMtlsEnabled = env('KUMA_MTLS_ENABLED', fake.helpers.arrayElement(['false', 'true'])) === 'true'
+ const isMtlsEnabledOverride = env('KUMA_MTLS_ENABLED', '')
const { offset, total, next, pageTotal } = pager(
env('KUMA_DATAPLANE_COUNT', `${fake.number.int({ min: 1, max: 1000 })}`),
req,
@@ -44,6 +44,7 @@ export default ({ fake, pager, env }: EndpointDependencies): MockResponder => (r
const id = offset + i
const isMultizone = true && fake.datatype.boolean()
+ const isMtlsEnabled = isMtlsEnabledOverride !== '' ? isMtlsEnabledOverride === 'true' : fake.datatype.boolean()
const type = filterType ?? fake.helpers.arrayElement(['gateway_builtin', 'gateway_delegated', 'proxy'])
const mesh = `${fake.hacker.noun()}-${id}`
diff --git a/src/test-support/mocks/src/meshes/_.ts b/src/test-support/mocks/src/meshes/_.ts
index 56b631ce1b..8e54920a7c 100644
--- a/src/test-support/mocks/src/meshes/_.ts
+++ b/src/test-support/mocks/src/meshes/_.ts
@@ -1,7 +1,9 @@
import type { EndpointDependencies, MockResponder } from '@/test-support'
export default ({ fake, env }: EndpointDependencies): MockResponder => (req) => {
const name = req.params.mesh
- const mTLS = env('KUMA_MTLS_ENABLED', '')
+
+ const isMtlsEnabledOverride = env('KUMA_MTLS_ENABLED', '')
+ const isMtlsEnabled = isMtlsEnabledOverride !== '' ? isMtlsEnabledOverride === 'true' : fake.datatype.boolean()
return {
headers: {},
@@ -10,7 +12,7 @@ export default ({ fake, env }: EndpointDependencies): MockResponder => (req) =>
type: 'Mesh',
creationTime: '2020-06-19T12:18:02.097986-04:00',
modificationTime: '2020-06-19T12:18:02.097986-04:00',
- ...((mTLS.length > 0 ? !!JSON.parse(mTLS) : fake.datatype.boolean({ probability: 0.6 })) &&
+ ...(isMtlsEnabled &&
{
mtls: {
enabledBackend: 'ca-1',
diff --git a/src/test-support/mocks/src/meshes/_/dataplanes/_.ts b/src/test-support/mocks/src/meshes/_/dataplanes/_.ts
index df06e53f93..90f1c8fa08 100644
--- a/src/test-support/mocks/src/meshes/_/dataplanes/_.ts
+++ b/src/test-support/mocks/src/meshes/_/dataplanes/_.ts
@@ -2,7 +2,7 @@ import type { EndpointDependencies, MockResponder } from '@/test-support'
export default ({ fake, env }: EndpointDependencies): MockResponder => (req) => {
const { mesh, name } = req.params
- const inbounds = parseInt(env('KUMA_DATAPLANEINBOUND_COUNT', `${fake.number.int({ min: 1, max: 3 })}`))
+ const inbounds = parseInt(env('KUMA_DATAPLANEINBOUND_COUNT', `${fake.number.int({ min: 1, max: 5 })}`))
let type: 'gateway_builtin' | 'gateway_delegated' | 'proxy' = 'proxy'
if (name.includes('-gateway_builtin')) {
diff --git a/src/test-support/mocks/src/meshes/_/dataplanes/_/_overview.ts b/src/test-support/mocks/src/meshes/_/dataplanes/_/_overview.ts
index 2d8b8c681b..8039e9831e 100644
--- a/src/test-support/mocks/src/meshes/_/dataplanes/_/_overview.ts
+++ b/src/test-support/mocks/src/meshes/_/dataplanes/_/_overview.ts
@@ -2,9 +2,9 @@ import type { EndpointDependencies, MockResponder } from '@/test-support'
export default ({ env, fake }: EndpointDependencies): MockResponder => (req) => {
const { mesh, name } = req.params
- const inbounds = parseInt(env('KUMA_DATAPLANEINBOUND_COUNT', `${fake.number.int({ min: 1, max: 3 })}`))
+ const inbounds = parseInt(env('KUMA_DATAPLANEINBOUND_COUNT', `${fake.number.int({ min: 1, max: 5 })}`))
const subscriptionCount = parseInt(env('KUMA_SUBSCRIPTION_COUNT', `${fake.number.int({ min: 1, max: 10 })}`))
- const isMtlsEnabled = env('KUMA_MTLS_ENABLED', fake.helpers.arrayElement(['false', 'true'])) === 'true'
+ const isMtlsEnabledOverride = env('KUMA_MTLS_ENABLED', '')
let type: 'gateway_builtin' | 'gateway_delegated' | 'proxy' = 'proxy'
if (name.includes('-gateway_builtin')) {
@@ -14,6 +14,7 @@ export default ({ env, fake }: EndpointDependencies): MockResponder => (req) =>
}
const isMultizone = true && fake.datatype.boolean()
+ const isMtlsEnabled = isMtlsEnabledOverride !== '' ? isMtlsEnabledOverride === 'true' : fake.datatype.boolean()
return {
headers: {},
diff --git a/src/test-support/mocks/src/meshes/_/dataplanes/_/policies.ts b/src/test-support/mocks/src/meshes/_/dataplanes/_/policies.ts
index d6791717f4..5297556100 100644
--- a/src/test-support/mocks/src/meshes/_/dataplanes/_/policies.ts
+++ b/src/test-support/mocks/src/meshes/_/dataplanes/_/policies.ts
@@ -1,13 +1,15 @@
import type { EndpointDependencies, MockResponder } from '@/test-support'
-export default (_deps: EndpointDependencies): MockResponder => (req) => {
- const params = req.params
- if (params.name.includes('-gateway_builtin')) {
+
+export default ({ fake }: EndpointDependencies): MockResponder => (req) => {
+ const { mesh } = req.params
+
+ if (req.params.name.includes('-gateway_builtin')) {
return {
headers: {},
body: {
kind: 'MeshGatewayDataplane',
gateway: {
- mesh: 'default',
+ mesh,
name: 'edge-gateway',
},
listeners: [
@@ -23,26 +25,26 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
destinations: [
{
tags: {
- 'kuma.io/service': 'demo-app_kuma-demo_svc_5000',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
policies: {
CircuitBreaker: {
type: 'CircuitBreaker',
- mesh: 'default',
+ mesh,
name: 'cb1',
creationTime: '2022-10-18T08:32:15Z',
modificationTime: '2022-10-18T08:32:15Z',
sources: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
destinations: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
@@ -57,21 +59,21 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
},
Retry: {
type: 'Retry',
- mesh: 'default',
+ mesh,
name: 'retry-all-default',
creationTime: '2022-10-18T08:32:14Z',
modificationTime: '2022-10-18T08:32:14Z',
sources: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
destinations: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
@@ -99,21 +101,21 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
},
Timeout: {
type: 'Timeout',
- mesh: 'default',
+ mesh,
name: 'timeout-all-default',
creationTime: '2022-10-18T08:32:15Z',
modificationTime: '2022-10-18T08:32:15Z',
sources: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
destinations: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
@@ -141,35 +143,35 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
policies: {
TrafficLog: {
type: 'TrafficLog',
- mesh: 'default',
+ mesh,
name: 'tl-1',
creationTime: '2022-03-03T22:24:14Z',
modificationTime: '2022-03-03T22:24:14Z',
sources: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
destinations: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
},
TrafficTrace: {
type: 'TrafficTrace',
- mesh: 'default',
+ mesh,
name: 'tt-1',
creationTime: '2022-03-03T22:25:34Z',
modificationTime: '2022-03-03T22:25:34Z',
selectors: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
@@ -190,33 +192,33 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
items: [
{
type: 'inbound',
- service: 'web',
+ service: fake.datatype.boolean() ? fake.kuma.serviceName() : '',
name: '192.168.0.1:80:81',
matchedPolicies: {
FaultInjection: [
{
type: 'FaultInjection',
- mesh: 'default',
+ mesh,
name: 'fi1.kuma-system',
creationTime: '0001-01-01T00:00:00Z',
modificationTime: '0001-01-01T00:00:00Z',
sources: [
{
match: {
- 'kuma.io/service': 'service-a',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
},
{
match: {
- 'kuma.io/service': 'service-b',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
},
],
destinations: [
{
match: {
- 'kuma.io/protocol': 'http',
- 'kuma.io/service': 'backend',
+ 'kuma.io/protocol': fake.kuma.protocol(),
+ 'kuma.io/service': fake.kuma.serviceName(),
},
},
],
@@ -229,14 +231,14 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
},
{
type: 'FaultInjection',
- mesh: 'default',
+ mesh,
name: 'web-to-backend.kuma-system',
creationTime: '0001-01-01T00:00:00Z',
modificationTime: '0001-01-01T00:00:00Z',
sources: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
@@ -244,7 +246,7 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
{
match: {
'kuma.io/protocol': 'http',
- 'kuma.io/service': 'backend',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
},
],
@@ -259,21 +261,21 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
TrafficPermission: [
{
type: 'TrafficPermission',
- mesh: 'default',
+ mesh,
name: 'tp-1',
creationTime: '0001-01-01T00:00:00Z',
modificationTime: '0001-01-01T00:00:00Z',
sources: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
destinations: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
@@ -284,26 +286,26 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
{
type: 'outbound',
name: '192.168.0.2:8080',
- service: 'backend',
+ service: fake.datatype.boolean() ? fake.kuma.serviceName() : '',
matchedPolicies: {
Timeout: [
{
type: 'Timeout',
- mesh: 'default',
+ mesh,
name: 'timeout-all-default',
creationTime: '0001-01-01T00:00:00Z',
modificationTime: '0001-01-01T00:00:00Z',
sources: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
destinations: [
{
match: {
- 'kuma.io/service': 'redis',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
},
],
@@ -328,26 +330,26 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
{
type: 'service',
name: 'gateway',
- service: 'gateway',
+ service: fake.datatype.boolean() ? fake.kuma.serviceName() : '',
matchedPolicies: {
HealthCheck: [
{
type: 'HealthCheck',
- mesh: 'default',
+ mesh,
name: 'foo-bar-baz-123',
creationTime: '0001-01-01T00:00:00Z',
modificationTime: '0001-01-01T00:00:00Z',
sources: [
{
match: {
- 'kuma.io/service': 'backend',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
},
],
destinations: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
@@ -364,12 +366,12 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
{
type: 'service',
name: 'postgres',
- service: 'postgres',
+ service: fake.datatype.boolean() ? fake.kuma.serviceName() : '',
matchedPolicies: {
HealthCheck: [
{
type: 'HealthCheck',
- mesh: 'default',
+ mesh,
name: 'foo-bar-baz-123',
creationTime: '0001-01-01T00:00:00Z',
modificationTime: '0001-01-01T00:00:00Z',
@@ -383,7 +385,7 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
destinations: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
@@ -400,12 +402,12 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
{
type: 'service',
name: 'redis',
- service: 'redis',
+ service: fake.datatype.boolean() ? fake.kuma.serviceName() : '',
matchedPolicies: {
HealthCheck: [
{
type: 'HealthCheck',
- mesh: 'default',
+ mesh,
name: 'foo-bar-baz-123',
creationTime: '0001-01-01T00:00:00Z',
modificationTime: '0001-01-01T00:00:00Z',
@@ -419,7 +421,7 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
destinations: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
@@ -436,12 +438,12 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
{
type: 'service',
name: 'web-api',
- service: 'web-api',
+ service: fake.datatype.boolean() ? fake.kuma.serviceName() : '',
matchedPolicies: {
HealthCheck: [
{
type: 'HealthCheck',
- mesh: 'default',
+ mesh,
name: 'foo-bar-baz-123',
creationTime: '0001-01-01T00:00:00Z',
modificationTime: '0001-01-01T00:00:00Z',
@@ -455,7 +457,7 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
destinations: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
@@ -472,19 +474,19 @@ export default (_deps: EndpointDependencies): MockResponder => (req) => {
{
type: 'dataplane',
name: '',
- service: '',
+ service: fake.datatype.boolean() ? fake.kuma.serviceName() : '',
matchedPolicies: {
TrafficTrace: [
{
type: 'TrafficTrace',
- mesh: 'default',
+ mesh,
name: 'foo-bar-baz-123',
creationTime: '0001-01-01T00:00:00Z',
modificationTime: '0001-01-01T00:00:00Z',
sources: [
{
match: {
- 'kuma.io/service': '*',
+ 'kuma.io/service': fake.datatype.boolean() ? fake.kuma.serviceName() : '*',
},
},
],
diff --git a/src/test-support/mocks/src/meshes/_/dataplanes/_/rules.ts b/src/test-support/mocks/src/meshes/_/dataplanes/_/rules.ts
index a4e8338fb1..86101aabf8 100644
--- a/src/test-support/mocks/src/meshes/_/dataplanes/_/rules.ts
+++ b/src/test-support/mocks/src/meshes/_/dataplanes/_/rules.ts
@@ -1,5 +1,8 @@
import type { EndpointDependencies, MockResponder } from '@/test-support'
-export default (_deps: EndpointDependencies): MockResponder => (_req) => {
+
+export default ({ fake }: EndpointDependencies): MockResponder => (req) => {
+ const { mesh } = req.params
+
return {
headers: {},
body: {
@@ -28,7 +31,7 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
},
origins: [
{
- mesh: 'default',
+ mesh,
name: 'all.kuma-system',
},
],
@@ -41,9 +44,9 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
'demo-app.kuma-demo.svc.5000.mesh:80',
'240.0.0.1:80',
],
- service: 'demo-app_kuma-demo_svc_5000',
+ service: fake.kuma.serviceName(),
tags: {
- 'kuma.io/service': 'demo-app_kuma-demo_svc_5000',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
policyType: 'MeshCircuitBreaker',
subset: {},
@@ -58,7 +61,7 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
},
origins: [
{
- mesh: 'default',
+ mesh,
name: 'all.kuma-system',
},
],
@@ -69,14 +72,14 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
addresses: [
'10.42.0.6:5000',
],
- service: 'demo-app_kuma-demo_svc_5000',
+ service: fake.kuma.serviceName(),
tags: {
app: 'demo-app',
'k8s.kuma.io/namespace': 'kuma-demo',
'k8s.kuma.io/service-name': 'demo-app',
'k8s.kuma.io/service-port': '5000',
'kuma.io/protocol': 'http',
- 'kuma.io/service': 'demo-app_kuma-demo_svc_5000',
+ 'kuma.io/service': fake.kuma.serviceName(),
'pod-template-hash': '7458cfdd75',
},
policyType: 'MeshCircuitBreaker',
@@ -92,7 +95,7 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
},
origins: [
{
- mesh: 'default',
+ mesh,
name: 'all.kuma-system',
},
],
@@ -103,14 +106,14 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
addresses: [
'10.42.0.6:5000',
],
- service: 'demo-app_kuma-demo_svc_5000',
+ service: fake.kuma.serviceName(),
tags: {
app: 'demo-app',
'k8s.kuma.io/namespace': 'kuma-demo',
'k8s.kuma.io/service-name': 'demo-app',
'k8s.kuma.io/service-port': '5000',
'kuma.io/protocol': 'http',
- 'kuma.io/service': 'demo-app_kuma-demo_svc_5000',
+ 'kuma.io/service': fake.kuma.serviceName(),
'pod-template-hash': '7458cfdd75',
},
policyType: 'MeshRateLimit',
@@ -137,7 +140,7 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
},
origins: [
{
- mesh: 'default',
+ mesh,
name: 'all.kuma-system',
},
],
@@ -149,11 +152,11 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
'demo-app.mesh:5000',
'240.0.0.5:5000',
],
- service: 'demo-app_kuma-demo_svc_5000',
+ service: fake.kuma.serviceName(),
tags: {
'k8s.kuma.io/service-name': 'demo-app',
'k8s.kuma.io/service-port': '5000',
- 'kuma.io/service': 'demo-app_kuma-demo_svc_5000',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
policyType: 'MeshCircuitBreaker',
subset: {},
@@ -168,7 +171,7 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
},
origins: [
{
- mesh: 'default',
+ mesh,
name: 'all.kuma-system',
},
],
@@ -181,13 +184,13 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
'redis.kuma-demo.svc.6379.mesh:80',
'240.0.0.0:80',
],
- service: 'redis_kuma-demo_svc_6379',
+ service: fake.kuma.serviceName(),
tags: {
- 'kuma.io/service': 'redis_kuma-demo_svc_6379',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
policyType: 'MeshRetry',
subset: {
- 'kuma.io/service': 'redis_kuma-demo_svc_6379',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
conf: {
tcp: {
@@ -199,7 +202,7 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
},
origins: [
{
- mesh: 'default',
+ mesh,
name: 'all.kuma-system',
},
],
@@ -212,9 +215,9 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
'redis.kuma-demo.svc.6379.mesh:80',
'240.0.0.0:80',
],
- service: 'redis_kuma-demo_svc_6379',
+ service: fake.kuma.serviceName(),
tags: {
- 'kuma.io/service': 'redis_kuma-demo_svc_6379',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
policyType: 'MeshCircuitBreaker',
subset: {},
@@ -229,7 +232,7 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
},
origins: [
{
- mesh: 'default',
+ mesh,
name: 'all.kuma-system',
},
],
@@ -241,15 +244,15 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
'redis.mesh:6379',
'240.0.0.6:6379',
],
- service: 'redis_kuma-demo_svc_6379',
+ service: fake.kuma.serviceName(),
tags: {
'k8s.kuma.io/service-name': 'redis',
'k8s.kuma.io/service-port': '6379',
- 'kuma.io/service': 'redis_kuma-demo_svc_6379',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
policyType: 'MeshRetry',
subset: {
- 'kuma.io/service': 'redis_kuma-demo_svc_6379',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
conf: {
tcp: {
@@ -261,7 +264,7 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
},
origins: [
{
- mesh: 'default',
+ mesh,
name: 'all.kuma-system',
},
],
@@ -273,11 +276,11 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
'redis.mesh:6379',
'240.0.0.6:6379',
],
- service: 'redis_kuma-demo_svc_6379',
+ service: fake.kuma.serviceName(),
tags: {
'k8s.kuma.io/service-name': 'redis',
'k8s.kuma.io/service-port': '6379',
- 'kuma.io/service': 'redis_kuma-demo_svc_6379',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
policyType: 'MeshCircuitBreaker',
subset: {},
@@ -292,7 +295,7 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
},
origins: [
{
- mesh: 'default',
+ mesh,
name: 'all.kuma-system',
},
],
@@ -305,9 +308,9 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
'svclb-demo-app-gateway.kuma-demo.svc.mesh:80',
'240.0.0.2:80',
],
- service: 'svclb-demo-app-gateway_kuma-demo_svc',
+ service: fake.kuma.serviceName(),
tags: {
- 'kuma.io/service': 'svclb-demo-app-gateway_kuma-demo_svc',
+ 'kuma.io/service': fake.kuma.serviceName(),
},
policyType: 'MeshCircuitBreaker',
subset: {},
@@ -322,7 +325,7 @@ export default (_deps: EndpointDependencies): MockResponder => (_req) => {
},
origins: [
{
- mesh: 'default',
+ mesh,
name: 'all.kuma-system',
},
],
diff --git a/src/test-support/mocks/src/meshes/_/dataplanes/_overview.ts b/src/test-support/mocks/src/meshes/_/dataplanes/_overview.ts
index c8affaa21d..a3ed62c9e5 100644
--- a/src/test-support/mocks/src/meshes/_/dataplanes/_overview.ts
+++ b/src/test-support/mocks/src/meshes/_/dataplanes/_overview.ts
@@ -7,9 +7,9 @@ export default ({ fake, pager, env }: EndpointDependencies): MockResponder => (r
const _name = query.get('name') ?? ''
const _tags = query.get('tag') ?? ''
- const inbounds = parseInt(env('KUMA_DATAPLANEINBOUND_COUNT', `${fake.number.int({ min: 1, max: 3 })}`))
+ const inbounds = parseInt(env('KUMA_DATAPLANEINBOUND_COUNT', `${fake.number.int({ min: 1, max: 5 })}`))
const subscriptionCount = parseInt(env('KUMA_SUBSCRIPTION_COUNT', `${fake.number.int({ min: 1, max: 10 })}`))
- const isMtlsEnabled = env('KUMA_MTLS_ENABLED', fake.helpers.arrayElement(['false', 'true'])) === 'true'
+ const isMtlsEnabledOverride = env('KUMA_MTLS_ENABLED', '')
const { offset, total, next, pageTotal } = pager(
env('KUMA_DATAPLANE_COUNT', `${fake.number.int({ min: 1, max: 1000 })}`),
req,
@@ -45,6 +45,7 @@ export default ({ fake, pager, env }: EndpointDependencies): MockResponder => (r
const id = offset + i
const isMultizone = true && fake.datatype.boolean()
+ const isMtlsEnabled = isMtlsEnabledOverride !== '' ? isMtlsEnabledOverride === 'true' : fake.datatype.boolean()
const type = filterType ?? fake.helpers.arrayElement(['gateway_builtin', 'gateway_delegated', 'proxy'])
const name = `${_name || fake.kuma.dataPlaneProxyName()}-${type}-${id}`
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 7e997b741d..c30cada90c 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -214,7 +214,7 @@ export type DataplaneOutbound = {
tags: Record
}
-export type DataPlaneNetworking = {
+export type DataplaneNetworking = {
address: string
inbound?: DataplaneInbound[]
outbound?: DataplaneOutbound[]
@@ -294,7 +294,7 @@ export interface MeshEntity extends Entity {
*/
export interface DataPlane extends MeshEntity {
type: 'Dataplane'
- networking: DataPlaneNetworking
+ networking: DataplaneNetworking
}
/**
@@ -303,7 +303,7 @@ export interface DataPlane extends MeshEntity {
export interface DataPlaneOverview extends MeshEntity {
type: 'DataplaneOverview'
dataplane: {
- networking: DataPlaneNetworking
+ networking: DataplaneNetworking
}
dataplaneInsight?: DataPlaneInsight
}
diff --git a/src/utilities/dataplane.spec.ts b/src/utilities/dataplane.spec.ts
index cc98afc6b0..c7caee79bf 100644
--- a/src/utilities/dataplane.spec.ts
+++ b/src/utilities/dataplane.spec.ts
@@ -3,7 +3,7 @@ import { describe, expect, test } from 'vitest'
import { getStatusAndReason, getItemStatusFromInsight } from './dataplane'
import {
DiscoverySubscription,
- DataPlaneNetworking,
+ DataplaneNetworking,
} from '@/types/index.d'
describe('utilities/dataplane', () => {
@@ -64,7 +64,7 @@ describe('utilities/dataplane', () => {
})
describe('getStatusAndReason', () => {
- type TestCases = {message: string, args: [{ networking: DataPlaneNetworking }, { subscriptions?: DiscoverySubscription[] }], expected: any}[]
+ type TestCases = {message: string, args: [{ networking: DataplaneNetworking }, { subscriptions?: DiscoverySubscription[] }], expected: any}[]
test.each(([
{
message: 'nothing defined is online',
diff --git a/src/utilities/dataplane.ts b/src/utilities/dataplane.ts
index 4b696c6886..022e5941f5 100644
--- a/src/utilities/dataplane.ts
+++ b/src/utilities/dataplane.ts
@@ -1,7 +1,7 @@
import {
Compatibility,
DataPlaneInsight,
- DataPlaneNetworking,
+ DataplaneNetworking,
DiscoverySubscription,
KDSSubscription,
LabelValue,
@@ -42,7 +42,7 @@ import {
* ]
* ```
*/
-export function dpTags(dataplane: { networking: DataPlaneNetworking }): LabelValue[] {
+export function dpTags(dataplane: { networking: DataplaneNetworking }): LabelValue[] {
let tags: string[] = []
if (dataplane.networking.inbound) {
@@ -75,7 +75,7 @@ export function getItemStatusFromInsight(insight: { subscriptions?: DiscoverySub
// getStatusAndReason takes Dataplane and DataplaneInsight and returns a
// {status: 'online' | 'offline' | 'partially_degraded', reason: errors[]}
-export function getStatusAndReason(dataplane: { networking: DataPlaneNetworking }, insight: { subscriptions?: DiscoverySubscription[] } | undefined = { subscriptions: [] }): { status: StatusKeyword, reason: string[] } {
+export function getStatusAndReason(dataplane: { networking: DataplaneNetworking }, insight: { subscriptions?: DiscoverySubscription[] } | undefined = { subscriptions: [] }): { status: StatusKeyword, reason: string[] } {
const inbound = dataplane.networking.inbound ?? []
const errors = inbound
.filter(item => item.health && !item.health.ready)