From 4845b90c8ee69544dd4681e572d2ce2b7389131e Mon Sep 17 00:00:00 2001 From: wenincode Date: Wed, 12 Oct 2022 18:16:39 -0600 Subject: [PATCH] Add banner for agentless node notice --- ui/packages/consul-ui/app/controllers/dc/nodes/index.js | 8 +++++++- .../consul-ui/app/styles/routes/dc/nodes/index.scss | 4 ++++ ui/packages/consul-ui/mock-api/v1/internal/ui/nodes | 3 ++- ui/packages/consul-ui/translations/routes/en-us.yaml | 5 +++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ui/packages/consul-ui/app/controllers/dc/nodes/index.js b/ui/packages/consul-ui/app/controllers/dc/nodes/index.js index 56c35902b7..609bc5a589 100644 --- a/ui/packages/consul-ui/app/controllers/dc/nodes/index.js +++ b/ui/packages/consul-ui/app/controllers/dc/nodes/index.js @@ -1,3 +1,9 @@ import PeeredResourceController from 'consul-ui/controllers/_peered-resource'; +import { action } from '@ember/object'; -export default class DcNodesController extends PeeredResourceController {} +export default class DcNodesController extends PeeredResourceController { + @action + dismissAgentlessNotice() { + console.log('dismiss this here') + } +} diff --git a/ui/packages/consul-ui/app/styles/routes/dc/nodes/index.scss b/ui/packages/consul-ui/app/styles/routes/dc/nodes/index.scss index aa433dc904..eb2f30f548 100644 --- a/ui/packages/consul-ui/app/styles/routes/dc/nodes/index.scss +++ b/ui/packages/consul-ui/app/styles/routes/dc/nodes/index.scss @@ -4,3 +4,7 @@ html[data-route^='dc.nodes.show.metadata'] table tr { html[data-route^='dc.nodes.show.sessions'] .consul-lock-session-list { @extend %list-after-secondary-nav; } +html[data-route^='dc.nodes.index'] .agentless-node-notice header { + display: flex; + justify-content: space-between; +} diff --git a/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes b/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes index 8b63b7997d..26a2ac5016 100644 --- a/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes +++ b/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes @@ -24,7 +24,8 @@ "wan":"${fake.internet.ip()}" }, "Meta": { - "consul-network-segment":"" + "consul-network-segment":"", + "synthetic-node": "${fake.helpers.randomize(["true", "false", "false", "false"])}" }, "Services":[ ${ diff --git a/ui/packages/consul-ui/translations/routes/en-us.yaml b/ui/packages/consul-ui/translations/routes/en-us.yaml index 4e157d9dff..43bd0fa67a 100644 --- a/ui/packages/consul-ui/translations/routes/en-us.yaml +++ b/ui/packages/consul-ui/translations/routes/en-us.yaml @@ -55,6 +55,11 @@ dc: nodes: index: + agentless: + notice: + header: Consul 1.14 removes client nodes from Kubernetes Service Mesh deployments + body: Kubernetes clusters do not require client nodes to run as of Consul 1.14. Kubernetes nodes will not appear in this view. + footer: View documentation on Consul Dataplane empty: header: | {items, select,