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

Replace reflect.DeepEqual with semantic equality check and remove status marshal

Browse Source 
Signed-off-by: salmanahmed404 <salmanahmed404@gmail.com>
This commit is contained in:
Salman 2021-03-27 12:49:04 +05:30
parent 572bfb9111
commit 800d6019bf
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/certificaterequests/BUILD.bazel
View File

@ -23,6 +23,7 @@ go_library(
"//pkg/util/pki:go_default_library",
"@com_github_go_logr_logr//:go_default_library",
"@com_github_kr_pretty//:go_default_library",
"@io_k8s_apimachinery//pkg/api/equality:go_default_library",
"@io_k8s_apimachinery//pkg/api/errors:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
"@io_k8s_apimachinery//pkg/labels:go_default_library",

8
pkg/controller/certificaterequests/sync.go
View File

@ -18,11 +18,11 @@ package certificaterequests
import (
"context"
"encoding/json"
"fmt"
"reflect"
"github.com/kr/pretty"
apiequality "k8s.io/apimachinery/pkg/api/equality"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
@ -163,12 +163,10 @@ func (c *Controller) updateCertificateRequestStatusAndAnnotations(ctx context.Co
return c.cmClient.CertmanagerV1().CertificateRequests(new.Namespace).Update(context.TODO(), new, metav1.UpdateOptions{})
}
oldBytes, _ := json.Marshal(old.Status)
newBytes, _ := json.Marshal(new.Status)
if reflect.DeepEqual(oldBytes, newBytes) {
if apiequality.Semantic.DeepEqual(old.Status, new.Status) {
return nil, nil
}
log.V(logf.DebugLevel).Info("updating resource due to change in status", "diff", pretty.Diff(string(oldBytes), string(newBytes)))
log.V(logf.DebugLevel).Info("updating resource due to change in status", "diff", pretty.Diff(old.Status, new.Status))
return c.cmClient.CertmanagerV1().CertificateRequests(new.Namespace).UpdateStatus(context.TODO(), new, metav1.UpdateOptions{})
}

1
pkg/controller/clusterissuers/BUILD.bazel
View File

@ -18,6 +18,7 @@ go_library(
"//pkg/logs:go_default_library",
"@com_github_go_logr_logr//:go_default_library",
"@io_k8s_api//core/v1:go_default_library",
"@io_k8s_apimachinery//pkg/api/equality:go_default_library",
"@io_k8s_apimachinery//pkg/api/errors:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
"@io_k8s_apimachinery//pkg/labels:go_default_library",

4
pkg/controller/clusterissuers/sync.go
View File

@ -18,10 +18,10 @@ package clusterissuers
import (
"context"
"reflect"
"time"
corev1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/errors"
@ -65,7 +65,7 @@ func (c *controller) Sync(ctx context.Context, iss *cmapi.ClusterIssuer) (err er
}
func (c *controller) updateIssuerStatus(old, new *cmapi.ClusterIssuer) (*cmapi.ClusterIssuer, error) {
if reflect.DeepEqual(old.Status, new.Status) {
if apiequality.Semantic.DeepEqual(old.Status, new.Status) {
return nil, nil
}
return c.cmClient.CertmanagerV1().ClusterIssuers().UpdateStatus(context.TODO(), new, metav1.UpdateOptions{})

1
pkg/controller/issuers/BUILD.bazel
View File

@ -18,6 +18,7 @@ go_library(
"//pkg/logs:go_default_library",
"@com_github_go_logr_logr//:go_default_library",
"@io_k8s_api//core/v1:go_default_library",
"@io_k8s_apimachinery//pkg/api/equality:go_default_library",
"@io_k8s_apimachinery//pkg/api/errors:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
"@io_k8s_apimachinery//pkg/labels:go_default_library",

4
pkg/controller/issuers/sync.go
View File

@ -18,10 +18,10 @@ package issuers
import (
"context"
"reflect"
"time"
corev1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/errors"
@ -65,7 +65,7 @@ func (c *controller) Sync(ctx context.Context, iss *cmapi.Issuer) (err error) {
}
func (c *controller) updateIssuerStatus(old, new *cmapi.Issuer) (*cmapi.Issuer, error) {
if reflect.DeepEqual(old.Status, new.Status) {
if apiequality.Semantic.DeepEqual(old.Status, new.Status) {
return nil, nil
}
return c.cmClient.CertmanagerV1().Issuers(new.Namespace).UpdateStatus(context.TODO(), new, metav1.UpdateOptions{})