Skip to content

Commit

Permalink
replace k8s.io/utils/pointer with k8s.io/utils/ptr
Browse files Browse the repository at this point in the history 
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
  • Loading branch information
@inteon
inteon committed Aug 28, 2023
1 parent 70c1881 commit cf8e372
Show file tree
Hide file tree
Showing 39 changed files with 206 additions and 207 deletions.
6 changes: 3 additions & 3 deletions internal/apis/acme/validation/order_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
admissionv1 "k8s.io/api/admission/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"

cmacme "github.com/cert-manager/cert-manager/internal/apis/acme"
)
Expand Down Expand Up @@ -153,11 +153,11 @@ func TestValidateOrderUpdate(t *testing.T) {
}
case testValueOptionOne:
o.Status.Authorizations = []cmacme.ACMEAuthorization{
{Wildcard: pointer.BoolPtr(false)},
{Wildcard: ptr.To(false)},
}
case testValueOptionTwo:
o.Status.Authorizations = []cmacme.ACMEAuthorization{
{Wildcard: pointer.BoolPtr(true)},
{Wildcard: ptr.To(true)},
}
}
})
Expand Down
6 changes: 3 additions & 3 deletions internal/apis/config/webhook/v1alpha1/defaults.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1alpha1
import (
"k8s.io/apimachinery/pkg/runtime"
logsapi "k8s.io/component-base/logs/api/v1"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"

"github.com/cert-manager/cert-manager/pkg/apis/config/webhook/v1alpha1"
)
Expand All @@ -30,10 +30,10 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {

func SetDefaults_WebhookConfiguration(obj *v1alpha1.WebhookConfiguration) {
if obj.SecurePort == nil {
obj.SecurePort = pointer.Int32(6443)
obj.SecurePort = ptr.To(int32(6443))
}
if obj.HealthzPort == nil {
obj.HealthzPort = pointer.Int32(6080)
obj.HealthzPort = ptr.To(int32(6080))
}
if obj.PprofAddress == "" {
obj.PprofAddress = "localhost:6060"
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/certificaterequests/apply.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
apitypes "k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"

cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
Expand All @@ -42,7 +42,7 @@ func Apply(ctx context.Context, cl cmclient.Interface, fieldManager string, req

return cl.CertmanagerV1().CertificateRequests(req.Namespace).Patch(
ctx, req.Name, apitypes.ApplyPatchType, reqData,
metav1.PatchOptions{Force: pointer.Bool(true), FieldManager: fieldManager})
metav1.PatchOptions{Force: ptr.To(true), FieldManager: fieldManager})
}

// ApplyStatus will make an Apply API call with the given client to the
Expand All @@ -59,7 +59,7 @@ func ApplyStatus(ctx context.Context, cl cmclient.Interface, fieldManager string

_, err = cl.CertmanagerV1().CertificateRequests(req.Namespace).Patch(
ctx, req.Name, apitypes.ApplyPatchType, reqData,
metav1.PatchOptions{Force: pointer.Bool(true), FieldManager: fieldManager}, "status",
metav1.PatchOptions{Force: ptr.To(true), FieldManager: fieldManager}, "status",
)

return err
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/certificates/apply.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
apitypes "k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"

cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
Expand All @@ -43,7 +43,7 @@ func Apply(ctx context.Context, cl cmclient.Interface, fieldManager string, crt

_, err = cl.CertmanagerV1().Certificates(crt.Namespace).Patch(
ctx, crt.Name, apitypes.ApplyPatchType, crtData,
metav1.PatchOptions{Force: pointer.Bool(true), FieldManager: fieldManager},
metav1.PatchOptions{Force: ptr.To(true), FieldManager: fieldManager},
)

return err
Expand All @@ -62,7 +62,7 @@ func ApplyStatus(ctx context.Context, cl cmclient.Interface, fieldManager string

_, err = cl.CertmanagerV1().Certificates(crt.Namespace).Patch(
ctx, crt.Name, apitypes.ApplyPatchType, crtData,
metav1.PatchOptions{Force: pointer.Bool(true), FieldManager: fieldManager}, "status",
metav1.PatchOptions{Force: ptr.To(true), FieldManager: fieldManager}, "status",
)

return err
Expand Down
20 changes: 10 additions & 10 deletions internal/controller/certificates/policies/checks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/utils/clock"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
"sigs.k8s.io/structured-merge-diff/v4/value"

Expand Down Expand Up @@ -384,13 +384,13 @@ func secretLabelsAndAnnotationsManagedFields(secret *corev1.Secret, fieldManager

// Extract the labels and annotations of the managed fields.
metadata := fieldset.Children.Descend(fieldpath.PathElement{
FieldName: pointer.String("metadata"),
FieldName: ptr.To("metadata"),
})
labels := metadata.Children.Descend(fieldpath.PathElement{
FieldName: pointer.String("labels"),
FieldName: ptr.To("labels"),
})
annotations := metadata.Children.Descend(fieldpath.PathElement{
FieldName: pointer.String("annotations"),
FieldName: ptr.To("annotations"),
})

// Gather the annotations and labels on the managed fields. Remove the '.'
Expand Down Expand Up @@ -666,15 +666,15 @@ func SecretAdditionalOutputFormatsManagedFieldsMismatch(fieldManager string) Fun
}

if fieldset.Has(fieldpath.Path{
{FieldName: pointer.String("data")},
{FieldName: pointer.String(cmapi.CertificateOutputFormatCombinedPEMKey)},
{FieldName: ptr.To("data")},
{FieldName: ptr.To(cmapi.CertificateOutputFormatCombinedPEMKey)},
}) {
secretHasCombinedPEM = true
}

if fieldset.Has(fieldpath.Path{
{FieldName: pointer.String("data")},
{FieldName: pointer.String(cmapi.CertificateOutputFormatDERKey)},
{FieldName: ptr.To("data")},
{FieldName: ptr.To(cmapi.CertificateOutputFormatDERKey)},
}) {
secretHasDER = true
}
Expand Down Expand Up @@ -711,8 +711,8 @@ func SecretOwnerReferenceManagedFieldMismatch(ownerRefEnabled bool, fieldManager
return ManagedFieldsParseError, fmt.Sprintf("failed to decode managed fields on Secret: %s", err), true
}
if fieldset.Has(fieldpath.Path{
{FieldName: pointer.String("metadata")},
{FieldName: pointer.String("ownerReferences")},
{FieldName: ptr.To("metadata")},
{FieldName: ptr.To("ownerReferences")},
{Key: &value.FieldList{{Name: "uid", Value: value.NewValueInterface(string(input.Certificate.UID))}}},
}) {
hasOwnerRefManagedField = true
Expand Down
62 changes: 31 additions & 31 deletions internal/controller/certificates/policies/checks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
fakeclock "k8s.io/utils/clock/testing"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"

cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
Expand Down Expand Up @@ -2051,7 +2051,7 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
},
},
},
Expand All @@ -2067,8 +2067,8 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
},
},
},
Expand All @@ -2084,9 +2084,9 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "test-certificate", UID: types.UID("uid-123"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "test-certificate", UID: types.UID("uid-123"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
},
},
},
Expand All @@ -2102,9 +2102,9 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "foo", UID: types.UID("uid-123"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "foo", UID: types.UID("uid-123"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
},
},
},
Expand All @@ -2131,7 +2131,7 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
},
},
},
Expand All @@ -2147,8 +2147,8 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
},
},
},
Expand All @@ -2164,9 +2164,9 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "test-certificate", UID: types.UID("uid-123"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "test-certificate", UID: types.UID("uid-123"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
},
},
},
Expand All @@ -2182,9 +2182,9 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "foo", UID: types.UID("uid-123"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "foo", UID: types.UID("uid-123"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
},
},
},
Expand All @@ -2200,9 +2200,9 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "acme.cert-manager.io/v1", Kind: "Certificate", Name: "test-certificate", UID: types.UID("uid-123"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
{APIVersion: "acme.cert-manager.io/v1", Kind: "Certificate", Name: "test-certificate", UID: types.UID("uid-123"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
},
},
},
Expand All @@ -2218,9 +2218,9 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Issuer", Name: "test-certificate", UID: types.UID("uid-123"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Issuer", Name: "test-certificate", UID: types.UID("uid-123"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
},
},
},
Expand All @@ -2236,9 +2236,9 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "test-certificate", UID: types.UID("uid-123"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "test-certificate", UID: types.UID("uid-123"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(true)},
},
},
},
Expand All @@ -2254,9 +2254,9 @@ func Test_SecretOwnerReferenceMismatch(t *testing.T) {
Secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
OwnerReferences: []metav1.OwnerReference{
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: pointer.Bool(false), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "test-certificate", UID: types.UID("uid-123"), Controller: pointer.Bool(true), BlockOwnerDeletion: pointer.Bool(false)},
{APIVersion: "foo.bar/v1", Kind: "Foo", Name: "foo", UID: types.UID("abc"), Controller: ptr.To(false), BlockOwnerDeletion: ptr.To(false)},
{APIVersion: "bar.foo/v1", Kind: "Bar", Name: "bar", UID: types.UID("def"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true)},
{APIVersion: "cert-manager.io/v1", Kind: "Certificate", Name: "test-certificate", UID: types.UID("uid-123"), Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(false)},
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/challenges/apply.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
apitypes "k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"

cmacme "github.com/cert-manager/cert-manager/pkg/apis/acme/v1"
cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
Expand All @@ -41,7 +41,7 @@ func Apply(ctx context.Context, cl cmclient.Interface, fieldManager string, chal

return cl.AcmeV1().Challenges(challenge.Namespace).Patch(
ctx, challenge.Name, apitypes.ApplyPatchType, challengeData,
metav1.PatchOptions{Force: pointer.Bool(true), FieldManager: fieldManager},
metav1.PatchOptions{Force: ptr.To(true), FieldManager: fieldManager},
)
}

Expand All @@ -58,7 +58,7 @@ func ApplyStatus(ctx context.Context, cl cmclient.Interface, fieldManager string

return cl.AcmeV1().Challenges(challenge.Namespace).Patch(
ctx, challenge.Name, apitypes.ApplyPatchType, challengeData,
metav1.PatchOptions{Force: pointer.Bool(true), FieldManager: fieldManager}, "status",
metav1.PatchOptions{Force: ptr.To(true), FieldManager: fieldManager}, "status",
)
}

Expand Down
Loading

0 comments on commit cf8e372

Please sign in to comment.