Backport of NET-6900: stop reconciling services when peering is enabled into release/1.17.x (#19917)

backport of commit a406813631

Co-authored-by: wenincode <tyler.wendlandt@hashicorp.com>
pull/19916/head
hc-github-team-consul-core 2023-12-12 09:01:30 -06:00 committed by GitHub
parent 9cb44f6222
commit a896e58d93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions

3
.changelog/19907.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
ui: stop manually reconciling services if peering is enabled
```

View File

@ -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;
}