Validate clusterRole when adding a cluster (#5878)

This commit is contained in:
Xinzhao Xu
2023-08-22 14:04:58 +08:00
committed by GitHub
parent 32c5e8714d
commit 40e910bbc0
3 changed files with 14 additions and 14 deletions

View File

@@ -96,6 +96,8 @@ authentication:
oauthOptions:
accessTokenMaxAge: 0s
accessTokenInactivityTimeout: 0s
multicluster:
clusterRole: host
`,
}
@@ -104,10 +106,12 @@ var memberMap = map[string]string{
monitoring:
endpoint: http://prometheus-operated.kubesphere-monitoring-system.svc:9090
authentication:
jwtSecret: sQh3JOqNbmci6Gu94TeV10AY7ipltwj
jwtSecret: sQh3JOqNbmci6Gu94TeV10AY7ipltwjp
oauthOptions:
accessTokenMaxAge: 0s
accessTokenInactivityTimeout: 0s
multicluster:
clusterRole: member
`,
}
@@ -437,19 +441,10 @@ func TestValidateMemberClusterConfiguration(t *testing.T) {
t.Fatal(err)
}
addMemberClusterResource(hostCm, t)
err = h.validateMemberClusterConfiguration(clientSet)
if err != nil {
addMemberClusterResource(memberCm, t)
if err = h.validateMemberClusterConfiguration(clientSet); err != nil {
t.Fatal(err)
}
addMemberClusterResource(memberCm, t)
err = h.validateMemberClusterConfiguration(clientSet)
if err == nil {
t.Fatal()
}
t.Log(err)
}
func addMemberClusterResource(targetCm *corev1.ConfigMap, t *testing.T) {