diff --git a/pkg/api/util/BUILD.bazel b/pkg/api/util/BUILD.bazel index 22f84cdd3..1597ca579 100644 --- a/pkg/api/util/BUILD.bazel +++ b/pkg/api/util/BUILD.bazel @@ -12,6 +12,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/apis/certmanager/v1alpha2:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/clock:go_default_library", diff --git a/pkg/api/util/conditions.go b/pkg/api/util/conditions.go index 1babdd284..f9834e98a 100644 --- a/pkg/api/util/conditions.go +++ b/pkg/api/util/conditions.go @@ -22,6 +22,7 @@ import ( "k8s.io/utils/clock" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2" + cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1" ) // Clock is defined as a package var so it can be stubbed out during tests. @@ -54,7 +55,7 @@ func IssuerHasCondition(i cmapi.GenericIssuer, c cmapi.IssuerCondition) bool { // condition will be updated and the LastTransitionTime set to the current // time. // This function works with both Issuer and ClusterIssuer resources. -func SetIssuerCondition(i cmapi.GenericIssuer, conditionType cmapi.IssuerConditionType, status cmapi.ConditionStatus, reason, message string) { +func SetIssuerCondition(i cmapi.GenericIssuer, conditionType cmapi.IssuerConditionType, status cmmeta.ConditionStatus, reason, message string) { newCondition := cmapi.IssuerCondition{ Type: conditionType, Status: status, @@ -117,7 +118,7 @@ func CertificateHasCondition(crt *cmapi.Certificate, c cmapi.CertificateConditio // - If a condition of the same type and different state already exists, the // condition will be updated and the LastTransitionTime set to the current // time. -func SetCertificateCondition(crt *cmapi.Certificate, conditionType cmapi.CertificateConditionType, status cmapi.ConditionStatus, reason, message string) { +func SetCertificateCondition(crt *cmapi.Certificate, conditionType cmapi.CertificateConditionType, status cmmeta.ConditionStatus, reason, message string) { newCondition := cmapi.CertificateCondition{ Type: conditionType, Status: status, @@ -162,7 +163,7 @@ func SetCertificateCondition(crt *cmapi.Certificate, conditionType cmapi.Certifi // - If a condition of the same type and different state already exists, the // condition will be updated and the LastTransitionTime set to the current // time. -func SetCertificateRequestCondition(cr *cmapi.CertificateRequest, conditionType cmapi.CertificateRequestConditionType, status cmapi.ConditionStatus, reason, message string) { +func SetCertificateRequestCondition(cr *cmapi.CertificateRequest, conditionType cmapi.CertificateRequestConditionType, status cmmeta.ConditionStatus, reason, message string) { newCondition := cmapi.CertificateRequestCondition{ Type: conditionType, Status: status, diff --git a/pkg/api/util/issuers.go b/pkg/api/util/issuers.go index fd04aef75..f4811cb4c 100644 --- a/pkg/api/util/issuers.go +++ b/pkg/api/util/issuers.go @@ -20,6 +20,7 @@ import ( "fmt" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2" + cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1" ) const ( @@ -54,7 +55,7 @@ func NameForIssuer(i cmapi.GenericIssuer) (string, error) { } // issuerKind returns the kind of issuer for a certificate -func IssuerKind(ref cmapi.ObjectReference) string { +func IssuerKind(ref cmmeta.ObjectReference) string { if ref.Kind == "" { return cmapi.IssuerKind }