karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

the binding name for any resource template should be a name-kind format (#248) 

Signed-off-by: icbc-yangcheng <shineus1996@gmail.com>
This commit is contained in:
yangcheng-icbc 2021-03-31 16:33:45 +08:00 committed by GitHub
parent 986bcbcd29
commit 3c193e1760
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controllers/hpa/hpa_controller.go
View File

@ -87,7 +87,7 @@ func (c *HorizontalPodAutoscalerController) buildWorks(hpa *autoscalingv1.Horizo
klog.Errorf("Failed to ensure Work for cluster: %s. Error: %v.", clusterName, err)
return err
}
workName := names.GenerateBindingName(hpaObj.GetNamespace(), hpaObj.GetKind(), hpaObj.GetName())
workName := names.GenerateBindingName(hpaObj.GetKind(), hpaObj.GetName())
objectMeta := metav1.ObjectMeta{
Name: workName,
Namespace: workNamespace,
@ -131,7 +131,7 @@ func (c *HorizontalPodAutoscalerController) getTargetPlacement(objRef autoscalin
if err != nil {
return nil, err
}
bindingName := names.GenerateBindingName(unstructuredWorkLoad.GetNamespace(), unstructuredWorkLoad.GetKind(), unstructuredWorkLoad.GetName())
bindingName := names.GenerateBindingName(unstructuredWorkLoad.GetKind(), unstructuredWorkLoad.GetName())
binding := &workv1alpha1.ResourceBinding{}
namespacedName := types.NamespacedName{
Namespace: namespace,

2
pkg/controllers/namespace/namespace_sync_controller.go
View File

@ -105,7 +105,7 @@ func (c *Controller) buildWorks(namespace *v1.Namespace, clusters []v1alpha1.Clu
return err
}
workName := names.GenerateClusterResourceBindingName(namespaceObj.GetKind(), namespaceObj.GetName())
workName := names.GenerateBindingName(namespaceObj.GetKind(), namespaceObj.GetName())
objectMeta := metav1.ObjectMeta{
Name: workName,
Namespace: workNamespace,

9
pkg/controllers/status/workstatus_controller.go
View File

@ -201,14 +201,7 @@ func (c *WorkStatusController) handleDeleteEvent(key string) error {
if err != nil {
return err
}
var workName string
if clusterWorkload.Namespace == "" {
workName = names.GenerateClusterResourceBindingName(clusterWorkload.GVK.Kind, clusterWorkload.Name)
} else {
workName = names.GenerateBindingName(clusterWorkload.Namespace, clusterWorkload.GVK.Kind, clusterWorkload.Name)
}
workName := names.GenerateBindingName(clusterWorkload.GVK.Kind, clusterWorkload.Name)
work := &workv1alpha1.Work{}
if err := c.Client.Get(context.TODO(), client.ObjectKey{Namespace: executionSpace, Name: workName}, work); err != nil {
// Stop processing if resource no longer exist.

4
pkg/util/detector/detector.go
View File

@ -439,7 +439,7 @@ func (d *ResourceDetector) ClaimClusterPolicyForObject(object *unstructured.Unst
// BuildResourceBinding builds a desired ResourceBinding for object.
func (d *ResourceDetector) BuildResourceBinding(object *unstructured.Unstructured, objectKey keys.ClusterWideKey, policy *policyv1alpha1.PropagationPolicy) *workv1alpha1.ResourceBinding {
bindingName := names.GenerateBindingName(object.GetNamespace(), object.GetKind(), object.GetName())
bindingName := names.GenerateBindingName(object.GetKind(), object.GetName())
propagationBinding := &workv1alpha1.ResourceBinding{
ObjectMeta: metav1.ObjectMeta{
Name: bindingName,
@ -468,7 +468,7 @@ func (d *ResourceDetector) BuildResourceBinding(object *unstructured.Unstructure
// BuildClusterResourceBinding builds a desired ClusterResourceBinding for object.
func (d *ResourceDetector) BuildClusterResourceBinding(object *unstructured.Unstructured, objectKey keys.ClusterWideKey, policy *policyv1alpha1.ClusterPropagationPolicy) *workv1alpha1.ClusterResourceBinding {
bindingName := names.GenerateClusterResourceBindingName(object.GetKind(), object.GetName())
bindingName := names.GenerateBindingName(object.GetKind(), object.GetName())
binding := &workv1alpha1.ClusterResourceBinding{
ObjectMeta: metav1.ObjectMeta{
Name: bindingName,

9
pkg/util/names/names.go
View File

@ -40,13 +40,8 @@ func GetClusterName(executionSpaceName string) (string, error) {
}
// GenerateBindingName will generate binding name by namespace, kind and name
func GenerateBindingName(namespace, kind, name string) string {
return strings.ToLower(namespace + "-" + kind + "-" + name)
}
// GenerateClusterResourceBindingName will generate ClusterResourceBinding name by kind and name
func GenerateClusterResourceBindingName(kind, name string) string {
return strings.ToLower(kind + "-" + name)
func GenerateBindingName(kind, name string) string {
return strings.ToLower(name + "-" + kind)
}
// GenerateServiceAccountName generates the name of a ServiceAccount.