github/kubescape
1
0
Fork 0
mirror of https://github.com/kubescape/kubescape.git synced 2026-04-15 06:58:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adopt custom cluster name (#862)

Browse Source 
* change user to ks

* update logs

* host scanner with fixed version

* testing gh actions

* testing gh actions

* Workflow call testing (#7)

* testing gh actions

* testing gh actions

* remove deps

* build multi platforms

* workflow_call testing

* adding workflow-call-testing branch name

* specify URL

* adding org name

* adding workflows

* cleaning from unused branches

* Adopt custom cluster name
This commit is contained in:
David Wertenteil
2022-10-06 11:04:05 +03:00
committed by GitHub
parent 13f09315e7
commit 063d3ee313
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/cautils/customerloader.go
+2 -15
View File
@@ -106,7 +106,7 @@ func NewLocalConfig(
// If a custom cluster name is provided then set that name, else use the cluster's original name
if customClusterName != "" {
lc.configObj.ClusterName = AdoptCustomClusterName(customClusterName)
lc.configObj.ClusterName = AdoptClusterName(customClusterName)
} else if clusterName != "" {
lc.configObj.ClusterName = AdoptClusterName(clusterName) // override config clusterName
}
@@ -216,7 +216,7 @@ func NewClusterConfig(k8s *k8sinterface.KubernetesApi, backendAPI getter.IBacken
// If a custom cluster name is provided then set that name, else use the cluster's original name
if customClusterName != "" {
c.configObj.ClusterName = AdoptCustomClusterName(customClusterName)
c.configObj.ClusterName = AdoptClusterName(customClusterName)
} else if clusterName != "" {
c.configObj.ClusterName = AdoptClusterName(clusterName) // override config clusterName
}
@@ -474,19 +474,6 @@ func DeleteConfigFile() error {
return os.Remove(ConfigFileFullPath())
}
// To check if the custom cluster name is valid:
func AdoptCustomClusterName(customClusterName string) string {
is_alphanumeric := regexp.MustCompile(`^[a-zA-Z0-9]*$`).MatchString(customClusterName)
// Check it does not contain special-characters
if is_alphanumeric == false {
logger.L().Fatal("custom cluster name cannot contain special characters")
} else if len(customClusterName) >= 256 { // Check it contains less than 256 characters
logger.L().Fatal("custom cluster name cannot contain more than 255 characters")
}
return customClusterName
}
func AdoptClusterName(clusterName string) string {
re, err := regexp.Compile(`[^\w]+`)
if err != nil {