Skip to content

Commit 5a790bc

Browse files
authored
Merge pull request kubernetes#76763 from SataQiu/ifx-golint-kubelet-20190419
Fix golint failures of pkg/kubelet/apis
2 parents d1e7bb2 + 828125c commit 5a790bc

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

hack/.golint_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ pkg/kubectl/generate/versioned
160160
pkg/kubectl/metricsutil
161161
pkg/kubectl/util/templates
162162
pkg/kubelet
163-
pkg/kubelet/apis
164163
pkg/kubelet/apis/config
165164
pkg/kubelet/apis/config/v1beta1
166165
pkg/kubelet/apis/deviceplugin/v1beta1

pkg/kubelet/apis/well_known_annotations.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package apis
1818

1919
const (
20+
// AnnotationProvidedIPAddr is a node IP annotation set by the "external" cloud provider.
2021
// When kubelet is started with the "external" cloud provider, then
2122
// it sets this annotation on the node to denote an ip address set from the
2223
// cmd line flag (--node-ip). This ip is verified with the cloudprovider as valid by

pkg/kubelet/apis/well_known_annotations_windows.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ import (
2424
)
2525

2626
const (
27-
// HypervIsolationAnnotationKey and HypervIsolationValue are used to run windows containers with hyperv isolation.
27+
// HypervIsolationAnnotationKey is used to run windows containers with hyperv isolation.
2828
// Refer https://aka.ms/hyperv-container.
2929
HypervIsolationAnnotationKey = "experimental.windows.kubernetes.io/isolation-type"
30-
HypervIsolationValue = "hyperv"
30+
// HypervIsolationValue is used to run windows containers with hyperv isolation.
31+
// Refer https://aka.ms/hyperv-container.
32+
HypervIsolationValue = "hyperv"
3133
)
3234

3335
// ShouldIsolatedByHyperV returns true if a windows container should be run with hyperv isolation.

pkg/kubelet/apis/well_known_labels.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,15 @@ import (
2424
)
2525

2626
const (
27-
// The OS/Arch labels are promoted to GA in 1.14. kubelet applies both beta
27+
// LabelOS is a label to indicate the operating system of the node.
28+
// The OS labels are promoted to GA in 1.14. kubelet applies both beta
2829
// and GA labels to ensure backward compatibility.
29-
// TODO: stop applying the beta OS/Arch labels in Kubernetes 1.18.
30-
LabelOS = "beta.kubernetes.io/os"
30+
// TODO: stop applying the beta OS labels in Kubernetes 1.18.
31+
LabelOS = "beta.kubernetes.io/os"
32+
// LabelArch is a label to indicate the architecture of the node.
33+
// The Arch labels are promoted to GA in 1.14. kubelet applies both beta
34+
// and GA labels to ensure backward compatibility.
35+
// TODO: stop applying the beta Arch labels in Kubernetes 1.18.
3136
LabelArch = "beta.kubernetes.io/arch"
3237

3338
// GA versions of the legacy beta labels.

0 commit comments

Comments
 (0)