Fix import-boss wrt gengo/v2
This commit is contained in:
		@@ -26,22 +26,18 @@ set -o pipefail
 | 
				
			|||||||
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 | 
					KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 | 
				
			||||||
source "${KUBE_ROOT}/hack/lib/init.sh"
 | 
					source "${KUBE_ROOT}/hack/lib/init.sh"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
kube::golang::old::setup_env
 | 
					kube::golang::new::setup_env
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/import-boss
 | 
					GOPROXY=off go install k8s.io/code-generator/cmd/import-boss
 | 
				
			||||||
 | 
					
 | 
				
			||||||
packages=(
 | 
					$(kube::util::find-binary "import-boss") \
 | 
				
			||||||
  "k8s.io/kubernetes/pkg/..."
 | 
					    -v "${KUBE_VERBOSE:-0}" \
 | 
				
			||||||
  "k8s.io/kubernetes/cmd/..."
 | 
					    --include-test-files \
 | 
				
			||||||
  "k8s.io/kubernetes/plugin/..."
 | 
					    --verify-only \
 | 
				
			||||||
  "k8s.io/kubernetes/test/e2e_node/..."
 | 
					    --input-dirs "./pkg/..." \
 | 
				
			||||||
  "k8s.io/kubernetes/test/e2e/framework/..."
 | 
					    --input-dirs "./cmd/..." \
 | 
				
			||||||
  "k8s.io/kubernetes/test/integration/..."
 | 
					    --input-dirs "./plugin/..." \
 | 
				
			||||||
)
 | 
					    --input-dirs "./test/e2e_node/..." \
 | 
				
			||||||
for d in staging/src/k8s.io/*/; do
 | 
					    --input-dirs "./test/e2e/framework/..." \
 | 
				
			||||||
  if [ -d "$d" ]; then
 | 
					    --input-dirs "./test/integration/..." \
 | 
				
			||||||
    packages+=("./vendor/${d#"staging/src/"}...")
 | 
					    --input-dirs "./staging/src/..."
 | 
				
			||||||
  fi
 | 
					 | 
				
			||||||
done
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
$(kube::util::find-binary "import-boss") --include-test-files=true --verify-only --input-dirs "$(IFS=, ; echo "${packages[*]}")"
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,7 +23,7 @@
 | 
				
			|||||||
    {
 | 
					    {
 | 
				
			||||||
      "SelectorRegexp": "k8s[.]io",
 | 
					      "SelectorRegexp": "k8s[.]io",
 | 
				
			||||||
      "AllowedPrefixes": [
 | 
					      "AllowedPrefixes": [
 | 
				
			||||||
        "k8s.io/gengo/examples",
 | 
					        "k8s.io/gengo/v2/examples",
 | 
				
			||||||
        "k8s.io/kubernetes/third_party"
 | 
					        "k8s.io/kubernetes/third_party"
 | 
				
			||||||
      ],
 | 
					      ],
 | 
				
			||||||
      "ForbiddenPrefixes": [
 | 
					      "ForbiddenPrefixes": [
 | 
				
			||||||
@@ -59,7 +59,7 @@
 | 
				
			|||||||
rules:
 | 
					rules:
 | 
				
			||||||
  - selectorRegexp: k8s[.]io
 | 
					  - selectorRegexp: k8s[.]io
 | 
				
			||||||
    allowedPrefixes:
 | 
					    allowedPrefixes:
 | 
				
			||||||
      - k8s.io/gengo/examples
 | 
					      - k8s.io/gengo/v2/examples
 | 
				
			||||||
      - k8s.io/kubernetes/third_party
 | 
					      - k8s.io/kubernetes/third_party
 | 
				
			||||||
    forbiddenPrefixes:
 | 
					    forbiddenPrefixes:
 | 
				
			||||||
      - k8s.io/kubernetes/pkg/third_party/deprecated
 | 
					      - k8s.io/kubernetes/pkg/third_party/deprecated
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user