diff --git a/pkg/controller/certificaterequests/acme/acme.go b/pkg/controller/certificaterequests/acme/acme.go index 5565d0b98..de60ce490 100644 --- a/pkg/controller/certificaterequests/acme/acme.go +++ b/pkg/controller/certificaterequests/acme/acme.go @@ -57,6 +57,9 @@ type ACME struct { acmeClientV cmacmeclientset.AcmeV1Interface reporter *crutil.Reporter + + // fieldManager is the manager name used for Create and Apply operations. + fieldManager string } func init() { @@ -82,6 +85,7 @@ func NewACME(ctx *controllerpkg.Context) certificaterequests.Issuer { orderLister: ctx.SharedInformerFactory.Acme().V1().Orders().Lister(), acmeClientV: ctx.CMClient.AcmeV1(), reporter: crutil.NewReporter(ctx.Clock, ctx.Recorder), + fieldManager: ctx.FieldManager, } } @@ -132,7 +136,7 @@ func (a *ACME) Sign(ctx context.Context, cr *cmapi.CertificateRequest, issuer cm if k8sErrors.IsNotFound(err) { // Failing to create the order here is most likely network related. // We should backoff and keep trying. - _, err = a.acmeClientV.Orders(expectedOrder.Namespace).Create(ctx, expectedOrder, metav1.CreateOptions{}) + _, err = a.acmeClientV.Orders(expectedOrder.Namespace).Create(ctx, expectedOrder, metav1.CreateOptions{FieldManager: a.fieldManager}) if err != nil { message := fmt.Sprintf("Failed create new order resource %s/%s", expectedOrder.Namespace, expectedOrder.Name) diff --git a/pkg/controller/certificatesigningrequests/acme/acme.go b/pkg/controller/certificatesigningrequests/acme/acme.go index d562360f2..4c675853f 100644 --- a/pkg/controller/certificatesigningrequests/acme/acme.go +++ b/pkg/controller/certificatesigningrequests/acme/acme.go @@ -65,6 +65,9 @@ type ACME struct { recorder record.EventRecorder copiedAnnotationPrefixes []string + + // fieldManager is the manager name used for Create and Apply operations. + fieldManager string } func init() { @@ -139,7 +142,7 @@ func (a *ACME) Sign(ctx context.Context, csr *certificatesv1.CertificateSigningR order, err := a.orderLister.Orders(expectedOrder.Namespace).Get(expectedOrder.Name) if apierrors.IsNotFound(err) { - _, err = a.acmeClientV.Orders(expectedOrder.Namespace).Create(ctx, expectedOrder, metav1.CreateOptions{}) + _, err = a.acmeClientV.Orders(expectedOrder.Namespace).Create(ctx, expectedOrder, metav1.CreateOptions{FieldManager: a.fieldManager}) if err != nil { // Failing to create the order here is most likely network related. We // should backoff and keep trying.