Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nmaas Platform
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nmaas
nmaas Platform
Merge requests
!195
Small fixes clusters
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Small fixes clusters
small-fixes-clusters
into
develop
Overview
0
Commits
2
Pipelines
1
Changes
5
Merged
Karol Beyrowski
requested to merge
small-fixes-clusters
into
develop
2 months ago
Overview
0
Commits
2
Pipelines
1
Changes
5
Expand
0
0
Merge request reports
Compare
develop
develop (base)
and
latest version
latest version
03cd4bc2
2 commits,
2 months ago
5 files
+
66
−
5
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
5
Search (e.g. *.vue) (Ctrl+P)
src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
+
4
−
4
Options
@@ -37,8 +37,8 @@ import java.security.MessageDigest;
import
java.security.NoSuchAlgorithmException
;
import
java.time.OffsetDateTime
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.HashMap
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Objects
;
@@ -46,8 +46,8 @@ import java.util.Optional;
import
java.util.stream.Collectors
;
@Service
@RequiredArgsConstructor
@Slf4j
@RequiredArgsConstructor
public
class
RemoteClusterManager
implements
ClusterMonitoringService
{
private
final
KClusterRepository
clusterRepository
;
@@ -137,11 +137,11 @@ public class RemoteClusterManager implements ClusterMonitoringService {
.
state
(
KClusterState
.
UNKNOWN
)
.
contactEmail
(
view
.
getContactEmail
())
.
currentStateSince
(
OffsetDateTime
.
now
())
.
domains
(
view
.
getDomainNames
().
stream
().
map
(
d
->
{
.
domains
(
!
view
.
getDomainNames
().
isEmpty
()
?
view
.
getDomainNames
().
stream
().
map
(
d
->
{
Optional
<
Domain
>
dom
=
domainService
.
findDomain
(
d
);
return
dom
.
orElse
(
null
);
}
).
toList
())
).
toList
()
:
Collections
.
emptyList
()
)
.
build
(),
file
);
Loading