Skip to content

Commit 35cfd32

Browse files
authored
Merge pull request kubernetes#84243 from Dingshujie/fix-golint
Fix golint errors in pkg/apis/apps
2 parents ebbe4ba + 171b486 commit 35cfd32

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

hack/.golint_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ pkg/apis/admission
99
pkg/apis/admissionregistration/v1
1010
pkg/apis/admissionregistration/v1beta1
1111
pkg/apis/admissionregistration/validation
12-
pkg/apis/apps
1312
pkg/apis/apps/v1
1413
pkg/apis/apps/v1beta1
1514
pkg/apis/apps/v1beta2

pkg/apis/apps/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,8 @@ type DeploymentSpec struct {
332332

333333
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
334334

335-
// DEPRECATED.
336335
// DeploymentRollback stores the information required to rollback a deployment.
336+
// DEPRECATED.
337337
type DeploymentRollback struct {
338338
metav1.TypeMeta
339339
// Required: This must match the Name of a deployment.
@@ -679,10 +679,10 @@ type DaemonSet struct {
679679
}
680680

681681
const (
682-
// DEPRECATED: DefaultDaemonSetUniqueLabelKey is used instead.
683682
// DaemonSetTemplateGenerationKey is the key of the labels that is added
684683
// to daemon set pods to distinguish between old and new pod templates
685684
// during DaemonSet template update.
685+
// DEPRECATED: DefaultDaemonSetUniqueLabelKey is used instead.
686686
DaemonSetTemplateGenerationKey string = "pod-template-generation"
687687
)
688688

0 commit comments

Comments
 (0)