Skip to content

Commit 141b1fd

Browse files
add resource name length limit
Signed-off-by: LiZhenCheng9527 <lizhencheng6@huawei.com>
1 parent 386cab0 commit 141b1fd

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

e2e/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
9696
gomega.Expect(secretCreateErr).ShouldNot(gomega.HaveOccurred())
9797

9898
attachedCreateErr := resources.CreateAttachedCluster(kuratorClient, attachedcluster)
99-
gomega.Expect(attachedCreateErr).ShouldNot(gomega.HaveOccurred())
10099
resources.WaitAttachedClusterFitWith(kuratorClient, namespace, memberClusterName, func(attachedCluster *clusterv1a1.AttachedCluster) bool {
101100
return attachedCluster.Status.Ready
102101
})
102+
gomega.Expect(attachedCreateErr).ShouldNot(gomega.HaveOccurred())
103103
})

pkg/cluster-operator/customcluster_helper.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,15 @@ func generateClusterConfigKey(customCluster *v1alpha1.CustomCluster) client.Obje
283283
}
284284

285285
func generateClusterHostsName(customCluster *v1alpha1.CustomCluster) string {
286-
return customCluster.Name + "-" + ClusterHostsName
286+
hostName := customCluster.Name + "-" + ClusterHostsName
287+
hostName = names.SimpleNameGenerator.GenerateName(hostName)
288+
return hostName
287289
}
288290

289291
func generateClusterConfigName(customCluster *v1alpha1.CustomCluster) string {
290-
return customCluster.Name + "-" + ClusterConfigName
292+
configName := customCluster.Name + "-" + ClusterConfigName
293+
configName = names.SimpleNameGenerator.GenerateName(configName)
294+
return configName
291295
}
292296

293297
func generateOwnerRefFromCustomCluster(customCluster *v1alpha1.CustomCluster) metav1.OwnerReference {

pkg/cluster-operator/customcluster_scale.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
corev1 "k8s.io/api/core/v1"
2626
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
28+
"k8s.io/apiserver/pkg/storage/names"
2829
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2930
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
3031
"sigs.k8s.io/cluster-api/util/conditions"
@@ -234,7 +235,9 @@ func generateScaleUpHostsKey(customCluster *v1alpha1.CustomCluster) client.Objec
234235
}
235236

236237
func generateScaleUpHostsName(customCluster *v1alpha1.CustomCluster) string {
237-
return customCluster.Name + "-" + ClusterHostsName + "-scale-up"
238+
scaleUpHostName := customCluster.Name + "-" + ClusterHostsName + "-scale-up"
239+
scaleUpHostName = names.SimpleNameGenerator.GenerateName(scaleUpHostName)
240+
return scaleUpHostName
238241
}
239242

240243
// generateScaleDownManageCMD generate a kubespray cmd to delete the node from the list of nodesNeedDelete.

pkg/fleet-manager/controlplane.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
apierrors "k8s.io/apimachinery/pkg/api/errors"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/types"
28+
"k8s.io/apiserver/pkg/storage/names"
2829
ctrl "sigs.k8s.io/controller-runtime"
2930

3031
fleetapi "kurator.dev/kurator/pkg/apis/fleet/v1alpha1"
@@ -45,6 +46,7 @@ func (f *FleetManager) reconcileControlPlane(ctx context.Context, fleet *fleetap
4546
}
4647
// TODO: generate a valid name
4748
podName := fleet.Name + "-init"
49+
podName = names.SimpleNameGenerator.GenerateName(podName)
4850
namespace := fleet.Namespace
4951

5052
clusterKey := types.NamespacedName{Name: podName, Namespace: namespace}
@@ -155,6 +157,7 @@ func (f *FleetManager) deleteControlPlane(ctx context.Context, fleet *fleetapi.F
155157
return nil
156158
}
157159
podName := fleet.Name + "-delete"
160+
podName = names.SimpleNameGenerator.GenerateName(podName)
158161
namespace := fleet.Namespace
159162

160163
clusterKey := types.NamespacedName{Name: podName, Namespace: namespace}

0 commit comments

Comments
 (0)