diff --git a/.changelog/19907.txt b/.changelog/19907.txt new file mode 100644 index 000000000000..905794114fbf --- /dev/null +++ b/.changelog/19907.txt @@ -0,0 +1,3 @@ +```release-note:bug +ui: stop manually reconciling services if peering is enabled +``` diff --git a/ui/packages/consul-ui/app/services/repository.js b/ui/packages/consul-ui/app/services/repository.js index 52180ce56a11..11c35739edf0 100644 --- a/ui/packages/consul-ui/app/services/repository.js +++ b/ui/packages/consul-ui/app/services/repository.js @@ -113,6 +113,17 @@ export default class RepositoryService extends Service { return false; } } + + // We were seeing issues where services were all being unloaded after visiting + // a peers imported services page. So if you viewes services -> peered imported services -> services + // only the peered services would remain as the others were all unloaded. Not certain if + // we should be doing any manual reconciling as it is. Not enough historical context + // to determine that at this time. + // + // https://hashicorp.atlassian.net/browse/NET-6900 + if (this.env.var('CONSUL_PEERINGS_ENABLED') && this.getModelName() === 'service') { + return false; + } return true; }