weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Set FieldManager in Create Orders API calls

Browse Source 
Signed-off-by: joshvanl <vleeuwenjoshua@gmail.com>
This commit is contained in:
joshvanl 2022-02-07 14:30:50 +00:00
parent 1aa5b0e5f5
commit 8fd5641305
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/certificaterequests/acme/acme.go
View File

@ -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)

5
pkg/controller/certificatesigningrequests/acme/acme.go
View File

@ -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.