Merge pull request #3826 from jwcesign/allow-custom-metrics

feat: allow custom metrics configuration of FederatedHPA

pkg/util/lifted/corehelpers.go

@@ -24,8 +24,6 @@ import (
  "strings"
 
  corev1 "k8s.io/api/core/v1"
- apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/util/sets"
  "k8s.io/apimachinery/pkg/util/validation"
  "k8s.io/apimachinery/pkg/util/validation/field"
@@ -162,71 +160,3 @@ func ValidateDNS1123Label(value string, fldPath *field.Path) field.ErrorList {
  }
  return allErrs
 }
-
-// +lifted:source=https://github.com/kubernetes/kubernetes/blob/release-1.27/pkg/apis/core/validation/validation.go
-
-// ValidateNameFunc validates that the provided name is valid for a given resource type.
-// Not all resources have the same validation rules for names. Prefix is true
-// if the name will have a value appended to it. If the name is not valid,
-// this returns a list of descriptions of individual characteristics of the
-// value that were not valid. Otherwise this returns an empty list or nil.
-type ValidateNameFunc apimachineryvalidation.ValidateNameFunc
-
-// ValidateObjectMeta validates an object's metadata on creation. It expects that name generation has already
-// been performed.
-// It doesn't return an error for rootscoped resources with namespace, because namespace should already be cleared before.
-// TODO: Remove calls to this method scattered in validations of specific resources, e.g., ValidatePodUpdate.
-func ValidateObjectMeta(meta *metav1.ObjectMeta, requiresNamespace bool, nameFn ValidateNameFunc, fldPath *field.Path) field.ErrorList {
- allErrs := apimachineryvalidation.ValidateObjectMeta(meta, requiresNamespace, apimachineryvalidation.ValidateNameFunc(nameFn), fldPath)
- // run additional checks for the finalizer name
- for i := range meta.Finalizers {
- allErrs = append(allErrs, validateKubeFinalizerName(string(meta.Finalizers[i]), fldPath.Child("finalizers").Index(i))...)
- }
- return allErrs
-}
-
-// validateKubeFinalizerName checks for "standard" names of legacy finalizer
-func validateKubeFinalizerName(stringValue string, fldPath *field.Path) field.ErrorList {
- allErrs := field.ErrorList{}
- if len(strings.Split(stringValue, "/")) == 1 {
- if IsStandardFinalizerName(stringValue) {
- return append(allErrs, field.Invalid(fldPath, stringValue, "name is neither a standard finalizer name nor is it fully qualified"))
- }
- }
-
- return allErrs
-}
-
-// +lifted:source=https://github.com/kubernetes/kubernetes/blob/release-1.27/pkg/apis/core/helper/helpers.go
-
-var standardFinalizers = sets.NewString(
- string(corev1.FinalizerKubernetes),
- metav1.FinalizerOrphanDependents,
- metav1.FinalizerDeleteDependents,
-)
-
-// IsStandardFinalizerName checks if the input string is a standard finalizer name
-func IsStandardFinalizerName(str string) bool {
- return standardFinalizers.Has(str)
-}
-
-// +lifted:source=https://github.com/kubernetes/kubernetes/blob/release-1.27/staging/src/k8s.io/apimachinery/pkg/api/validation/generic.go
-
-// NameIsDNSSubdomain is a ValidateNameFunc for names that must be a DNS subdomain.
-func NameIsDNSSubdomain(name string, prefix bool) []string {
- if prefix {
- name = maskTrailingDash(name)
- }
- return validation.IsDNS1123Subdomain(name)
-}
-
-// maskTrailingDash replaces the final character of a string with a subdomain safe
-// value if it is a dash and if the length of this string is greater than 1. Note that
-// this is used when a value could be appended to the string, see ValidateNameFunc
-// for more info.
-func maskTrailingDash(name string) string {
- if len(name) > 1 && strings.HasSuffix(name, "-") {
- return name[:len(name)-2] + "a"
- }
- return name
-}