From 828125c725cc233757ac2831d1b51ee6bb7b4908 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Wed, 24 Apr 2019 12:56:28 +0800 Subject: [PATCH] fix golint failures of pkg/kubelet/apis --- hack/.golint_failures | 1 - pkg/kubelet/apis/well_known_annotations.go | 1 + pkg/kubelet/apis/well_known_annotations_windows.go | 6 ++++-- pkg/kubelet/apis/well_known_labels.go | 11 ++++++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index 8ab29fc3b7a..785de1bda5e 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -163,7 +163,6 @@ pkg/kubectl/generate/versioned pkg/kubectl/metricsutil pkg/kubectl/util/templates pkg/kubelet -pkg/kubelet/apis pkg/kubelet/apis/config pkg/kubelet/apis/config/v1beta1 pkg/kubelet/apis/deviceplugin/v1beta1 diff --git a/pkg/kubelet/apis/well_known_annotations.go b/pkg/kubelet/apis/well_known_annotations.go index f1bf0620e5e..a87f1c073ad 100644 --- a/pkg/kubelet/apis/well_known_annotations.go +++ b/pkg/kubelet/apis/well_known_annotations.go @@ -17,6 +17,7 @@ limitations under the License. package apis const ( + // AnnotationProvidedIPAddr is a node IP annotation set by the "external" cloud provider. // When kubelet is started with the "external" cloud provider, then // it sets this annotation on the node to denote an ip address set from the // cmd line flag (--node-ip). This ip is verified with the cloudprovider as valid by diff --git a/pkg/kubelet/apis/well_known_annotations_windows.go b/pkg/kubelet/apis/well_known_annotations_windows.go index 0e738895ee0..65f38f9f144 100644 --- a/pkg/kubelet/apis/well_known_annotations_windows.go +++ b/pkg/kubelet/apis/well_known_annotations_windows.go @@ -24,10 +24,12 @@ import ( ) const ( - // HypervIsolationAnnotationKey and HypervIsolationValue are used to run windows containers with hyperv isolation. + // HypervIsolationAnnotationKey is used to run windows containers with hyperv isolation. // Refer https://aka.ms/hyperv-container. HypervIsolationAnnotationKey = "experimental.windows.kubernetes.io/isolation-type" - HypervIsolationValue = "hyperv" + // HypervIsolationValue is used to run windows containers with hyperv isolation. + // Refer https://aka.ms/hyperv-container. + HypervIsolationValue = "hyperv" ) // ShouldIsolatedByHyperV returns true if a windows container should be run with hyperv isolation. diff --git a/pkg/kubelet/apis/well_known_labels.go b/pkg/kubelet/apis/well_known_labels.go index ada371c6b83..b473e524956 100644 --- a/pkg/kubelet/apis/well_known_labels.go +++ b/pkg/kubelet/apis/well_known_labels.go @@ -24,10 +24,15 @@ import ( ) const ( - // The OS/Arch labels are promoted to GA in 1.14. kubelet applies both beta + // LabelOS is a label to indicate the operating system of the node. + // The OS labels are promoted to GA in 1.14. kubelet applies both beta // and GA labels to ensure backward compatibility. - // TODO: stop applying the beta OS/Arch labels in Kubernetes 1.18. - LabelOS = "beta.kubernetes.io/os" + // TODO: stop applying the beta OS labels in Kubernetes 1.18. + LabelOS = "beta.kubernetes.io/os" + // LabelArch is a label to indicate the architecture of the node. + // The Arch labels are promoted to GA in 1.14. kubelet applies both beta + // and GA labels to ensure backward compatibility. + // TODO: stop applying the beta Arch labels in Kubernetes 1.18. LabelArch = "beta.kubernetes.io/arch" // GA versions of the legacy beta labels.