Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
c83531dd
Commit
c83531dd
authored
Jun 08, 2022
by
wuhuiqiang2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix cluster-id in test k8s-cluster-config is null
parent
9b87e2da
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
ClusterConfigurationServiceImpl.java
...m/dlink/service/impl/ClusterConfigurationServiceImpl.java
+4
-0
No files found.
dlink-admin/src/main/java/com/dlink/service/impl/ClusterConfigurationServiceImpl.java
View file @
c83531dd
...
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
...
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.UUID
;
/**
/**
* ClusterConfigServiceImpl
* ClusterConfigServiceImpl
...
@@ -68,6 +69,9 @@ public class ClusterConfigurationServiceImpl extends SuperServiceImpl<ClusterCon
...
@@ -68,6 +69,9 @@ public class ClusterConfigurationServiceImpl extends SuperServiceImpl<ClusterCon
}
}
if
(
kubernetesConfig
.
containsKey
(
"kubernetes.cluster-id"
))
{
if
(
kubernetesConfig
.
containsKey
(
"kubernetes.cluster-id"
))
{
gatewayConfig
.
getFlinkConfig
().
getConfiguration
().
put
(
"kubernetes.cluster-id"
,
kubernetesConfig
.
get
(
"kubernetes.cluster-id"
).
toString
());
gatewayConfig
.
getFlinkConfig
().
getConfiguration
().
put
(
"kubernetes.cluster-id"
,
kubernetesConfig
.
get
(
"kubernetes.cluster-id"
).
toString
());
}
else
{
//初始化FlinkKubeClient需要CLUSTER_ID,先用UUID代替,后面使用job名称来作为CLUSTER_ID
gatewayConfig
.
getFlinkConfig
().
getConfiguration
().
put
(
"kubernetes.cluster-id"
,
UUID
.
randomUUID
().
toString
());
}
}
if
(
kubernetesConfig
.
containsKey
(
"kubernetes.container.image"
))
{
if
(
kubernetesConfig
.
containsKey
(
"kubernetes.container.image"
))
{
gatewayConfig
.
getFlinkConfig
().
getConfiguration
().
put
(
"kubernetes.container.image"
,
kubernetesConfig
.
get
(
"kubernetes.container.image"
).
toString
());
gatewayConfig
.
getFlinkConfig
().
getConfiguration
().
put
(
"kubernetes.container.image"
,
kubernetesConfig
.
get
(
"kubernetes.container.image"
).
toString
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment