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

Fix messageAppRoleAuthKeyRequired error message

Browse Source 
Signed-off-by: Ignat Belousov <ignatbelousov@Ignats-MacBook-Pro.local>
This commit is contained in:
Ignat Belousov 2023-08-04 17:50:23 +03:00 committed by Tim Ramlot
parent 35522192ff
commit 88f1500843
No known key found for this signature in database
GPG Key ID: 47428728E0C2878D
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/issuer/selfsigned/selfsigned.go
View File

@ -25,6 +25,7 @@ import (
)
// SelfSigned is an Issuer implementation the simply self-signs Certificates.
// For more info see: https://cert-manager.io/docs/configuration/selfsigned/
type SelfSigned struct {
*controller.Context
issuer v1.GenericIssuer

2
pkg/issuer/vault/setup.go
View File

@ -98,7 +98,7 @@ func (v *Vault) Setup(ctx context.Context) error {
return nil
}
if appRoleAuth != nil && len(appRoleAuth.SecretRef.Key) == 0 {
logf.V(logf.WarnLevel).Infof("%s: %s", v.issuer.GetObjectMeta().Name, messageTokenAuthNameRequired)
logf.V(logf.WarnLevel).Infof("%s: %s", v.issuer.GetObjectMeta().Name, messageAppRoleAuthKeyRequired)
apiutil.SetIssuerCondition(v.issuer, v.issuer.GetGeneration(), v1.IssuerConditionReady, cmmeta.ConditionFalse, errorVault, messageAppRoleAuthKeyRequired)
return nil
}

19
pkg/issuer/venafi/client/instrumentedvenaficlient.go
View File

@ -35,6 +35,10 @@ type instrumentedConnector struct {
var _ connector = instrumentedConnector{}
var (
now = time.Now()
)
func newInstumentedConnector(conn connector, metrics *metrics.Metrics, log logr.Logger) connector {
return instrumentedConnector{
conn: conn,
@ -44,46 +48,41 @@ func newInstumentedConnector(conn connector, metrics *metrics.Metrics, log logr.
}
func (ic instrumentedConnector) ReadZoneConfiguration() (*endpoint.ZoneConfiguration, error) {
start := time.Now()
ic.logger.V(logf.TraceLevel).Info("calling ReadZoneConfiguration")
config, err := ic.conn.ReadZoneConfiguration()
labels := []string{"read_zone_configuration"}
ic.metrics.ObserveVenafiRequestDuration(time.Since(start), labels...)
ic.metrics.ObserveVenafiRequestDuration(time.Since(now), labels...)
return config, err
}
func (ic instrumentedConnector) RequestCertificate(req *certificate.Request) (string, error) {
start := time.Now()
ic.logger.V(logf.TraceLevel).Info("calling RequestCertificate")
reqID, err := ic.conn.RequestCertificate(req)
labels := []string{"request_certificate"}
ic.metrics.ObserveVenafiRequestDuration(time.Since(start), labels...)
ic.metrics.ObserveVenafiRequestDuration(time.Since(now), labels...)
return reqID, err
}
func (ic instrumentedConnector) RetrieveCertificate(req *certificate.Request) (*certificate.PEMCollection, error) {
start := time.Now()
ic.logger.V(logf.TraceLevel).Info("calling RetrieveCertificate")
pemCollection, err := ic.conn.RetrieveCertificate(req)
labels := []string{"retrieve_certificate"}
ic.metrics.ObserveVenafiRequestDuration(time.Since(start), labels...)
ic.metrics.ObserveVenafiRequestDuration(time.Since(now), labels...)
return pemCollection, err
}
func (ic instrumentedConnector) Ping() error {
start := time.Now()
ic.logger.V(logf.TraceLevel).Info("calling Ping")
err := ic.conn.Ping()
labels := []string{"ping"}
ic.metrics.ObserveVenafiRequestDuration(time.Since(start), labels...)
ic.metrics.ObserveVenafiRequestDuration(time.Since(now), labels...)
return err
}
func (ic instrumentedConnector) RenewCertificate(req *certificate.RenewalRequest) (string, error) {
start := time.Now()
ic.logger.V(logf.TraceLevel).Info("calling RenewCertificate")
reqID, err := ic.conn.RenewCertificate(req)
labels := []string{"renew_certificate"}
ic.metrics.ObserveVenafiRequestDuration(time.Since(start), labels...)
ic.metrics.ObserveVenafiRequestDuration(time.Since(now), labels...)
return reqID, err
}