From 4e64aaf27e66218571542446498cc47db5df95ff Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 1 Aug 2019 15:38:06 -0700 Subject: [PATCH] Update .golint_failures to reflect code move to staging --- hack/.golint_failures | 59 ++++++++++--------- staging/publishing/import-restrictions.yaml | 1 + staging/publishing/rules.yaml | 4 ++ .../kubectl/pkg/cmd/delete/delete_test.go | 4 +- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index ea895ebf5f6..c88eb8933f1 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -107,37 +107,8 @@ pkg/credentialprovider/gcp pkg/features pkg/kubeapiserver pkg/kubeapiserver/options -pkg/kubectl/cmd/annotate -pkg/kubectl/cmd/apply -pkg/kubectl/cmd/attach -pkg/kubectl/cmd/autoscale -pkg/kubectl/cmd/certificates -pkg/kubectl/cmd/clusterinfo pkg/kubectl/cmd/convert -pkg/kubectl/cmd/create -pkg/kubectl/cmd/delete -pkg/kubectl/cmd/describe -pkg/kubectl/cmd/diff -pkg/kubectl/cmd/drain -pkg/kubectl/cmd/exec -pkg/kubectl/cmd/explain -pkg/kubectl/cmd/expose pkg/kubectl/cmd/get -pkg/kubectl/cmd/label -pkg/kubectl/cmd/logs -pkg/kubectl/cmd/patch -pkg/kubectl/cmd/plugin -pkg/kubectl/cmd/portforward -pkg/kubectl/cmd/replace -pkg/kubectl/cmd/rollingupdate -pkg/kubectl/cmd/rollout -pkg/kubectl/cmd/run -pkg/kubectl/cmd/scale -pkg/kubectl/cmd/set -pkg/kubectl/cmd/taint -pkg/kubectl/cmd/testing -pkg/kubectl/cmd/top -pkg/kubectl/cmd/wait pkg/kubelet pkg/kubelet/apis/config pkg/kubelet/apis/config/v1beta1 @@ -530,7 +501,37 @@ staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1 staging/src/k8s.io/kube-aggregator/pkg/apiserver staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister staging/src/k8s.io/kube-proxy/config/v1alpha1 +staging/src/k8s.io/kubectl/pkg/cmd +staging/src/k8s.io/kubectl/pkg/cmd/annotate +staging/src/k8s.io/kubectl/pkg/cmd/apply +staging/src/k8s.io/kubectl/pkg/cmd/attach +staging/src/k8s.io/kubectl/pkg/cmd/autoscale +staging/src/k8s.io/kubectl/pkg/cmd/certificates +staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo +staging/src/k8s.io/kubectl/pkg/cmd/create +staging/src/k8s.io/kubectl/pkg/cmd/delete +staging/src/k8s.io/kubectl/pkg/cmd/describe +staging/src/k8s.io/kubectl/pkg/cmd/diff +staging/src/k8s.io/kubectl/pkg/cmd/drain +staging/src/k8s.io/kubectl/pkg/cmd/exec +staging/src/k8s.io/kubectl/pkg/cmd/explain +staging/src/k8s.io/kubectl/pkg/cmd/expose +staging/src/k8s.io/kubectl/pkg/cmd/label +staging/src/k8s.io/kubectl/pkg/cmd/logs +staging/src/k8s.io/kubectl/pkg/cmd/patch +staging/src/k8s.io/kubectl/pkg/cmd/plugin +staging/src/k8s.io/kubectl/pkg/cmd/portforward +staging/src/k8s.io/kubectl/pkg/cmd/replace +staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate +staging/src/k8s.io/kubectl/pkg/cmd/rollout +staging/src/k8s.io/kubectl/pkg/cmd/run +staging/src/k8s.io/kubectl/pkg/cmd/scale +staging/src/k8s.io/kubectl/pkg/cmd/set +staging/src/k8s.io/kubectl/pkg/cmd/taint +staging/src/k8s.io/kubectl/pkg/cmd/testing +staging/src/k8s.io/kubectl/pkg/cmd/top staging/src/k8s.io/kubectl/pkg/cmd/util +staging/src/k8s.io/kubectl/pkg/cmd/wait staging/src/k8s.io/kubectl/pkg/describe/versioned staging/src/k8s.io/kubectl/pkg/generate staging/src/k8s.io/kubectl/pkg/generate/versioned diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index 23745917817..4a90a20ecbf 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/staging/publishing/import-restrictions.yaml @@ -130,6 +130,7 @@ - k8s.io/apimachinery - k8s.io/cli-runtime - k8s.io/client-go + - k8s.io/component-base - k8s.io/kubectl - k8s.io/kube-openapi - k8s.io/metrics diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index aef49d3a94f..d34f598afaa 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -628,6 +628,8 @@ rules: branch: master - repository: code-generator branch: master + - repository: component-base + branch: master - repository: metrics branch: master - source: @@ -643,6 +645,8 @@ rules: - repository: client-go branch: release-12.0 - repository: code-generator + branch: release-1.15 + - repository: component-base branch: release-1.15 - repository: metrics branch: release-1.15 diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go index 79d996c97b2..f587060bb45 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go @@ -38,9 +38,9 @@ import ( func fakecmd() *cobra.Command { cmd := &cobra.Command{ - Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])", + Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])", DisableFlagsInUseLine: true, - Run: func(cmd *cobra.Command, args []string) {}, + Run: func(cmd *cobra.Command, args []string) {}, } return cmd }