diff --git a/pkg/ctl/scheme.go b/pkg/ctl/scheme.go index 503150b0f..4c2f37a29 100644 --- a/pkg/ctl/scheme.go +++ b/pkg/ctl/scheme.go @@ -58,13 +58,13 @@ func init() { utilruntime.Must(metainternalversion.AddToScheme(Scheme)) // Adds the conversion between internalmeta.List and corev1.List - Scheme.AddConversionFunc((*corev1.List)(nil), (*metainternalversion.List)(nil), func(a, b interface{}, scope conversion.Scope) error { + _ = Scheme.AddConversionFunc((*corev1.List)(nil), (*metainternalversion.List)(nil), func(a, b interface{}, scope conversion.Scope) error { metaList := &metav1.List{} metaList.Items = a.(*corev1.List).Items return metainternalversion.Convert_v1_List_To_internalversion_List(metaList, b.(*metainternalversion.List), scope) }) - Scheme.AddConversionFunc((*metainternalversion.List)(nil), (*corev1.List)(nil), func(a, b interface{}, scope conversion.Scope) error { + _ = Scheme.AddConversionFunc((*metainternalversion.List)(nil), (*corev1.List)(nil), func(a, b interface{}, scope conversion.Scope) error { metaList := &metav1.List{} err := metainternalversion.Convert_internalversion_List_To_v1_List(a.(*metainternalversion.List), metaList, scope) if err != nil { diff --git a/pkg/internal/apis/certmanager/validation/certificate_for_issuer_test.go b/pkg/internal/apis/certmanager/validation/certificate_for_issuer_test.go index 6f739c14c..54d0f2968 100644 --- a/pkg/internal/apis/certmanager/validation/certificate_for_issuer_test.go +++ b/pkg/internal/apis/certmanager/validation/certificate_for_issuer_test.go @@ -31,7 +31,6 @@ import ( const ( defaultTestIssuerName = "test-issuer" - defaultTestCrtName = "test-crt" defaultTestNamespace = gen.DefaultTestNamespace ) diff --git a/pkg/issuer/acme/dns/rfc2136/provider_test.go b/pkg/issuer/acme/dns/rfc2136/provider_test.go index de10a2a3d..613023f34 100644 --- a/pkg/issuer/acme/dns/rfc2136/provider_test.go +++ b/pkg/issuer/acme/dns/rfc2136/provider_test.go @@ -39,7 +39,11 @@ func TestRunSuiteWithTSIG(t *testing.T) { if err := server.Run(ctx); err != nil { t.Fatalf("failed to start test server: %v", err) } - defer server.Shutdown() + defer func() { + if err := server.Shutdown(); err != nil { + t.Errorf("failed to gracefully shut down test server: %v", err) + } + }() var validConfig = cmacme.ACMEIssuerDNS01ProviderRFC2136{ Nameserver: server.ListenAddr(), @@ -74,7 +78,11 @@ func TestRunSuiteNoTSIG(t *testing.T) { if err := server.Run(ctx); err != nil { t.Fatalf("failed to start test server: %v", err) } - defer server.Shutdown() + defer func() { + if err := server.Shutdown(); err != nil { + t.Errorf("failed to gracefully shut down test server: %v", err) + } + }() var validConfig = cmacme.ACMEIssuerDNS01ProviderRFC2136{ Nameserver: server.ListenAddr(), diff --git a/pkg/issuer/vault/setup.go b/pkg/issuer/vault/setup.go index 2f5fc19e3..235d70e38 100644 --- a/pkg/issuer/vault/setup.go +++ b/pkg/issuer/vault/setup.go @@ -34,7 +34,6 @@ const ( errorVault = "VaultError" messageVaultClientInitFailed = "Failed to initialize Vault client: " - messageVaultHealthCheckFailed = "Failed to call Vault health check: " messageVaultStatusVerificationFailed = "Vault is not initialized or is sealed" messageVaultConfigRequired = "Vault config cannot be empty" messageServerAndPathRequired = "Vault server and path are required fields" diff --git a/pkg/issuer/venafi/client/request.go b/pkg/issuer/venafi/client/request.go index f7272ff3d..be8952e50 100644 --- a/pkg/issuer/venafi/client/request.go +++ b/pkg/issuer/venafi/client/request.go @@ -140,7 +140,6 @@ func convertCustomFieldsToVcert(customFields []api.CustomField) ([]certificate.C switch field.Type { case api.CustomFieldTypePlain, "": fieldType = certificate.CustomFieldPlain - break default: return nil, ErrCustomFieldsType{Type: field.Type} } diff --git a/pkg/logs/logs.go b/pkg/logs/logs.go index c17955c86..194e58b1e 100644 --- a/pkg/logs/logs.go +++ b/pkg/logs/logs.go @@ -65,7 +65,7 @@ func InitLogs(fs *flag.FlagSet) { fs = flag.CommandLine } klog.InitFlags(fs) - fs.Set("logtostderr", "true") + _ = fs.Set("logtostderr", "true") log.SetOutput(GlogWriter{}) log.SetFlags(0) diff --git a/pkg/webhook/server/BUILD.bazel b/pkg/webhook/server/BUILD.bazel index d09b9a4e1..8467ed363 100644 --- a/pkg/webhook/server/BUILD.bazel +++ b/pkg/webhook/server/BUILD.bazel @@ -21,6 +21,7 @@ go_library( "@io_k8s_apimachinery//pkg/runtime:go_default_library", "@io_k8s_apimachinery//pkg/runtime/schema:go_default_library", "@io_k8s_apimachinery//pkg/runtime/serializer/json:go_default_library", + "@io_k8s_apimachinery//pkg/util/runtime:go_default_library", "@io_k8s_component_base//cli/flag:go_default_library", "@io_k8s_sigs_controller_runtime//pkg/log:go_default_library", ], diff --git a/pkg/webhook/server/server.go b/pkg/webhook/server/server.go index 4e9053364..6c46c2d3e 100644 --- a/pkg/webhook/server/server.go +++ b/pkg/webhook/server/server.go @@ -36,6 +36,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer/json" + runtimeutil "k8s.io/apimachinery/pkg/util/runtime" ciphers "k8s.io/component-base/cli/flag" crlog "sigs.k8s.io/controller-runtime/pkg/log" @@ -55,8 +56,9 @@ var ( func init() { apiextensionsinstall.Install(defaultScheme) - admissionv1beta1.AddToScheme(defaultScheme) - admissionv1.AddToScheme(defaultScheme) + + runtimeutil.Must(admissionv1beta1.AddToScheme(defaultScheme)) + runtimeutil.Must(admissionv1.AddToScheme(defaultScheme)) // we need to add the options to empty v1 // TODO fix the server code to avoid this @@ -207,6 +209,7 @@ func (s *Server) Run(stopCh <-chan struct{}) error { s.Log.V(logf.DebugLevel).Info("waiting for server to shutdown") waitForAll(healthzChan, certSourceChan, listenerChan) + s.Log.V(logf.InfoLevel).Info("server shutdown successfully") return err @@ -377,7 +380,6 @@ func (s *Server) handle(inner handleFunc) func(w http.ResponseWriter, req *http. codec := json.NewSerializerWithOptions(json.DefaultMetaFactory, s.scheme(), s.scheme(), json.SerializerOptions{ Pretty: true, }) - codec.Decode(data, nil, nil) obj, _, err := codec.Decode(data, nil, nil) if err != nil { s.Log.Error(err, "failed to decode request body")