From 649b46ff1dae8430536c172f08916ec3052a8d3c Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Fri, 27 Jul 2018 19:47:58 +0800 Subject: [PATCH] fix verify about import error --- cmd/kubeadm/.import-restrictions | 4 ++-- hack/import-restrictions.yaml | 1 + pkg/kubectl/.import-restrictions | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/.import-restrictions b/cmd/kubeadm/.import-restrictions index a8bcd175b7..2e8ade294f 100644 --- a/cmd/kubeadm/.import-restrictions +++ b/cmd/kubeadm/.import-restrictions @@ -33,7 +33,8 @@ { "SelectorRegexp": "k8s[.]io/utils", "AllowedPrefixes": [ - "k8s.io/utils/exec" + "k8s.io/utils/exec", + "k8s.io/utils/pointer" ] }, { @@ -135,7 +136,6 @@ "k8s.io/kubernetes/pkg/util/normalizer", "k8s.io/kubernetes/pkg/util/nsenter", "k8s.io/kubernetes/pkg/util/parsers", - "k8s.io/kubernetes/pkg/util/pointer", "k8s.io/kubernetes/pkg/util/procfs", "k8s.io/kubernetes/pkg/util/slice", "k8s.io/kubernetes/pkg/util/taints", diff --git a/hack/import-restrictions.yaml b/hack/import-restrictions.yaml index f9749300a8..be967a1f33 100644 --- a/hack/import-restrictions.yaml +++ b/hack/import-restrictions.yaml @@ -7,6 +7,7 @@ - k8s.io/kubernetes/pkg/fieldpath - k8s.io/kubernetes/pkg/util - k8s.io/api/core/v1 + - k8s.io/utils/pointer # the following are temporary and should go away. Think twice (or more) before adding anything here. # Main goal: pkg/apis should be as self-contained as possible. diff --git a/pkg/kubectl/.import-restrictions b/pkg/kubectl/.import-restrictions index 8dc23442f0..79f6b5a938 100644 --- a/pkg/kubectl/.import-restrictions +++ b/pkg/kubectl/.import-restrictions @@ -138,13 +138,13 @@ "k8s.io/kubernetes/pkg/util/node", "k8s.io/kubernetes/pkg/util/nsenter", "k8s.io/kubernetes/pkg/util/parsers", - "k8s.io/kubernetes/pkg/util/pointer", "k8s.io/kubernetes/pkg/util/slice", "k8s.io/kubernetes/pkg/util/taints", "k8s.io/kubernetes/pkg/version", "k8s.io/kubernetes/pkg/version/prometheus", "k8s.io/kubernetes/pkg/volume", - "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/kubernetes/pkg/volume/util", + "k8s.io/utils/pointer" ], "ForbiddenPrefixes": [] }]