From 0f3836dcc5bca62c21128236994c8358bfeb6345 Mon Sep 17 00:00:00 2001 From: Hanna Lee Date: Thu, 15 Jul 2021 14:51:31 -0400 Subject: [PATCH] Ignore deprecation warnings with //nolint:staticcheck --- cmd/kube-proxy/app/server.go | 1 + cmd/kube-scheduler/app/config/config.go | 1 + pkg/kubelet/dockershim/docker_container.go | 1 + pkg/kubelet/server/server.go | 1 + pkg/registry/core/namespace/storage/storage.go | 3 +++ 5 files changed, 7 insertions(+) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 5975731b171..fa3b0906289 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -624,6 +624,7 @@ func serveMetrics(bindAddress, proxyMode string, enableProfiling bool, errCh cha }) //lint:ignore SA1019 See the Metrics Stability Migration KEP + //nolint:staticcheck proxyMux.Handle("/metrics", legacyregistry.Handler()) if enableProfiling { diff --git a/cmd/kube-scheduler/app/config/config.go b/cmd/kube-scheduler/app/config/config.go index 1448ff8cf49..91fbf44164e 100644 --- a/cmd/kube-scheduler/app/config/config.go +++ b/cmd/kube-scheduler/app/config/config.go @@ -45,6 +45,7 @@ type Config struct { DynInformerFactory dynamicinformer.DynamicSharedInformerFactory //lint:ignore SA1019 this deprecated field still needs to be used for now. It will be removed once the migration is done. + //nolint:staticcheck EventBroadcaster events.EventBroadcasterAdapter // LeaderElection is optional. diff --git a/pkg/kubelet/dockershim/docker_container.go b/pkg/kubelet/dockershim/docker_container.go index 898931a3733..7f5fb7c79c5 100644 --- a/pkg/kubelet/dockershim/docker_container.go +++ b/pkg/kubelet/dockershim/docker_container.go @@ -182,6 +182,7 @@ func (ds *dockerService) CreateContainer(_ context.Context, r *runtimeapi.Create hc.Resources.Devices = devices //lint:ignore SA1019 backwards compatibility + //nolint:staticcheck securityOpts, err := ds.getSecurityOpts(config.GetLinux().GetSecurityContext().GetSeccompProfilePath(), securityOptSeparator) if err != nil { return nil, fmt.Errorf("failed to generate security options for container %q: %v", config.Metadata.Name, err) diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index 5d230755ab8..9312dfd49c6 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -354,6 +354,7 @@ func (s *Server) InstallDefaultHandlers() { s.addMetricsBucketMatcher("metrics/probes") s.addMetricsBucketMatcher("metrics/resource") //lint:ignore SA1019 https://github.com/kubernetes/enhancements/issues/1206 + //nolint:staticcheck s.restfulCont.Handle(metricsPath, legacyregistry.Handler()) // cAdvisor metrics are exposed under the secured handler as well diff --git a/pkg/registry/core/namespace/storage/storage.go b/pkg/registry/core/namespace/storage/storage.go index 375445e3a0f..55bcbcc7dd1 100644 --- a/pkg/registry/core/namespace/storage/storage.go +++ b/pkg/registry/core/namespace/storage/storage.go @@ -254,8 +254,10 @@ func ShouldDeleteNamespaceDuringUpdate(ctx context.Context, key string, obj, exi func shouldHaveOrphanFinalizer(options *metav1.DeleteOptions, haveOrphanFinalizer bool) bool { //lint:ignore SA1019 backwards compatibility + //nolint:staticcheck if options.OrphanDependents != nil { //lint:ignore SA1019 backwards compatibility + //nolint:staticcheck return *options.OrphanDependents } if options.PropagationPolicy != nil { @@ -266,6 +268,7 @@ func shouldHaveOrphanFinalizer(options *metav1.DeleteOptions, haveOrphanFinalize func shouldHaveDeleteDependentsFinalizer(options *metav1.DeleteOptions, haveDeleteDependentsFinalizer bool) bool { //lint:ignore SA1019 backwards compatibility + //nolint:staticcheck if options.OrphanDependents != nil { //lint:ignore SA1019 backwards compatibility return *options.OrphanDependents == false