github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

apf: use v1beta2 for registry

Browse Source
This commit is contained in:
Abu Kashem 2021-12-17 10:35:37 -05:00
parent 712745cb67
commit f30a34bc01
No known key found for this signature in database
GPG Key ID: 33A4FA7088DB68A9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/registry/flowcontrol/ensurer/strategy.go
View File

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
"strconv" "strconv"
flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@ -176,7 +176,7 @@ func (s *strategy) ShouldUpdate(current, bootstrap configurationObject) (runtime
// shouldUpdateSpec inspects the auto-update annotation key and generation field to determine // shouldUpdateSpec inspects the auto-update annotation key and generation field to determine
// whether the configurationWrapper object should be auto-updated. // whether the configurationWrapper object should be auto-updated.
func shouldUpdateSpec(accessor metav1.Object) bool { func shouldUpdateSpec(accessor metav1.Object) bool {
value, _ := accessor.GetAnnotations()[flowcontrolv1beta1.AutoUpdateAnnotationKey] value, _ := accessor.GetAnnotations()[flowcontrolv1beta2.AutoUpdateAnnotationKey]
if autoUpdate, err := strconv.ParseBool(value); err == nil { if autoUpdate, err := strconv.ParseBool(value); err == nil {
return autoUpdate return autoUpdate
} }
@ -196,7 +196,7 @@ func shouldUpdateSpec(accessor metav1.Object) bool {
// shouldUpdateAnnotation determines whether the current value of the auto-update annotation // shouldUpdateAnnotation determines whether the current value of the auto-update annotation
// key matches the desired value. // key matches the desired value.
func shouldUpdateAnnotation(accessor metav1.Object, desired bool) bool { func shouldUpdateAnnotation(accessor metav1.Object, desired bool) bool {
if value, ok := accessor.GetAnnotations()[flowcontrolv1beta1.AutoUpdateAnnotationKey]; ok { if value, ok := accessor.GetAnnotations()[flowcontrolv1beta2.AutoUpdateAnnotationKey]; ok {
if current, err := strconv.ParseBool(value); err == nil && current == desired { if current, err := strconv.ParseBool(value); err == nil && current == desired {
return false return false
} }
@ -211,7 +211,7 @@ func setAutoUpdateAnnotation(accessor metav1.Object, autoUpdate bool) {
accessor.SetAnnotations(map[string]string{}) accessor.SetAnnotations(map[string]string{})
} }
accessor.GetAnnotations()[flowcontrolv1beta1.AutoUpdateAnnotationKey] = strconv.FormatBool(autoUpdate) accessor.GetAnnotations()[flowcontrolv1beta2.AutoUpdateAnnotationKey] = strconv.FormatBool(autoUpdate)
} }
// ensureConfiguration ensures the boostrap configurationWrapper on the cluster based on the specified strategy. // ensureConfiguration ensures the boostrap configurationWrapper on the cluster based on the specified strategy.
@ -265,7 +265,7 @@ func removeConfiguration(wrapper configurationWrapper, name string) error {
return fmt.Errorf("failed to retrieve the %s, will retry later name=%q error=%w", wrapper.TypeName(), name, err) return fmt.Errorf("failed to retrieve the %s, will retry later name=%q error=%w", wrapper.TypeName(), name, err)
} }
value := current.GetAnnotations()[flowcontrolv1beta1.AutoUpdateAnnotationKey] value := current.GetAnnotations()[flowcontrolv1beta2.AutoUpdateAnnotationKey]
autoUpdate, err := strconv.ParseBool(value) autoUpdate, err := strconv.ParseBool(value)
if err != nil { if err != nil {
klog.ErrorS(err, fmt.Sprintf("Skipping deletion of the %s", wrapper.TypeName()), "name", name) klog.ErrorS(err, fmt.Sprintf("Skipping deletion of the %s", wrapper.TypeName()), "name", name)
@ -308,7 +308,7 @@ func getRemoveCandidate(bootstrap sets.String, current []metav1.Object) []string
candidates := make([]string, 0) candidates := make([]string, 0)
for i := range current { for i := range current {
object := current[i] object := current[i]
if _, ok := object.GetAnnotations()[flowcontrolv1beta1.AutoUpdateAnnotationKey]; !ok { if _, ok := object.GetAnnotations()[flowcontrolv1beta2.AutoUpdateAnnotationKey]; !ok {
// the configuration object does not have the annotation key // the configuration object does not have the annotation key
continue continue
} }