diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60965a407..75bdd6769 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,9 +19,8 @@ jobs: env: GO111MODULE: on steps: - - name: Set up Go 1.13 - uses: actions/setup-go@v1 + uses: actions/setup-go@v2 with: go-version: 1.13 id: go @@ -32,6 +31,9 @@ jobs: - name: Check pr is properly formatted run: diff -u <(echo -n) <(gofmt -d ./pkg ./cmd ./tools ./test) + - name: Verify goimports + run: go get -u golang.org/x/tools/cmd/goimports && bash hack/verify-goimports.sh + - name: Downloading go dependencies run: go mod vendor diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index a18161b3b..000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: "CodeQL" - -on: - push: - branches: [master, express] - pull_request: - # The branches below must be a subset of the branches above - branches: [master] - schedule: - - cron: '0 9 * * 1' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - # Override automatic language detection by changing the below list - # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] - language: ['go'] - # Learn more... - # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - # We must fetch at least the immediate parents so that if this is - # a pull request then we can checkout the head. - fetch-depth: 2 - - # If this run was triggered by a pull request event, then checkout - # the head of the pull request instead of the merge commit. - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 diff --git a/Makefile b/Makefile index cadb48b43..2ea26f8a6 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,9 @@ e2e: fmt vet fmt: gofmt -w ./pkg ./cmd ./tools ./api +goimports: + @hack/update-goimports.sh + # Run go vet against code vet: go vet ./pkg/... ./cmd/... diff --git a/cmd/controller-manager/app/controllers.go b/cmd/controller-manager/app/controllers.go index 0b1fb520f..236e94649 100644 --- a/cmd/controller-manager/app/controllers.go +++ b/cmd/controller-manager/app/controllers.go @@ -20,6 +20,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/cache" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/kubefed/pkg/controller/util" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" "kubesphere.io/kubesphere/pkg/controller/certificatesigningrequest" @@ -53,8 +56,6 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/network" ippoolclient "kubesphere.io/kubesphere/pkg/simple/client/network/ippool" "kubesphere.io/kubesphere/pkg/simple/client/s3" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/kubefed/pkg/controller/util" ) func addControllers( diff --git a/cmd/controller-manager/app/helper.go b/cmd/controller-manager/app/helper.go index cd377dd53..beb738682 100644 --- a/cmd/controller-manager/app/helper.go +++ b/cmd/controller-manager/app/helper.go @@ -19,11 +19,12 @@ package app import ( "context" "fmt" + "net/http" + "time" + "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog" - "net/http" - "time" ) // WaitForAPIServer waits for the API Server's /healthz endpoint to report "ok" before timeout. diff --git a/cmd/controller-manager/app/options/options.go b/cmd/controller-manager/app/options/options.go index 698366695..06f854da8 100644 --- a/cmd/controller-manager/app/options/options.go +++ b/cmd/controller-manager/app/options/options.go @@ -18,14 +18,16 @@ package options import ( "flag" - "k8s.io/apimachinery/pkg/labels" "strings" "time" + "k8s.io/apimachinery/pkg/labels" + "github.com/spf13/pflag" "k8s.io/client-go/tools/leaderelection" cliflag "k8s.io/component-base/cli/flag" "k8s.io/klog" + authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" "kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins" "kubesphere.io/kubesphere/pkg/simple/client/k8s" diff --git a/cmd/controller-manager/app/server.go b/cmd/controller-manager/app/server.go index c4f004e2b..a07b0abef 100644 --- a/cmd/controller-manager/app/server.go +++ b/cmd/controller-manager/app/server.go @@ -18,6 +18,8 @@ package app import ( "fmt" + "os" + "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -25,6 +27,11 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/klog" "k8s.io/klog/klogr" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/runtime/signals" + "sigs.k8s.io/controller-runtime/pkg/webhook" + "kubesphere.io/kubesphere/cmd/controller-manager/app/options" "kubesphere.io/kubesphere/pkg/apis" controllerconfig "kubesphere.io/kubesphere/pkg/apiserver/config" @@ -50,11 +57,6 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/utils/metrics" "kubesphere.io/kubesphere/pkg/utils/term" - "os" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/runtime/signals" - "sigs.k8s.io/controller-runtime/pkg/webhook" ) func NewControllerManagerCommand() *cobra.Command { diff --git a/cmd/controller-manager/controller-manager.go b/cmd/controller-manager/controller-manager.go index 6d0265643..17bb60360 100644 --- a/cmd/controller-manager/controller-manager.go +++ b/cmd/controller-manager/controller-manager.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - "kubesphere.io/kubesphere/cmd/controller-manager/app" "os" + + "kubesphere.io/kubesphere/cmd/controller-manager/app" ) func main() { diff --git a/cmd/ks-apiserver/apiserver.go b/cmd/ks-apiserver/apiserver.go index 1e0710ef5..65c5e4528 100644 --- a/cmd/ks-apiserver/apiserver.go +++ b/cmd/ks-apiserver/apiserver.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - "kubesphere.io/kubesphere/cmd/ks-apiserver/app" "log" + + "kubesphere.io/kubesphere/cmd/ks-apiserver/app" ) func main() { diff --git a/cmd/ks-apiserver/app/options/options.go b/cmd/ks-apiserver/app/options/options.go index 45b8b7ece..70f09e9de 100644 --- a/cmd/ks-apiserver/app/options/options.go +++ b/cmd/ks-apiserver/app/options/options.go @@ -20,8 +20,11 @@ import ( "crypto/tls" "flag" "fmt" + cliflag "k8s.io/component-base/cli/flag" "k8s.io/klog" + runtimecache "sigs.k8s.io/controller-runtime/pkg/cache" + "kubesphere.io/kubesphere/pkg/apis" "kubesphere.io/kubesphere/pkg/apiserver" apiserverconfig "kubesphere.io/kubesphere/pkg/apiserver/config" @@ -31,7 +34,9 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/alerting" auditingclient "kubesphere.io/kubesphere/pkg/simple/client/auditing/elasticsearch" "kubesphere.io/kubesphere/pkg/simple/client/cache" - runtimecache "sigs.k8s.io/controller-runtime/pkg/cache" + + "net/http" + "strings" "kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins" eventsclient "kubesphere.io/kubesphere/pkg/simple/client/events/elasticsearch" @@ -42,8 +47,6 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/s3" fakes3 "kubesphere.io/kubesphere/pkg/simple/client/s3/fake" "kubesphere.io/kubesphere/pkg/simple/client/sonarqube" - "net/http" - "strings" ) type ServerRunOptions struct { diff --git a/cmd/ks-apiserver/app/server.go b/cmd/ks-apiserver/app/server.go index 400ab6025..ff86a1c26 100644 --- a/cmd/ks-apiserver/app/server.go +++ b/cmd/ks-apiserver/app/server.go @@ -18,10 +18,12 @@ package app import ( "fmt" + "github.com/spf13/cobra" utilerrors "k8s.io/apimachinery/pkg/util/errors" cliflag "k8s.io/component-base/cli/flag" "k8s.io/klog" + "kubesphere.io/kubesphere/cmd/ks-apiserver/app/options" apiserverconfig "kubesphere.io/kubesphere/pkg/apiserver/config" "kubesphere.io/kubesphere/pkg/utils/signals" diff --git a/hack/update-goimports.sh b/hack/update-goimports.sh new file mode 100755 index 000000000..91daddcd3 --- /dev/null +++ b/hack/update-goimports.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +# Copyright 2020 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -o errexit +set -o nounset +set -o pipefail + +. "$(dirname "${BASH_SOURCE[0]}")/lib/init.sh" + +cd "${KUBE_ROOT}/hack" || exit 1 + +if ! command -v goimports &> /dev/null +then + echo "goimports could not be found on your machine, please install it first" + exit +fi + +cd "${KUBE_ROOT}" || exit 1 + +IFS=$'\n' read -r -d '' -a files < <( find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./pkg/client/*" && printf '\0' ) + +"goimports" -w -local kubesphere.io/kubesphere "${files[@]}" diff --git a/hack/verify-goimports.sh b/hack/verify-goimports.sh new file mode 100755 index 000000000..d8e9b541c --- /dev/null +++ b/hack/verify-goimports.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Copyright 2020 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -o errexit +set -o nounset +set -o pipefail + +. "$(dirname "${BASH_SOURCE[0]}")/lib/init.sh" + +cd "${KUBE_ROOT}/hack" || exit 1 + +if ! command -v goimports &> /dev/null +then + echo "goimports could not be found on your machine, please install it first" + exit 1 +fi + +cd "${KUBE_ROOT}" || exit 1 + +IFS=$'\n' read -r -d '' -a files < <( find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./pkg/client/*" && printf '\0' ) + +output=$(goimports -local kubesphere.io/kubesphere -l "${files[@]}") + +if [ "${output}" != "" ]; then + echo "The following files are not import formatted " + printf '%s\n' "${output[@]}" + echo "Please run the following command:" + echo " make goimports" + exit 1 +fi diff --git a/kube/pkg/api/v1/pod/util.go b/kube/pkg/api/v1/pod/util.go index 6825dfe29..2d2d444c9 100644 --- a/kube/pkg/api/v1/pod/util.go +++ b/kube/pkg/api/v1/pod/util.go @@ -24,6 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" utilfeature "k8s.io/apiserver/pkg/util/feature" + "kubesphere.io/kubesphere/kube/pkg/features" ) diff --git a/kube/pkg/apis/core/helper/helpers.go b/kube/pkg/apis/core/helper/helpers.go index 0c16cb03b..77ba290c9 100644 --- a/kube/pkg/apis/core/helper/helpers.go +++ b/kube/pkg/apis/core/helper/helpers.go @@ -48,4 +48,4 @@ var Semantic = conversion.EqualitiesOrDie( func(a, b fields.Selector) bool { return a.String() == b.String() }, -) \ No newline at end of file +) diff --git a/kube/pkg/apis/core/v1/helper/helpers.go b/kube/pkg/apis/core/v1/helper/helpers.go index 02ccaec9b..957ca03a7 100644 --- a/kube/pkg/apis/core/v1/helper/helpers.go +++ b/kube/pkg/apis/core/v1/helper/helpers.go @@ -27,6 +27,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/util/validation" + "kubesphere.io/kubesphere/kube/pkg/apis/core/helper" ) diff --git a/kube/pkg/quota/v1/evaluator/core/persistent_volume_claims.go b/kube/pkg/quota/v1/evaluator/core/persistent_volume_claims.go index 5ca2ab82d..fd4783ee3 100644 --- a/kube/pkg/quota/v1/evaluator/core/persistent_volume_claims.go +++ b/kube/pkg/quota/v1/evaluator/core/persistent_volume_claims.go @@ -19,12 +19,14 @@ package core import ( "fmt" "strings" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/admission" utilfeature "k8s.io/apiserver/pkg/util/feature" + "kubesphere.io/kubesphere/kube/pkg/apis/core/v1/helper" k8sfeatures "kubesphere.io/kubesphere/kube/pkg/features" quota "kubesphere.io/kubesphere/kube/pkg/quota/v1" diff --git a/kube/pkg/quota/v1/evaluator/core/pods.go b/kube/pkg/quota/v1/evaluator/core/pods.go index 2be574741..90dd9b1ef 100644 --- a/kube/pkg/quota/v1/evaluator/core/pods.go +++ b/kube/pkg/quota/v1/evaluator/core/pods.go @@ -30,6 +30,7 @@ import ( "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/admission" + "kubesphere.io/kubesphere/kube/pkg/apis/core/v1/helper" "kubesphere.io/kubesphere/kube/pkg/apis/core/v1/helper/qos" quota "kubesphere.io/kubesphere/kube/pkg/quota/v1" diff --git a/kube/pkg/quota/v1/evaluator/core/registry.go b/kube/pkg/quota/v1/evaluator/core/registry.go index f18cff555..7e721beb1 100644 --- a/kube/pkg/quota/v1/evaluator/core/registry.go +++ b/kube/pkg/quota/v1/evaluator/core/registry.go @@ -20,6 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/clock" + quota "kubesphere.io/kubesphere/kube/pkg/quota/v1" "kubesphere.io/kubesphere/kube/pkg/quota/v1/generic" ) diff --git a/kube/pkg/quota/v1/evaluator/core/services.go b/kube/pkg/quota/v1/evaluator/core/services.go index 82517b717..2f9c9646e 100644 --- a/kube/pkg/quota/v1/evaluator/core/services.go +++ b/kube/pkg/quota/v1/evaluator/core/services.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/admission" + "kubesphere.io/kubesphere/kube/pkg/quota/v1" "kubesphere.io/kubesphere/kube/pkg/quota/v1/generic" ) diff --git a/kube/pkg/quota/v1/generic/configuration.go b/kube/pkg/quota/v1/generic/configuration.go index fd9355745..daa9fa151 100644 --- a/kube/pkg/quota/v1/generic/configuration.go +++ b/kube/pkg/quota/v1/generic/configuration.go @@ -18,6 +18,7 @@ package generic import ( "k8s.io/apimachinery/pkg/runtime/schema" + "kubesphere.io/kubesphere/kube/pkg/quota/v1" ) diff --git a/kube/pkg/quota/v1/generic/evaluator.go b/kube/pkg/quota/v1/generic/evaluator.go index cc3f000db..36ffff9a5 100644 --- a/kube/pkg/quota/v1/generic/evaluator.go +++ b/kube/pkg/quota/v1/generic/evaluator.go @@ -28,6 +28,7 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/client-go/informers" "k8s.io/client-go/tools/cache" + quota "kubesphere.io/kubesphere/kube/pkg/quota/v1" ) diff --git a/kube/pkg/quota/v1/generic/registry.go b/kube/pkg/quota/v1/generic/registry.go index d31ac699e..1b21bd1d7 100644 --- a/kube/pkg/quota/v1/generic/registry.go +++ b/kube/pkg/quota/v1/generic/registry.go @@ -20,6 +20,7 @@ import ( "sync" "k8s.io/apimachinery/pkg/runtime/schema" + quota "kubesphere.io/kubesphere/kube/pkg/quota/v1" ) diff --git a/kube/pkg/quota/v1/install/registry.go b/kube/pkg/quota/v1/install/registry.go index 4e8179790..4377d3d74 100644 --- a/kube/pkg/quota/v1/install/registry.go +++ b/kube/pkg/quota/v1/install/registry.go @@ -18,6 +18,7 @@ package install import ( "k8s.io/apimachinery/pkg/runtime/schema" + quota "kubesphere.io/kubesphere/kube/pkg/quota/v1" core "kubesphere.io/kubesphere/kube/pkg/quota/v1/evaluator/core" generic "kubesphere.io/kubesphere/kube/pkg/quota/v1/generic" diff --git a/kube/plugin/pkg/admission/resourcequota/admission.go b/kube/plugin/pkg/admission/resourcequota/admission.go index f3a82aa42..4e10eda81 100644 --- a/kube/plugin/pkg/admission/resourcequota/admission.go +++ b/kube/plugin/pkg/admission/resourcequota/admission.go @@ -26,6 +26,7 @@ import ( genericadmissioninitializer "k8s.io/apiserver/pkg/admission/initializer" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" + "kubesphere.io/kubesphere/kube/pkg/quota/v1" "kubesphere.io/kubesphere/kube/pkg/quota/v1/generic" resourcequotaapi "kubesphere.io/kubesphere/kube/plugin/pkg/admission/resourcequota/apis/resourcequota" diff --git a/kube/plugin/pkg/admission/resourcequota/controller.go b/kube/plugin/pkg/admission/resourcequota/controller.go index 6d15c13a3..83bcb8f74 100644 --- a/kube/plugin/pkg/admission/resourcequota/controller.go +++ b/kube/plugin/pkg/admission/resourcequota/controller.go @@ -35,6 +35,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" "k8s.io/client-go/util/workqueue" + quota "kubesphere.io/kubesphere/kube/pkg/quota/v1" "kubesphere.io/kubesphere/kube/pkg/quota/v1/generic" resourcequotaapi "kubesphere.io/kubesphere/kube/plugin/pkg/admission/resourcequota/apis/resourcequota" diff --git a/kube/plugin/pkg/admission/resourcequota/resource_access.go b/kube/plugin/pkg/admission/resourcequota/resource_access.go index 4297f7533..a94e1b29a 100644 --- a/kube/plugin/pkg/admission/resourcequota/resource_access.go +++ b/kube/plugin/pkg/admission/resourcequota/resource_access.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/hashicorp/golang-lru" + lru "github.com/hashicorp/golang-lru" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -79,7 +79,7 @@ func newQuotaAccessor() (*quotaAccessor, error) { } func (e *quotaAccessor) UpdateQuotaStatus(newQuota *corev1.ResourceQuota) error { - updatedQuota, err := e.client.CoreV1().ResourceQuotas(newQuota.Namespace).UpdateStatus(context.TODO(),newQuota,metav1.UpdateOptions{}) + updatedQuota, err := e.client.CoreV1().ResourceQuotas(newQuota.Namespace).UpdateStatus(context.TODO(), newQuota, metav1.UpdateOptions{}) if err != nil { return err } @@ -126,7 +126,7 @@ func (e *quotaAccessor) GetQuotas(namespace string) ([]corev1.ResourceQuota, err // If there is already in-flight List() for a given namespace, we should wait until // it is finished and cache is updated instead of doing the same, also to avoid // throttling - see #22422 for details. - liveList, err := e.client.CoreV1().ResourceQuotas(namespace).List(context.TODO(),metav1.ListOptions{}) + liveList, err := e.client.CoreV1().ResourceQuotas(namespace).List(context.TODO(), metav1.ListOptions{}) if err != nil { return nil, err } diff --git a/pkg/api/auditing/v1alpha1/types.go b/pkg/api/auditing/v1alpha1/types.go index ab521bbb0..2629cd9a9 100644 --- a/pkg/api/auditing/v1alpha1/types.go +++ b/pkg/api/auditing/v1alpha1/types.go @@ -17,10 +17,12 @@ limitations under the License. package v1alpha1 import ( - "github.com/emicklei/go-restful" - "kubesphere.io/kubesphere/pkg/simple/client/auditing" "strconv" "time" + + "github.com/emicklei/go-restful" + + "kubesphere.io/kubesphere/pkg/simple/client/auditing" ) type APIResponse struct { diff --git a/pkg/api/events/v1alpha1/types.go b/pkg/api/events/v1alpha1/types.go index f73393217..02effcc5f 100644 --- a/pkg/api/events/v1alpha1/types.go +++ b/pkg/api/events/v1alpha1/types.go @@ -17,10 +17,12 @@ limitations under the License. package v1alpha1 import ( - "github.com/emicklei/go-restful" - "kubesphere.io/kubesphere/pkg/simple/client/events" "strconv" "time" + + "github.com/emicklei/go-restful" + + "kubesphere.io/kubesphere/pkg/simple/client/events" ) type APIResponse struct { diff --git a/pkg/api/logging/v1alpha2/types.go b/pkg/api/logging/v1alpha2/types.go index 5ab2ea876..4f8c40fa2 100644 --- a/pkg/api/logging/v1alpha2/types.go +++ b/pkg/api/logging/v1alpha2/types.go @@ -17,10 +17,12 @@ limitations under the License. package v1alpha2 import ( - "github.com/emicklei/go-restful" - "kubesphere.io/kubesphere/pkg/simple/client/logging" "strconv" "time" + + "github.com/emicklei/go-restful" + + "kubesphere.io/kubesphere/pkg/simple/client/logging" ) const ( diff --git a/pkg/api/metering/v1alpha1/types.go b/pkg/api/metering/v1alpha1/types.go index dffb67c97..8afb1ce9e 100644 --- a/pkg/api/metering/v1alpha1/types.go +++ b/pkg/api/metering/v1alpha1/types.go @@ -4,6 +4,7 @@ import ( "time" "github.com/emicklei/go-restful" + "kubesphere.io/kubesphere/pkg/apiserver/query" model "kubesphere.io/kubesphere/pkg/models/monitoring" "kubesphere.io/kubesphere/pkg/simple/client/monitoring" diff --git a/pkg/api/utils.go b/pkg/api/utils.go index 6b4e6ffe1..d1d249f64 100644 --- a/pkg/api/utils.go +++ b/pkg/api/utils.go @@ -17,12 +17,13 @@ limitations under the License. package api import ( - "github.com/emicklei/go-restful" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/klog" "net/http" "runtime" "strings" + + "github.com/emicklei/go-restful" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/klog" ) // Avoid emitting errors that look like valid HTML. Quotes are okay. diff --git a/pkg/apis/addtoscheme_servicemesh_v1alpha2.go b/pkg/apis/addtoscheme_servicemesh_v1alpha2.go index 0be117da8..f2709d7ec 100644 --- a/pkg/apis/addtoscheme_servicemesh_v1alpha2.go +++ b/pkg/apis/addtoscheme_servicemesh_v1alpha2.go @@ -18,6 +18,7 @@ package apis import ( "istio.io/client-go/pkg/apis/networking/v1alpha3" + "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" appv1beta1 "sigs.k8s.io/application/api/v1beta1" diff --git a/pkg/apis/application/crdinstall/install.go b/pkg/apis/application/crdinstall/install.go index e8e975884..3437a1630 100644 --- a/pkg/apis/application/crdinstall/install.go +++ b/pkg/apis/application/crdinstall/install.go @@ -19,6 +19,7 @@ package crdinstall import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" ) diff --git a/pkg/apis/application/v1alpha1/helmapplication_types.go b/pkg/apis/application/v1alpha1/helmapplication_types.go index 044f83930..5002df1e0 100644 --- a/pkg/apis/application/v1alpha1/helmapplication_types.go +++ b/pkg/apis/application/v1alpha1/helmapplication_types.go @@ -17,9 +17,11 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "kubesphere.io/kubesphere/pkg/constants" "strings" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "kubesphere.io/kubesphere/pkg/constants" ) const ( diff --git a/pkg/apis/application/v1alpha1/helmapplicationversion_types.go b/pkg/apis/application/v1alpha1/helmapplicationversion_types.go index b908ba319..faeab96c2 100644 --- a/pkg/apis/application/v1alpha1/helmapplicationversion_types.go +++ b/pkg/apis/application/v1alpha1/helmapplicationversion_types.go @@ -18,9 +18,11 @@ package v1alpha1 import ( "fmt" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "kubesphere.io/kubesphere/pkg/constants" "strings" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "kubesphere.io/kubesphere/pkg/constants" ) const ( diff --git a/pkg/apis/application/v1alpha1/helmrelease_types.go b/pkg/apis/application/v1alpha1/helmrelease_types.go index 9bff9bdb6..5c2043cb8 100644 --- a/pkg/apis/application/v1alpha1/helmrelease_types.go +++ b/pkg/apis/application/v1alpha1/helmrelease_types.go @@ -18,7 +18,9 @@ package v1alpha1 import ( "fmt" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/constants" ) diff --git a/pkg/apis/application/v1alpha1/helmrepo_types.go b/pkg/apis/application/v1alpha1/helmrepo_types.go index f24762c44..3da5b7382 100644 --- a/pkg/apis/application/v1alpha1/helmrepo_types.go +++ b/pkg/apis/application/v1alpha1/helmrepo_types.go @@ -18,6 +18,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/constants" ) diff --git a/pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go index aab83f9d2..2ab652e2e 100644 --- a/pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go @@ -23,7 +23,7 @@ package v1alpha1 import ( auditregistrationv1alpha1 "k8s.io/api/auditregistration/v1alpha1" corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/devops/crdinstall/install.go b/pkg/apis/devops/crdinstall/install.go index 609f54bc3..91f27a277 100644 --- a/pkg/apis/devops/crdinstall/install.go +++ b/pkg/apis/devops/crdinstall/install.go @@ -19,6 +19,7 @@ package install import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" + devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" ) diff --git a/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go index 00f90c63f..64e01c809 100644 --- a/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go index 86305a898..9e094eef5 100644 --- a/pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha2 import ( - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/network/calicov3/ipamblock_types.go b/pkg/apis/network/calicov3/ipamblock_types.go index f3b343991..254ad3b28 100644 --- a/pkg/apis/network/calicov3/ipamblock_types.go +++ b/pkg/apis/network/calicov3/ipamblock_types.go @@ -15,10 +15,11 @@ package calicov3 import ( + "strings" + v3 "github.com/projectcalico/libcalico-go/lib/apis/v3" cnet "github.com/projectcalico/libcalico-go/lib/net" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "strings" ) // +genclient diff --git a/pkg/apis/network/crdinstall/install.go b/pkg/apis/network/crdinstall/install.go index db45b3cd9..0fa7580a0 100644 --- a/pkg/apis/network/crdinstall/install.go +++ b/pkg/apis/network/crdinstall/install.go @@ -19,6 +19,7 @@ package crdinstall import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" + networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" ) diff --git a/pkg/apis/network/v1alpha1/ipamblock_types_test.go b/pkg/apis/network/v1alpha1/ipamblock_types_test.go index 353fc77fc..83143741b 100644 --- a/pkg/apis/network/v1alpha1/ipamblock_types_test.go +++ b/pkg/apis/network/v1alpha1/ipamblock_types_test.go @@ -17,9 +17,10 @@ limitations under the License. package v1alpha1 import ( + "testing" + cnet "github.com/projectcalico/libcalico-go/lib/net" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "testing" ) func TestIPAMBlock(t *testing.T) { diff --git a/pkg/apis/network/v1alpha1/ipamhandle_types.go b/pkg/apis/network/v1alpha1/ipamhandle_types.go index 1c814343d..3c37c0693 100644 --- a/pkg/apis/network/v1alpha1/ipamhandle_types.go +++ b/pkg/apis/network/v1alpha1/ipamhandle_types.go @@ -18,11 +18,12 @@ package v1alpha1 import ( "fmt" + "strconv" + "strings" + "github.com/projectcalico/libcalico-go/lib/names" cnet "github.com/projectcalico/libcalico-go/lib/net" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "strconv" - "strings" ) const ( diff --git a/pkg/apis/network/v1alpha1/ipamhandle_types_test.go b/pkg/apis/network/v1alpha1/ipamhandle_types_test.go index 47133811d..5ac4d9821 100644 --- a/pkg/apis/network/v1alpha1/ipamhandle_types_test.go +++ b/pkg/apis/network/v1alpha1/ipamhandle_types_test.go @@ -17,8 +17,9 @@ limitations under the License. package v1alpha1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "testing" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestIPAMHandle(t *testing.T) { diff --git a/pkg/apis/network/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/network/v1alpha1/zz_generated.deepcopy.go index 8e508884b..eeea9ac2f 100644 --- a/pkg/apis/network/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/network/v1alpha1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/networking/v1" + v1 "k8s.io/api/networking/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/notification/v2beta1/notificationmanager_types.go b/pkg/apis/notification/v2beta1/notificationmanager_types.go index feb4115b0..b0f07244a 100644 --- a/pkg/apis/notification/v2beta1/notificationmanager_types.go +++ b/pkg/apis/notification/v2beta1/notificationmanager_types.go @@ -17,9 +17,10 @@ limitations under the License. package v2beta1 import ( - "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "time" + + v1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // SecretKeySelector selects a key of a Secret. diff --git a/pkg/apis/notification/v2beta1/zz_generated.deepcopy.go b/pkg/apis/notification/v2beta1/zz_generated.deepcopy.go index 559800ecb..2ca64d5e1 100644 --- a/pkg/apis/notification/v2beta1/zz_generated.deepcopy.go +++ b/pkg/apis/notification/v2beta1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v2beta1 import ( - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/servicemesh/crdinstall/install.go b/pkg/apis/servicemesh/crdinstall/install.go index ec825a3e8..84d200da0 100644 --- a/pkg/apis/servicemesh/crdinstall/install.go +++ b/pkg/apis/servicemesh/crdinstall/install.go @@ -19,6 +19,7 @@ package crdinstall import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" + servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" ) diff --git a/pkg/apis/servicemesh/v1alpha2/servicepolicy_types_test.go b/pkg/apis/servicemesh/v1alpha2/servicepolicy_types_test.go index ec96c0fcc..623360f1d 100644 --- a/pkg/apis/servicemesh/v1alpha2/servicepolicy_types_test.go +++ b/pkg/apis/servicemesh/v1alpha2/servicepolicy_types_test.go @@ -17,9 +17,10 @@ limitations under the License. package v1alpha2 import ( - "istio.io/api/networking/v1alpha3" "testing" + "istio.io/api/networking/v1alpha3" + "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apis/servicemesh/v1alpha2/strategy_types_test.go b/pkg/apis/servicemesh/v1alpha2/strategy_types_test.go index 42ce70cff..c67da6e04 100644 --- a/pkg/apis/servicemesh/v1alpha2/strategy_types_test.go +++ b/pkg/apis/servicemesh/v1alpha2/strategy_types_test.go @@ -18,10 +18,11 @@ package v1alpha2 import ( "io/ioutil" + "testing" + apinetworkingv1alpha3 "istio.io/api/networking/v1alpha3" "k8s.io/apimachinery/pkg/util/json" "k8s.io/client-go/kubernetes/scheme" - "testing" "github.com/onsi/gomega" "golang.org/x/net/context" diff --git a/pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go index c9cdd094f..9552e5204 100644 --- a/pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha2 import ( - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/storage/crdinstall/install.go b/pkg/apis/storage/crdinstall/install.go index 507e50337..712b4860e 100644 --- a/pkg/apis/storage/crdinstall/install.go +++ b/pkg/apis/storage/crdinstall/install.go @@ -20,6 +20,7 @@ package install import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" + storagev1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" ) diff --git a/pkg/apis/tenant/crdinstall/install.go b/pkg/apis/tenant/crdinstall/install.go index 49028b1ae..bf62f0f19 100644 --- a/pkg/apis/tenant/crdinstall/install.go +++ b/pkg/apis/tenant/crdinstall/install.go @@ -19,6 +19,7 @@ package install import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" + tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" ) diff --git a/pkg/apis/tenant/v1alpha2/workspacetemplate_types.go b/pkg/apis/tenant/v1alpha2/workspacetemplate_types.go index 96bb468df..792e9beb1 100644 --- a/pkg/apis/tenant/v1alpha2/workspacetemplate_types.go +++ b/pkg/apis/tenant/v1alpha2/workspacetemplate_types.go @@ -18,6 +18,7 @@ package v1alpha2 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + typesv1alpha1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" ) diff --git a/pkg/apis/types/v1beta1/federatedgroup_types.go b/pkg/apis/types/v1beta1/federatedgroup_types.go index 7efce4f3e..eacb13e70 100644 --- a/pkg/apis/types/v1beta1/federatedgroup_types.go +++ b/pkg/apis/types/v1beta1/federatedgroup_types.go @@ -18,6 +18,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" ) diff --git a/pkg/apis/types/v1beta1/federatedgroupbinding_types.go b/pkg/apis/types/v1beta1/federatedgroupbinding_types.go index d81b32c2f..bd6f9175b 100644 --- a/pkg/apis/types/v1beta1/federatedgroupbinding_types.go +++ b/pkg/apis/types/v1beta1/federatedgroupbinding_types.go @@ -18,6 +18,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" ) diff --git a/pkg/apis/types/v1beta1/federatednotificationconfig_types.go b/pkg/apis/types/v1beta1/federatednotificationconfig_types.go index c866303ef..f2d4892f5 100644 --- a/pkg/apis/types/v1beta1/federatednotificationconfig_types.go +++ b/pkg/apis/types/v1beta1/federatednotificationconfig_types.go @@ -18,6 +18,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" ) diff --git a/pkg/apis/types/v1beta1/federatednotificationreceiver_types.go b/pkg/apis/types/v1beta1/federatednotificationreceiver_types.go index 0640ce2e3..556ab728a 100644 --- a/pkg/apis/types/v1beta1/federatednotificationreceiver_types.go +++ b/pkg/apis/types/v1beta1/federatednotificationreceiver_types.go @@ -18,6 +18,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" ) diff --git a/pkg/apis/types/v1beta1/federateduser_types.go b/pkg/apis/types/v1beta1/federateduser_types.go index 6ba95f702..d0d730252 100644 --- a/pkg/apis/types/v1beta1/federateduser_types.go +++ b/pkg/apis/types/v1beta1/federateduser_types.go @@ -18,6 +18,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" ) diff --git a/pkg/apis/types/v1beta1/federatedworkspace_types.go b/pkg/apis/types/v1beta1/federatedworkspace_types.go index 46a8b2a9f..04e1576ed 100644 --- a/pkg/apis/types/v1beta1/federatedworkspace_types.go +++ b/pkg/apis/types/v1beta1/federatedworkspace_types.go @@ -18,6 +18,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + workspacev1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" ) diff --git a/pkg/apis/types/v1beta1/zz_generated.deepcopy.go b/pkg/apis/types/v1beta1/zz_generated.deepcopy.go index 1309ebf13..9de7a4295 100644 --- a/pkg/apis/types/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/types/v1beta1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index 625e160f8..7eb243d8e 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -20,11 +20,12 @@ import ( "bytes" "context" "fmt" - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" "net/http" rt "runtime" "time" + "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + openpitrixv2alpha1 "kubesphere.io/kubesphere/pkg/kapis/openpitrix/v2alpha1" "strconv" @@ -36,6 +37,8 @@ import ( unionauth "k8s.io/apiserver/pkg/authentication/request/union" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/klog" + runtimecache "sigs.k8s.io/controller-runtime/pkg/cache" + clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" notificationv2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" @@ -98,7 +101,6 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/sonarqube" "kubesphere.io/kubesphere/pkg/utils/metrics" utilnet "kubesphere.io/kubesphere/pkg/utils/net" - runtimecache "sigs.k8s.io/controller-runtime/pkg/cache" ) const ( diff --git a/pkg/apiserver/auditing/backend.go b/pkg/apiserver/auditing/backend.go index 57060bbf8..a0b5fd7ab 100644 --- a/pkg/apiserver/auditing/backend.go +++ b/pkg/apiserver/auditing/backend.go @@ -21,11 +21,13 @@ import ( "context" "crypto/tls" "encoding/json" - "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apiserver/auditing/v1alpha1" - options "kubesphere.io/kubesphere/pkg/simple/client/auditing" "net/http" "time" + + "k8s.io/klog" + + "kubesphere.io/kubesphere/pkg/apiserver/auditing/v1alpha1" + options "kubesphere.io/kubesphere/pkg/simple/client/auditing" ) const ( diff --git a/pkg/apiserver/auditing/types.go b/pkg/apiserver/auditing/types.go index 332af205e..f5dd635f0 100644 --- a/pkg/apiserver/auditing/types.go +++ b/pkg/apiserver/auditing/types.go @@ -21,14 +21,19 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/google/uuid" "io/ioutil" - "k8s.io/api/authentication/v1" + "net" + "net/http" + "time" + + "github.com/google/uuid" + v1 "k8s.io/api/authentication/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apiserver/pkg/apis/audit" "k8s.io/klog" + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" auditv1alpha1 "kubesphere.io/kubesphere/pkg/apiserver/auditing/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" @@ -39,9 +44,6 @@ import ( "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/devops" options "kubesphere.io/kubesphere/pkg/simple/client/auditing" "kubesphere.io/kubesphere/pkg/utils/iputil" - "net" - "net/http" - "time" ) const ( diff --git a/pkg/apiserver/auditing/types_test.go b/pkg/apiserver/auditing/types_test.go index d56affd19..d49cc4b74 100644 --- a/pkg/apiserver/auditing/types_test.go +++ b/pkg/apiserver/auditing/types_test.go @@ -18,6 +18,12 @@ package auditing import ( "encoding/json" + "net/http" + "net/http/httptest" + "net/url" + "testing" + "time" + "github.com/stretchr/testify/assert" "k8s.io/api/auditregistration/v1alpha1" v1 "k8s.io/api/authentication/v1" @@ -26,17 +32,13 @@ import ( "k8s.io/apiserver/pkg/authentication/user" k8srequest "k8s.io/apiserver/pkg/endpoints/request" fakek8s "k8s.io/client-go/kubernetes/fake" + auditingv1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" v1alpha12 "kubesphere.io/kubesphere/pkg/apiserver/auditing/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/utils/iputil" - "net/http" - "net/http/httptest" - "net/url" - "testing" - "time" ) var noResyncPeriodFunc = func() time.Duration { return 0 } diff --git a/pkg/apiserver/auditing/v1alpha1/event.go b/pkg/apiserver/auditing/v1alpha1/event.go index 16abeeab9..5621ee7fc 100644 --- a/pkg/apiserver/auditing/v1alpha1/event.go +++ b/pkg/apiserver/auditing/v1alpha1/event.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/apis/audit" ) diff --git a/pkg/apiserver/authentication/authenticators/basic/basic.go b/pkg/apiserver/authentication/authenticators/basic/basic.go index 525daa31f..a863b3ea5 100644 --- a/pkg/apiserver/authentication/authenticators/basic/basic.go +++ b/pkg/apiserver/authentication/authenticators/basic/basic.go @@ -18,7 +18,9 @@ package basic import ( "context" + "k8s.io/klog" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/models/auth" diff --git a/pkg/apiserver/authentication/authenticators/jwttoken/jwt_token.go b/pkg/apiserver/authentication/authenticators/jwttoken/jwt_token.go index 25b62ea66..5d9fbad27 100644 --- a/pkg/apiserver/authentication/authenticators/jwttoken/jwt_token.go +++ b/pkg/apiserver/authentication/authenticators/jwttoken/jwt_token.go @@ -18,9 +18,11 @@ package jwttoken import ( "context" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/models/auth" diff --git a/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas.go b/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas.go index 18fd8affb..3a9659eab 100644 --- a/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas.go +++ b/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas.go @@ -20,10 +20,12 @@ import ( "context" "encoding/json" "errors" - "github.com/mitchellh/mapstructure" "io/ioutil" + "github.com/mitchellh/mapstructure" + "golang.org/x/oauth2" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" ) diff --git a/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas_test.go b/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas_test.go index 12103d7ca..8febe023c 100644 --- a/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas_test.go +++ b/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas_test.go @@ -17,12 +17,14 @@ limitations under the License. package aliyunidaas import ( - "golang.org/x/oauth2" - "gopkg.in/yaml.v3" - "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" - "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" "reflect" "testing" + + "golang.org/x/oauth2" + "gopkg.in/yaml.v3" + + "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" ) func Test_idaasProviderFactory_Create(t *testing.T) { diff --git a/pkg/apiserver/authentication/identityprovider/cas/cas.go b/pkg/apiserver/authentication/identityprovider/cas/cas.go index 8005af938..e26d2e3f0 100644 --- a/pkg/apiserver/authentication/identityprovider/cas/cas.go +++ b/pkg/apiserver/authentication/identityprovider/cas/cas.go @@ -19,12 +19,14 @@ package cas import ( "crypto/tls" "fmt" - "github.com/mitchellh/mapstructure" - gocas "gopkg.in/cas.v2" - "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" - "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" "net/http" "net/url" + + "github.com/mitchellh/mapstructure" + gocas "gopkg.in/cas.v2" + + "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" ) func init() { diff --git a/pkg/apiserver/authentication/identityprovider/github/github.go b/pkg/apiserver/authentication/identityprovider/github/github.go index 598f8d7a1..2493b67ed 100644 --- a/pkg/apiserver/authentication/identityprovider/github/github.go +++ b/pkg/apiserver/authentication/identityprovider/github/github.go @@ -20,13 +20,15 @@ import ( "context" "crypto/tls" "encoding/json" - "github.com/mitchellh/mapstructure" - "golang.org/x/oauth2" "io/ioutil" - "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" - "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" "net/http" "time" + + "github.com/mitchellh/mapstructure" + "golang.org/x/oauth2" + + "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" ) const ( diff --git a/pkg/apiserver/authentication/identityprovider/github/github_test.go b/pkg/apiserver/authentication/identityprovider/github/github_test.go index 0fe19f1a4..223bc83de 100644 --- a/pkg/apiserver/authentication/identityprovider/github/github_test.go +++ b/pkg/apiserver/authentication/identityprovider/github/github_test.go @@ -21,17 +21,19 @@ package github import ( "encoding/json" "fmt" + "net/http" + "net/http/httptest" + "testing" + "time" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" "golang.org/x/oauth2" "gopkg.in/yaml.v3" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" - "net/http" - "net/http/httptest" - "testing" - "time" ) var githubServer *httptest.Server diff --git a/pkg/apiserver/authentication/identityprovider/identity_provider.go b/pkg/apiserver/authentication/identityprovider/identity_provider.go index 123073746..730b08f3b 100644 --- a/pkg/apiserver/authentication/identityprovider/identity_provider.go +++ b/pkg/apiserver/authentication/identityprovider/identity_provider.go @@ -19,7 +19,9 @@ package identityprovider import ( "errors" "fmt" + "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" ) diff --git a/pkg/apiserver/authentication/identityprovider/identity_provider_test.go b/pkg/apiserver/authentication/identityprovider/identity_provider_test.go index 368972515..dfd17ba22 100644 --- a/pkg/apiserver/authentication/identityprovider/identity_provider_test.go +++ b/pkg/apiserver/authentication/identityprovider/identity_provider_test.go @@ -19,8 +19,9 @@ package identityprovider import ( - "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" "testing" + + "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" ) type emptyOAuthProviderFactory struct { diff --git a/pkg/apiserver/authentication/identityprovider/ldap/ldap.go b/pkg/apiserver/authentication/identityprovider/ldap/ldap.go index f98c80157..39f58b948 100644 --- a/pkg/apiserver/authentication/identityprovider/ldap/ldap.go +++ b/pkg/apiserver/authentication/identityprovider/ldap/ldap.go @@ -21,14 +21,16 @@ import ( "crypto/x509" "encoding/base64" "fmt" + "io/ioutil" + "time" + "github.com/go-ldap/ldap" "github.com/mitchellh/mapstructure" - "io/ioutil" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" - "time" ) const ( diff --git a/pkg/apiserver/authentication/identityprovider/ldap/ldap_test.go b/pkg/apiserver/authentication/identityprovider/ldap/ldap_test.go index 0ce91b015..2ef011329 100644 --- a/pkg/apiserver/authentication/identityprovider/ldap/ldap_test.go +++ b/pkg/apiserver/authentication/identityprovider/ldap/ldap_test.go @@ -17,12 +17,14 @@ limitations under the License. package ldap import ( - "github.com/google/go-cmp/cmp" - "gopkg.in/yaml.v3" "io/ioutil" - "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" "os" "testing" + + "github.com/google/go-cmp/cmp" + "gopkg.in/yaml.v3" + + "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" ) func TestNewLdapProvider(t *testing.T) { diff --git a/pkg/apiserver/authentication/identityprovider/oidc/oidc.go b/pkg/apiserver/authentication/identityprovider/oidc/oidc.go index cd3c190c8..177397391 100644 --- a/pkg/apiserver/authentication/identityprovider/oidc/oidc.go +++ b/pkg/apiserver/authentication/identityprovider/oidc/oidc.go @@ -22,14 +22,16 @@ import ( "encoding/json" "errors" "fmt" + "io/ioutil" + "net/http" + "github.com/coreos/go-oidc" "github.com/dgrijalva/jwt-go" "github.com/mitchellh/mapstructure" "golang.org/x/oauth2" - "io/ioutil" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" - "net/http" ) func init() { diff --git a/pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go b/pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go index 876dfaf00..6e6c00774 100644 --- a/pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go +++ b/pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go @@ -26,18 +26,20 @@ import ( "encoding/binary" "encoding/json" "fmt" - "github.com/dgrijalva/jwt-go" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - "github.com/onsi/gomega/gexec" - "gopkg.in/square/go-jose.v2" - "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" - "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" "net/http" "net/http/httptest" "strings" "testing" "time" + + "github.com/dgrijalva/jwt-go" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + "github.com/onsi/gomega/gexec" + "gopkg.in/square/go-jose.v2" + + "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" ) var ( diff --git a/pkg/apiserver/authentication/oauth/oauth_options.go b/pkg/apiserver/authentication/oauth/oauth_options.go index 7c13a20f5..eb942e8b4 100644 --- a/pkg/apiserver/authentication/oauth/oauth_options.go +++ b/pkg/apiserver/authentication/oauth/oauth_options.go @@ -19,10 +19,11 @@ package oauth import ( "encoding/json" "errors" - "kubesphere.io/kubesphere/pkg/utils/sliceutil" "net/url" "strings" "time" + + "kubesphere.io/kubesphere/pkg/utils/sliceutil" ) type GrantHandlerType string diff --git a/pkg/apiserver/authentication/oauth/oauth_options_test.go b/pkg/apiserver/authentication/oauth/oauth_options_test.go index 527c4b263..70f43ac07 100644 --- a/pkg/apiserver/authentication/oauth/oauth_options_test.go +++ b/pkg/apiserver/authentication/oauth/oauth_options_test.go @@ -18,10 +18,11 @@ package oauth import ( "encoding/json" - "github.com/google/go-cmp/cmp" - "gopkg.in/yaml.v3" "testing" "time" + + "github.com/google/go-cmp/cmp" + "gopkg.in/yaml.v3" ) func TestDefaultAuthOptions(t *testing.T) { diff --git a/pkg/apiserver/authentication/options/authenticate_options.go b/pkg/apiserver/authentication/options/authenticate_options.go index e5381b4da..6652afde0 100644 --- a/pkg/apiserver/authentication/options/authenticate_options.go +++ b/pkg/apiserver/authentication/options/authenticate_options.go @@ -18,7 +18,10 @@ package options import ( "errors" + "time" + "github.com/spf13/pflag" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" _ "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider/aliyunidaas" _ "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider/cas" @@ -26,7 +29,6 @@ import ( _ "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider/ldap" _ "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider/oidc" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" - "time" ) type AuthenticationOptions struct { diff --git a/pkg/apiserver/authentication/request/anonymous/anonymous.go b/pkg/apiserver/authentication/request/anonymous/anonymous.go index ce1e7effd..d92ac7990 100644 --- a/pkg/apiserver/authentication/request/anonymous/anonymous.go +++ b/pkg/apiserver/authentication/request/anonymous/anonymous.go @@ -17,10 +17,11 @@ limitations under the License. package anonymous import ( - "k8s.io/apiserver/pkg/authentication/authenticator" - "k8s.io/apiserver/pkg/authentication/user" "net/http" "strings" + + "k8s.io/apiserver/pkg/authentication/authenticator" + "k8s.io/apiserver/pkg/authentication/user" ) type Authenticator struct{} diff --git a/pkg/apiserver/authentication/request/basictoken/basic_token.go b/pkg/apiserver/authentication/request/basictoken/basic_token.go index 7a7dc6b9c..84f35bc5c 100644 --- a/pkg/apiserver/authentication/request/basictoken/basic_token.go +++ b/pkg/apiserver/authentication/request/basictoken/basic_token.go @@ -20,8 +20,9 @@ package basictoken import ( "errors" - "k8s.io/apiserver/pkg/authentication/authenticator" "net/http" + + "k8s.io/apiserver/pkg/authentication/authenticator" ) type Authenticator struct { diff --git a/pkg/apiserver/authentication/token/issuer.go b/pkg/apiserver/authentication/token/issuer.go index 3be7956f8..43d886d4b 100644 --- a/pkg/apiserver/authentication/token/issuer.go +++ b/pkg/apiserver/authentication/token/issuer.go @@ -17,8 +17,9 @@ limitations under the License. package token import ( - "k8s.io/apiserver/pkg/authentication/user" "time" + + "k8s.io/apiserver/pkg/authentication/user" ) const ( diff --git a/pkg/apiserver/authentication/token/jwt.go b/pkg/apiserver/authentication/token/jwt.go index 646b6c9c3..029b2c854 100644 --- a/pkg/apiserver/authentication/token/jwt.go +++ b/pkg/apiserver/authentication/token/jwt.go @@ -18,10 +18,11 @@ package token import ( "fmt" + "time" + "github.com/dgrijalva/jwt-go" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" - "time" ) const ( diff --git a/pkg/apiserver/authentication/token/jwt_test.go b/pkg/apiserver/authentication/token/jwt_test.go index d3355a347..3b189d9db 100644 --- a/pkg/apiserver/authentication/token/jwt_test.go +++ b/pkg/apiserver/authentication/token/jwt_test.go @@ -17,9 +17,10 @@ limitations under the License. package token import ( + "testing" + "github.com/google/go-cmp/cmp" "k8s.io/apiserver/pkg/authentication/user" - "testing" ) func TestTokenVerifyWithoutCacheValidate(t *testing.T) { diff --git a/pkg/apiserver/authorization/authorizerfactory/builtin_test.go b/pkg/apiserver/authorization/authorizerfactory/builtin_test.go index 828ad5bbb..3b4058257 100644 --- a/pkg/apiserver/authorization/authorizerfactory/builtin_test.go +++ b/pkg/apiserver/authorization/authorizerfactory/builtin_test.go @@ -17,8 +17,9 @@ limitations under the License. package authorizerfactory import ( - "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "testing" + + "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" ) // Following code copied from k8s.io/apiserver/pkg/authorization/authorizerfactory to avoid import collision diff --git a/pkg/apiserver/authorization/options/authorization_options.go b/pkg/apiserver/authorization/options/authorization_options.go index dca2f8f04..9b8a6bf44 100644 --- a/pkg/apiserver/authorization/options/authorization_options.go +++ b/pkg/apiserver/authorization/options/authorization_options.go @@ -18,8 +18,10 @@ package options import ( "fmt" + "github.com/spf13/pflag" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/utils/sliceutil" ) diff --git a/pkg/apiserver/authorization/path/path.go b/pkg/apiserver/authorization/path/path.go index 435cca198..3b942ad5a 100644 --- a/pkg/apiserver/authorization/path/path.go +++ b/pkg/apiserver/authorization/path/path.go @@ -18,9 +18,10 @@ package path import ( "fmt" - "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "strings" + "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" + "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/pkg/apiserver/authorization/path/path_test.go b/pkg/apiserver/authorization/path/path_test.go index 73c4eb2f6..fe604961a 100644 --- a/pkg/apiserver/authorization/path/path_test.go +++ b/pkg/apiserver/authorization/path/path_test.go @@ -17,8 +17,9 @@ limitations under the License. package path import ( - "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "testing" + + "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" ) func TestNewAuthorizer(t *testing.T) { diff --git a/pkg/apiserver/authorization/rbac/rbac.go b/pkg/apiserver/authorization/rbac/rbac.go index ecfa5696f..f21de16c4 100644 --- a/pkg/apiserver/authorization/rbac/rbac.go +++ b/pkg/apiserver/authorization/rbac/rbac.go @@ -25,6 +25,7 @@ import ( "github.com/open-policy-agent/opa/rego" "k8s.io/apiserver/pkg/authentication/serviceaccount" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/request" diff --git a/pkg/apiserver/authorization/rbac/rbac_test.go b/pkg/apiserver/authorization/rbac/rbac_test.go index 0b811b668..af37a78ed 100644 --- a/pkg/apiserver/authorization/rbac/rbac_test.go +++ b/pkg/apiserver/authorization/rbac/rbac_test.go @@ -20,11 +20,15 @@ package rbac import ( "errors" - "github.com/google/go-cmp/cmp" "hash/fnv" "io" + "sort" + "testing" + + "github.com/google/go-cmp/cmp" corev1 "k8s.io/api/core/v1" fakek8s "k8s.io/client-go/kubernetes/fake" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" @@ -32,8 +36,6 @@ import ( fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/models/iam/am" - "sort" - "testing" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apiserver/authorization/union/union.go b/pkg/apiserver/authorization/union/union.go index dfcf8d240..4bfa1125e 100644 --- a/pkg/apiserver/authorization/union/union.go +++ b/pkg/apiserver/authorization/union/union.go @@ -25,9 +25,10 @@ limitations under the License. package union import ( - "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "strings" + "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" + utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apiserver/pkg/authentication/user" ) diff --git a/pkg/apiserver/authorization/union/union_test.go b/pkg/apiserver/authorization/union/union_test.go index 592629eeb..33729a531 100644 --- a/pkg/apiserver/authorization/union/union_test.go +++ b/pkg/apiserver/authorization/union/union_test.go @@ -19,10 +19,12 @@ package union import ( "errors" "fmt" - "k8s.io/apiserver/pkg/authentication/user" - "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "reflect" "testing" + + "k8s.io/apiserver/pkg/authentication/user" + + "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" ) type mockAuthzHandler struct { diff --git a/pkg/apiserver/config/config.go b/pkg/apiserver/config/config.go index 93307a332..bf7db349b 100644 --- a/pkg/apiserver/config/config.go +++ b/pkg/apiserver/config/config.go @@ -18,7 +18,11 @@ package config import ( "fmt" + "reflect" + "strings" + "github.com/spf13/viper" + networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" authorizationoptions "kubesphere.io/kubesphere/pkg/apiserver/authorization/options" @@ -39,8 +43,6 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/simple/client/servicemesh" "kubesphere.io/kubesphere/pkg/simple/client/sonarqube" - "reflect" - "strings" ) // Package config saves configuration for running KubeSphere components diff --git a/pkg/apiserver/config/config_test.go b/pkg/apiserver/config/config_test.go index 5606cf0c9..fc4979211 100644 --- a/pkg/apiserver/config/config_test.go +++ b/pkg/apiserver/config/config_test.go @@ -18,9 +18,14 @@ package config import ( "fmt" + "io/ioutil" + "os" + "testing" + "time" + "github.com/google/go-cmp/cmp" "gopkg.in/yaml.v2" - "io/ioutil" + networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" @@ -42,9 +47,6 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/simple/client/servicemesh" "kubesphere.io/kubesphere/pkg/simple/client/sonarqube" - "os" - "testing" - "time" ) func newTestConfig() (*Config, error) { diff --git a/pkg/apiserver/filters/auditing.go b/pkg/apiserver/filters/auditing.go index b6926c79e..daa6033ad 100644 --- a/pkg/apiserver/filters/auditing.go +++ b/pkg/apiserver/filters/auditing.go @@ -17,10 +17,12 @@ limitations under the License. package filters import ( + "net/http" + "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apiserver/auditing" "kubesphere.io/kubesphere/pkg/apiserver/request" - "net/http" ) func WithAuditing(handler http.Handler, a auditing.Auditing) http.Handler { diff --git a/pkg/apiserver/filters/authentication.go b/pkg/apiserver/filters/authentication.go index 473c2f5a2..5d673ebb6 100644 --- a/pkg/apiserver/filters/authentication.go +++ b/pkg/apiserver/filters/authentication.go @@ -19,6 +19,8 @@ package filters import ( "errors" "fmt" + "net/http" + apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -26,8 +28,8 @@ import ( "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apiserver/request" - "net/http" ) // WithAuthentication installs authentication handler to handler chain. diff --git a/pkg/apiserver/filters/authorization.go b/pkg/apiserver/filters/authorization.go index 31346fd52..d04994800 100644 --- a/pkg/apiserver/filters/authorization.go +++ b/pkg/apiserver/filters/authorization.go @@ -19,13 +19,15 @@ package filters import ( "context" "errors" + "net/http" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/request" - "net/http" ) // WithAuthorization passes all authorized requests on to handler, and returns forbidden error otherwise. diff --git a/pkg/apiserver/filters/dispatch.go b/pkg/apiserver/filters/dispatch.go index 3e2820da9..4f2d636d7 100644 --- a/pkg/apiserver/filters/dispatch.go +++ b/pkg/apiserver/filters/dispatch.go @@ -18,11 +18,13 @@ package filters import ( "fmt" + "net/http" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apiserver/dispatch" "kubesphere.io/kubesphere/pkg/apiserver/request" - "net/http" ) // Multiple cluster dispatcher forward request to desired cluster based on request cluster name diff --git a/pkg/apiserver/filters/requestinfo.go b/pkg/apiserver/filters/requestinfo.go index 1e2ac9c0e..e1bbff3e6 100644 --- a/pkg/apiserver/filters/requestinfo.go +++ b/pkg/apiserver/filters/requestinfo.go @@ -18,10 +18,12 @@ package filters import ( "fmt" - "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" - "kubesphere.io/kubesphere/pkg/apiserver/request" "net/http" "strings" + + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" + + "kubesphere.io/kubesphere/pkg/apiserver/request" ) func WithRequestInfo(handler http.Handler, resolver request.RequestInfoResolver) http.Handler { diff --git a/pkg/apiserver/metric.go b/pkg/apiserver/metric.go index 27906950b..760b900a1 100644 --- a/pkg/apiserver/metric.go +++ b/pkg/apiserver/metric.go @@ -2,6 +2,7 @@ package apiserver import ( compbasemetrics "k8s.io/component-base/metrics" + "kubesphere.io/kubesphere/pkg/utils/metrics" ) diff --git a/pkg/apiserver/query/types.go b/pkg/apiserver/query/types.go index e115cbd0f..4392c8e90 100644 --- a/pkg/apiserver/query/types.go +++ b/pkg/apiserver/query/types.go @@ -17,10 +17,12 @@ limitations under the License. package query import ( + "strconv" + "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/labels" + "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "strconv" ) const ( diff --git a/pkg/apiserver/query/types_test.go b/pkg/apiserver/query/types_test.go index e5d0e6e60..1c7ee5dbb 100644 --- a/pkg/apiserver/query/types_test.go +++ b/pkg/apiserver/query/types_test.go @@ -18,10 +18,11 @@ package query import ( "fmt" - "github.com/emicklei/go-restful" - "github.com/google/go-cmp/cmp" "net/http" "testing" + + "github.com/emicklei/go-restful" + "github.com/google/go-cmp/cmp" ) func TestParseQueryParameter(t *testing.T) { diff --git a/pkg/apiserver/request/context.go b/pkg/apiserver/request/context.go index d65b11309..d10bf1075 100644 --- a/pkg/apiserver/request/context.go +++ b/pkg/apiserver/request/context.go @@ -18,6 +18,7 @@ package request import ( "context" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/apis/audit" "k8s.io/apiserver/pkg/authentication/user" diff --git a/pkg/apiserver/request/requestinfo.go b/pkg/apiserver/request/requestinfo.go index 77f3da048..975da3d32 100644 --- a/pkg/apiserver/request/requestinfo.go +++ b/pkg/apiserver/request/requestinfo.go @@ -33,6 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" k8srequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/constants" netutils "kubesphere.io/kubesphere/pkg/utils/net" diff --git a/pkg/apiserver/request/requestinfo_test.go b/pkg/apiserver/request/requestinfo_test.go index c7cbc02be..ca5fdf8c4 100644 --- a/pkg/apiserver/request/requestinfo_test.go +++ b/pkg/apiserver/request/requestinfo_test.go @@ -17,9 +17,10 @@ limitations under the License. package request import ( - "k8s.io/apimachinery/pkg/util/sets" "net/http" "testing" + + "k8s.io/apimachinery/pkg/util/sets" ) func newTestRequestInfoResolver() RequestInfoResolver { diff --git a/pkg/controller/application/application_controller.go b/pkg/controller/application/application_controller.go index 9ef9bd8b7..e5fcc4a3a 100644 --- a/pkg/controller/application/application_controller.go +++ b/pkg/controller/application/application_controller.go @@ -19,6 +19,7 @@ package application import ( "context" "fmt" + v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" v1beta12 "k8s.io/api/networking/v1beta1" @@ -34,8 +35,6 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/client-go/util/retry" "k8s.io/klog" - servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" - "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" appv1beta1 "sigs.k8s.io/application/api/v1beta1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -44,6 +43,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + + servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" ) // ApplicationReconciler reconciles a Application object diff --git a/pkg/controller/application/application_controller_test.go b/pkg/controller/application/application_controller_test.go index 532306ffb..ff1a4242f 100644 --- a/pkg/controller/application/application_controller_test.go +++ b/pkg/controller/application/application_controller_test.go @@ -19,9 +19,10 @@ package application import ( "context" "fmt" + "time" + "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" - "time" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -29,8 +30,9 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" "sigs.k8s.io/application/api/v1beta1" + + "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" ) const ( diff --git a/pkg/controller/application/application_suit_test.go b/pkg/controller/application/application_suit_test.go index 690d1ac42..bc834d0c3 100644 --- a/pkg/controller/application/application_suit_test.go +++ b/pkg/controller/application/application_suit_test.go @@ -18,21 +18,23 @@ package application import ( "context" + "math/rand" + "path/filepath" + "testing" + "time" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/klog/klogr" - "kubesphere.io/kubesphere/pkg/apis" - "math/rand" - "path/filepath" appv1beta1 "sigs.k8s.io/application/api/v1beta1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - "testing" - "time" + + "kubesphere.io/kubesphere/pkg/apis" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/controller/certificatesigningrequest/certificatesigningrequest_controller.go b/pkg/controller/certificatesigningrequest/certificatesigningrequest_controller.go index e8b825e32..b23105cd0 100644 --- a/pkg/controller/certificatesigningrequest/certificatesigningrequest_controller.go +++ b/pkg/controller/certificatesigningrequest/certificatesigningrequest_controller.go @@ -19,6 +19,8 @@ package certificatesigningrequest import ( "context" "fmt" + "time" + certificatesv1beta1 "k8s.io/api/certificates/v1beta1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -36,9 +38,9 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/models/kubeconfig" - "time" ) const ( diff --git a/pkg/controller/cluster/helper.go b/pkg/controller/cluster/helper.go index 4ec9748d9..720206bc1 100644 --- a/pkg/controller/cluster/helper.go +++ b/pkg/controller/cluster/helper.go @@ -18,6 +18,7 @@ package cluster import ( "io/ioutil" + "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd/api" diff --git a/pkg/controller/cluster/join.go b/pkg/controller/cluster/join.go index 944c5d2b0..8f450ff68 100644 --- a/pkg/controller/cluster/join.go +++ b/pkg/controller/cluster/join.go @@ -32,11 +32,12 @@ import ( kubeclient "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" - "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/tenant/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/kubefed/pkg/kubefedctl/util" + "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/tenant/v1alpha1" + "k8s.io/apimachinery/pkg/runtime" k8sscheme "k8s.io/client-go/kubernetes/scheme" fedapis "sigs.k8s.io/kubefed/pkg/apis" diff --git a/pkg/controller/cluster/unjoin.go b/pkg/controller/cluster/unjoin.go index 74ee4651f..22b3bb335 100644 --- a/pkg/controller/cluster/unjoin.go +++ b/pkg/controller/cluster/unjoin.go @@ -18,6 +18,7 @@ package cluster import ( "context" + "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/cluster/util.go b/pkg/controller/cluster/util.go index f046600b1..279368e34 100644 --- a/pkg/controller/cluster/util.go +++ b/pkg/controller/cluster/util.go @@ -18,6 +18,8 @@ package cluster import ( "fmt" + "strings" + "github.com/pkg/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -25,7 +27,6 @@ import ( kubeclient "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "strings" ) // Default values for the federated group and version used by diff --git a/pkg/controller/clusterrolebinding/clusterrolebinding_controller.go b/pkg/controller/clusterrolebinding/clusterrolebinding_controller.go index 3ec5a702f..1f4382a47 100644 --- a/pkg/controller/clusterrolebinding/clusterrolebinding_controller.go +++ b/pkg/controller/clusterrolebinding/clusterrolebinding_controller.go @@ -18,6 +18,8 @@ package clusterrolebinding import ( "fmt" + "time" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" utilruntime "k8s.io/apimachinery/pkg/util/runtime" @@ -33,10 +35,10 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" iamv1alpha2informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/models/kubectl" - "time" ) const ( diff --git a/pkg/controller/destinationrule/destinationrule_controller.go b/pkg/controller/destinationrule/destinationrule_controller.go index 526d32d1a..fe36057bf 100644 --- a/pkg/controller/destinationrule/destinationrule_controller.go +++ b/pkg/controller/destinationrule/destinationrule_controller.go @@ -19,9 +19,12 @@ package destinationrule import ( "context" "fmt" - "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" "reflect" + "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" + + "time" + apinetworkingv1alpha3 "istio.io/api/networking/v1alpha3" clientgonetworkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3" appsv1 "k8s.io/api/apps/v1" @@ -36,8 +39,8 @@ import ( "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" log "k8s.io/klog" + servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" - "time" istioclientset "istio.io/client-go/pkg/clientset/versioned" istioinformers "istio.io/client-go/pkg/informers/externalversions/networking/v1alpha3" diff --git a/pkg/controller/destinationrule/destinationrule_controller_test.go b/pkg/controller/destinationrule/destinationrule_controller_test.go index 700c0b5e5..f49ded3ac 100644 --- a/pkg/controller/destinationrule/destinationrule_controller_test.go +++ b/pkg/controller/destinationrule/destinationrule_controller_test.go @@ -19,6 +19,8 @@ package destinationrule import ( "context" "fmt" + "testing" + apiv1alpha3 "istio.io/api/networking/v1alpha3" "istio.io/client-go/pkg/apis/networking/v1alpha3" istiofake "istio.io/client-go/pkg/clientset/versioned/fake" @@ -31,12 +33,12 @@ import ( kubefake "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" + "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" "kubesphere.io/kubesphere/pkg/utils/reflectutils" - "testing" ) var ( diff --git a/pkg/controller/devopscredential/devopscredential_controller.go b/pkg/controller/devopscredential/devopscredential_controller.go index ff9c3b9a8..6e5c6788a 100644 --- a/pkg/controller/devopscredential/devopscredential_controller.go +++ b/pkg/controller/devopscredential/devopscredential_controller.go @@ -19,6 +19,11 @@ package devopscredential import ( "context" "fmt" + "net/http" + "reflect" + "strings" + "time" + "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -34,6 +39,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/constants" @@ -42,10 +48,6 @@ import ( devopsClient "kubesphere.io/kubesphere/pkg/simple/client/devops" "kubesphere.io/kubesphere/pkg/utils/k8sutil" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "net/http" - "reflect" - "strings" - "time" ) /** diff --git a/pkg/controller/devopscredential/devopscredential_controller_test.go b/pkg/controller/devopscredential/devopscredential_controller_test.go index 30cdfa871..d7491e328 100644 --- a/pkg/controller/devopscredential/devopscredential_controller_test.go +++ b/pkg/controller/devopscredential/devopscredential_controller_test.go @@ -17,12 +17,14 @@ limitations under the License. package devopscredential import ( - modelsdevops "kubesphere.io/kubesphere/pkg/models/devops" "reflect" "testing" "time" + modelsdevops "kubesphere.io/kubesphere/pkg/models/devops" + v1 "k8s.io/api/core/v1" + "kubesphere.io/kubesphere/pkg/constants" fakeDevOps "kubesphere.io/kubesphere/pkg/simple/client/devops/fake" @@ -35,6 +37,7 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" + devops "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" ) diff --git a/pkg/controller/devopsproject/devopsproject_controller.go b/pkg/controller/devopsproject/devopsproject_controller.go index aafff7642..6ac4bcf20 100644 --- a/pkg/controller/devopsproject/devopsproject_controller.go +++ b/pkg/controller/devopsproject/devopsproject_controller.go @@ -19,6 +19,10 @@ package devopsproject import ( "context" "fmt" + "net/http" + "reflect" + "time" + "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -34,6 +38,8 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" tenantv1alpha1informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/tenant/v1alpha1" @@ -43,10 +49,6 @@ import ( devopsClient "kubesphere.io/kubesphere/pkg/simple/client/devops" "kubesphere.io/kubesphere/pkg/utils/k8sutil" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "net/http" - "reflect" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "time" kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" devopsinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/devops/v1alpha3" diff --git a/pkg/controller/devopsproject/devopsproject_controller_test.go b/pkg/controller/devopsproject/devopsproject_controller_test.go index 5f3b5a39c..8d3d1ee7c 100644 --- a/pkg/controller/devopsproject/devopsproject_controller_test.go +++ b/pkg/controller/devopsproject/devopsproject_controller_test.go @@ -17,14 +17,16 @@ limitations under the License. package devopsproject import ( - v1 "k8s.io/api/core/v1" - devopsprojects "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" - "kubesphere.io/kubesphere/pkg/constants" - fakeDevOps "kubesphere.io/kubesphere/pkg/simple/client/devops/fake" "reflect" "testing" "time" + v1 "k8s.io/api/core/v1" + + devopsprojects "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/constants" + fakeDevOps "kubesphere.io/kubesphere/pkg/simple/client/devops/fake" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -34,6 +36,7 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" + devops "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/controller/globalrole/globalrole_controller.go b/pkg/controller/globalrole/globalrole_controller.go index ebc8fcb11..fb3d8f6fb 100644 --- a/pkg/controller/globalrole/globalrole_controller.go +++ b/pkg/controller/globalrole/globalrole_controller.go @@ -20,6 +20,9 @@ import ( "context" "encoding/json" "fmt" + "reflect" + "time" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -34,14 +37,13 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" iamv1alpha2informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam/v1alpha2" iamv1alpha2listers "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/constants" - "reflect" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "time" ) const ( diff --git a/pkg/controller/globalrolebinding/globalrolebinding_controller.go b/pkg/controller/globalrolebinding/globalrolebinding_controller.go index c72867876..783ac91aa 100644 --- a/pkg/controller/globalrolebinding/globalrolebinding_controller.go +++ b/pkg/controller/globalrolebinding/globalrolebinding_controller.go @@ -20,6 +20,7 @@ import ( "context" "encoding/json" "fmt" + corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -35,6 +36,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" iamv1alpha2informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam/v1alpha2" @@ -43,8 +45,9 @@ import ( devops "kubesphere.io/kubesphere/pkg/simple/client/devops" "reflect" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "time" + + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) const ( diff --git a/pkg/controller/group/group_controller.go b/pkg/controller/group/group_controller.go index f17f7de49..fbae3f303 100644 --- a/pkg/controller/group/group_controller.go +++ b/pkg/controller/group/group_controller.go @@ -34,6 +34,8 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + iam1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" fedv1beta1types "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" @@ -45,7 +47,6 @@ import ( "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/k8sutil" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) const ( diff --git a/pkg/controller/group/group_controller_test.go b/pkg/controller/group/group_controller_test.go index 10cef7328..073b20a83 100644 --- a/pkg/controller/group/group_controller_test.go +++ b/pkg/controller/group/group_controller_test.go @@ -31,12 +31,13 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" fedv1beta1types "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/groupbinding/groupbinding_controller.go b/pkg/controller/groupbinding/groupbinding_controller.go index 70c98a72c..10fe7d410 100644 --- a/pkg/controller/groupbinding/groupbinding_controller.go +++ b/pkg/controller/groupbinding/groupbinding_controller.go @@ -34,6 +34,9 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" fedv1beta1types "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" @@ -44,8 +47,6 @@ import ( "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) const ( diff --git a/pkg/controller/groupbinding/groupbinding_controller_test.go b/pkg/controller/groupbinding/groupbinding_controller_test.go index cdfc3e32a..fa787bf39 100644 --- a/pkg/controller/groupbinding/groupbinding_controller_test.go +++ b/pkg/controller/groupbinding/groupbinding_controller_test.go @@ -32,14 +32,15 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" fedv1beta1types "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) var ( diff --git a/pkg/controller/job/job_controller.go b/pkg/controller/job/job_controller.go index 3d391d7c4..15f861105 100644 --- a/pkg/controller/job/job_controller.go +++ b/pkg/controller/job/job_controller.go @@ -20,9 +20,12 @@ import ( "context" "encoding/json" "fmt" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "reflect" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "time" + batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -31,7 +34,6 @@ import ( batchv1informers "k8s.io/client-go/informers/batch/v1" batchv1listers "k8s.io/client-go/listers/batch/v1" log "k8s.io/klog" - "time" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" diff --git a/pkg/controller/job/job_controller_test.go b/pkg/controller/job/job_controller_test.go index 0a96111e9..5172517d6 100644 --- a/pkg/controller/job/job_controller_test.go +++ b/pkg/controller/job/job_controller_test.go @@ -17,6 +17,10 @@ limitations under the License. package job import ( + "reflect" + "testing" + "time" + batchv1 "k8s.io/api/batch/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -27,9 +31,6 @@ import ( k8sfake "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" - "reflect" - "testing" - "time" ) var ( diff --git a/pkg/controller/loginrecord/loginrecord_controller.go b/pkg/controller/loginrecord/loginrecord_controller.go index 4a441a861..fedba1d07 100644 --- a/pkg/controller/loginrecord/loginrecord_controller.go +++ b/pkg/controller/loginrecord/loginrecord_controller.go @@ -19,6 +19,9 @@ package loginrecord import ( "context" "fmt" + "sort" + "time" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -31,13 +34,12 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" iamv1alpha2informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam/v1alpha2" iamv1alpha2listers "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/controller/utils/controller" - "sort" - "time" ) const ( diff --git a/pkg/controller/loginrecord/loginrecord_controller_test.go b/pkg/controller/loginrecord/loginrecord_controller_test.go index 7ea44dc9c..b59cc264e 100644 --- a/pkg/controller/loginrecord/loginrecord_controller_test.go +++ b/pkg/controller/loginrecord/loginrecord_controller_test.go @@ -18,20 +18,22 @@ package loginrecord import ( "fmt" + "math/rand" + "testing" + "time" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakek8s "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/scheme" clienttesting "k8s.io/client-go/testing" + "sigs.k8s.io/controller-runtime/pkg/envtest/printer" + "kubesphere.io/kubesphere/pkg/apis" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" - "math/rand" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" - "testing" - "time" ) func TestLoginRecordController(t *testing.T) { diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index 7d213a8b0..0971fe128 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -33,16 +33,17 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/constants" controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/k8sutil" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) const ( diff --git a/pkg/controller/namespace/namespace_controller_suite_test.go b/pkg/controller/namespace/namespace_controller_suite_test.go index 6d3c42e8f..12caa2e90 100644 --- a/pkg/controller/namespace/namespace_controller_suite_test.go +++ b/pkg/controller/namespace/namespace_controller_suite_test.go @@ -17,17 +17,19 @@ limitations under the License. package namespace import ( + "os" + "path/filepath" + "testing" + "time" + "github.com/onsi/gomega/gexec" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog/klogr" - "kubesphere.io/kubesphere/pkg/apis" - "os" - "path/filepath" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - "testing" - "time" + + "kubesphere.io/kubesphere/pkg/apis" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index 2bd7083a6..18959bc7b 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -18,14 +18,16 @@ package namespace import ( "context" + "time" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/constants" - "time" ) var _ = Describe("Namespace", func() { diff --git a/pkg/controller/network/ippool/ippool_controller.go b/pkg/controller/network/ippool/ippool_controller.go index 5a4e244ae..5594e5c9a 100644 --- a/pkg/controller/network/ippool/ippool_controller.go +++ b/pkg/controller/network/ippool/ippool_controller.go @@ -19,6 +19,9 @@ package ippool import ( "context" "fmt" + "reflect" + "time" + cnet "github.com/projectcalico/libcalico-go/lib/net" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -36,6 +39,8 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" @@ -46,9 +51,6 @@ import ( "kubesphere.io/kubesphere/pkg/controller/network/utils" "kubesphere.io/kubesphere/pkg/controller/network/webhooks" "kubesphere.io/kubesphere/pkg/simple/client/network/ippool" - "reflect" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "time" ) var ( diff --git a/pkg/controller/network/ippool/ippool_controller_test.go b/pkg/controller/network/ippool/ippool_controller_test.go index 6740af473..893e22246 100644 --- a/pkg/controller/network/ippool/ippool_controller_test.go +++ b/pkg/controller/network/ippool/ippool_controller_test.go @@ -28,6 +28,7 @@ import ( k8sinformers "k8s.io/client-go/informers" k8sfake "k8s.io/client-go/kubernetes/fake" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_controller.go b/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_controller.go index d80f1b482..607a4804f 100644 --- a/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_controller.go +++ b/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_controller.go @@ -37,6 +37,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" workspacev1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" ksnetclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/network/v1alpha1" diff --git a/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_test.go b/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_test.go index 615dc5093..ebca31551 100644 --- a/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_test.go +++ b/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_test.go @@ -30,6 +30,7 @@ import ( informerv1 "k8s.io/client-go/informers/core/v1" kubefake "k8s.io/client-go/kubernetes/fake" "k8s.io/klog" + netv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" wkspv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" diff --git a/pkg/controller/network/nsnetworkpolicy/provider/ns_k8s.go b/pkg/controller/network/nsnetworkpolicy/provider/ns_k8s.go index 348e1a9c0..a3db0b29c 100644 --- a/pkg/controller/network/nsnetworkpolicy/provider/ns_k8s.go +++ b/pkg/controller/network/nsnetworkpolicy/provider/ns_k8s.go @@ -35,6 +35,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" ) diff --git a/pkg/controller/network/utils/utils.go b/pkg/controller/network/utils/utils.go index 0133b10f3..5fdb05225 100644 --- a/pkg/controller/network/utils/utils.go +++ b/pkg/controller/network/utils/utils.go @@ -1,8 +1,9 @@ package utils import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sort" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // IsDeletionCandidate checks if object is candidate to be deleted diff --git a/pkg/controller/notification/notification_controller.go b/pkg/controller/notification/notification_controller.go index 59e1fc919..543450bd3 100644 --- a/pkg/controller/notification/notification_controller.go +++ b/pkg/controller/notification/notification_controller.go @@ -19,6 +19,9 @@ package notification import ( "context" "fmt" + "reflect" + "time" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -33,14 +36,13 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" - "kubesphere.io/kubesphere/pkg/constants" - "reflect" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "time" + + "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + "kubesphere.io/kubesphere/pkg/constants" ) const ( diff --git a/pkg/controller/notification/notification_controller_suite_test.go b/pkg/controller/notification/notification_controller_suite_test.go index cee2730cd..5c559285b 100644 --- a/pkg/controller/notification/notification_controller_suite_test.go +++ b/pkg/controller/notification/notification_controller_suite_test.go @@ -17,13 +17,15 @@ limitations under the License. package notification import ( - "k8s.io/client-go/kubernetes/fake" - "k8s.io/client-go/kubernetes/scheme" - "kubesphere.io/kubesphere/pkg/apis" - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" "path/filepath" "testing" + "k8s.io/client-go/kubernetes/fake" + "k8s.io/client-go/kubernetes/scheme" + + "kubesphere.io/kubesphere/pkg/apis" + "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/client-go/rest" diff --git a/pkg/controller/notification/notification_controller_test.go b/pkg/controller/notification/notification_controller_test.go index 9609c6a35..d6f5894c0 100644 --- a/pkg/controller/notification/notification_controller_test.go +++ b/pkg/controller/notification/notification_controller_test.go @@ -18,17 +18,19 @@ package notification import ( "context" + "time" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/cache" + "sigs.k8s.io/controller-runtime/pkg/client" + "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/constants" - "sigs.k8s.io/controller-runtime/pkg/cache" - "sigs.k8s.io/controller-runtime/pkg/client" - "time" ) var ( diff --git a/pkg/controller/openpitrix/helmapplication/helm_application_controller.go b/pkg/controller/openpitrix/helmapplication/helm_application_controller.go index 5e2ff7da8..6548a0b89 100644 --- a/pkg/controller/openpitrix/helmapplication/helm_application_controller.go +++ b/pkg/controller/openpitrix/helmapplication/helm_application_controller.go @@ -19,17 +19,19 @@ package helmapplication import ( "context" "fmt" + "strconv" + "strings" + apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - "kubesphere.io/kubesphere/pkg/constants" - "kubesphere.io/kubesphere/pkg/utils/sliceutil" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "strconv" - "strings" + + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" + "kubesphere.io/kubesphere/pkg/utils/sliceutil" ) func init() { diff --git a/pkg/controller/openpitrix/helmapplication/helm_application_version_controller.go b/pkg/controller/openpitrix/helmapplication/helm_application_version_controller.go index 7f063912d..e2f5f8d41 100644 --- a/pkg/controller/openpitrix/helmapplication/helm_application_version_controller.go +++ b/pkg/controller/openpitrix/helmapplication/helm_application_version_controller.go @@ -19,18 +19,20 @@ package helmapplication import ( "context" "fmt" + "time" + "github.com/Masterminds/semver/v3" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - "kubesphere.io/kubesphere/pkg/constants" - "kubesphere.io/kubesphere/pkg/utils/sliceutil" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "time" + + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" + "kubesphere.io/kubesphere/pkg/utils/sliceutil" ) const ( diff --git a/pkg/controller/openpitrix/helmapplication/metrics.go b/pkg/controller/openpitrix/helmapplication/metrics.go index 0ab0e1dc3..9c19a2bb8 100644 --- a/pkg/controller/openpitrix/helmapplication/metrics.go +++ b/pkg/controller/openpitrix/helmapplication/metrics.go @@ -18,6 +18,7 @@ package helmapplication import ( compbasemetrics "k8s.io/component-base/metrics" + "kubesphere.io/kubesphere/pkg/utils/metrics" ) diff --git a/pkg/controller/openpitrix/helmcategory/helm_category_controller.go b/pkg/controller/openpitrix/helmcategory/helm_category_controller.go index 561fc8493..06f8160d3 100644 --- a/pkg/controller/openpitrix/helmcategory/helm_category_controller.go +++ b/pkg/controller/openpitrix/helmcategory/helm_category_controller.go @@ -18,6 +18,8 @@ package helmcategory import ( "context" + "time" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -26,9 +28,6 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - "kubesphere.io/kubesphere/pkg/constants" - "kubesphere.io/kubesphere/pkg/utils/sliceutil" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/event" @@ -36,7 +35,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "time" + + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" + "kubesphere.io/kubesphere/pkg/utils/sliceutil" ) const ( diff --git a/pkg/controller/openpitrix/helmcategory/helm_category_controller_suite_test.go b/pkg/controller/openpitrix/helmcategory/helm_category_controller_suite_test.go index eca735495..b83ef5c6b 100644 --- a/pkg/controller/openpitrix/helmcategory/helm_category_controller_suite_test.go +++ b/pkg/controller/openpitrix/helmcategory/helm_category_controller_suite_test.go @@ -17,18 +17,20 @@ limitations under the License. package helmcategory import ( + "os" + "path/filepath" + "testing" + "time" + "github.com/onsi/gomega/gexec" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog/klogr" - "kubesphere.io/kubesphere/pkg/apis" - "kubesphere.io/kubesphere/pkg/controller/openpitrix/helmapplication" - "os" - "path/filepath" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - "testing" - "time" + + "kubesphere.io/kubesphere/pkg/apis" + "kubesphere.io/kubesphere/pkg/controller/openpitrix/helmapplication" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/controller/openpitrix/helmcategory/helm_category_controller_test.go b/pkg/controller/openpitrix/helmcategory/helm_category_controller_test.go index c586d8c89..19b0bbb5f 100644 --- a/pkg/controller/openpitrix/helmcategory/helm_category_controller_test.go +++ b/pkg/controller/openpitrix/helmcategory/helm_category_controller_test.go @@ -18,14 +18,16 @@ package helmcategory import ( "context" + "time" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/utils/idutils" - "time" ) var _ = Describe("helmCategory", func() { diff --git a/pkg/controller/openpitrix/helmrelease/get_chart_data.go b/pkg/controller/openpitrix/helmrelease/get_chart_data.go index 6a8d558c8..7f3e117ff 100644 --- a/pkg/controller/openpitrix/helmrelease/get_chart_data.go +++ b/pkg/controller/openpitrix/helmrelease/get_chart_data.go @@ -18,12 +18,14 @@ package helmrelease import ( "context" - "k8s.io/apimachinery/pkg/types" - "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" "path" "strings" + + "k8s.io/apimachinery/pkg/types" + "k8s.io/klog" + + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" ) func (r *ReconcileHelmRelease) GetChartData(rls *v1alpha1.HelmRelease) (chartName string, chartData []byte, err error) { diff --git a/pkg/controller/openpitrix/helmrelease/helm_release_controller.go b/pkg/controller/openpitrix/helmrelease/helm_release_controller.go index 1501a27e2..ae01a1e81 100644 --- a/pkg/controller/openpitrix/helmrelease/helm_release_controller.go +++ b/pkg/controller/openpitrix/helmrelease/helm_release_controller.go @@ -19,11 +19,18 @@ package helmrelease import ( "context" "errors" + "math" + "time" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/klog" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" @@ -33,11 +40,6 @@ import ( "kubesphere.io/kubesphere/pkg/utils/clusterclient" "kubesphere.io/kubesphere/pkg/utils/sliceutil" "kubesphere.io/kubesphere/pkg/utils/stringutils" - "math" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - "time" ) const ( diff --git a/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go b/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go index 6f4ec41e3..d8148ad42 100644 --- a/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go +++ b/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go @@ -18,6 +18,9 @@ package helmrepo import ( "context" + "math" + "time" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -25,17 +28,16 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/klog" "k8s.io/utils/strings" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" - "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "math" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "time" + + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" + "kubesphere.io/kubesphere/pkg/utils/sliceutil" ) const ( diff --git a/pkg/controller/openpitrix/helmrepo/helm_repo_controller_suite_test.go b/pkg/controller/openpitrix/helmrepo/helm_repo_controller_suite_test.go index 75c6e1ec4..d14a54eb5 100644 --- a/pkg/controller/openpitrix/helmrepo/helm_repo_controller_suite_test.go +++ b/pkg/controller/openpitrix/helmrepo/helm_repo_controller_suite_test.go @@ -17,17 +17,19 @@ limitations under the License. package helmrepo import ( + "os" + "path/filepath" + "testing" + "time" + "github.com/onsi/gomega/gexec" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog/klogr" - "kubesphere.io/kubesphere/pkg/apis" - "os" - "path/filepath" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - "testing" - "time" + + "kubesphere.io/kubesphere/pkg/apis" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/controller/openpitrix/helmrepo/helm_repo_controller_test.go b/pkg/controller/openpitrix/helmrepo/helm_repo_controller_test.go index bdd34c3d5..26372de88 100644 --- a/pkg/controller/openpitrix/helmrepo/helm_repo_controller_test.go +++ b/pkg/controller/openpitrix/helmrepo/helm_repo_controller_test.go @@ -18,13 +18,15 @@ package helmrepo import ( "context" + "time" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/utils/idutils" - "time" ) var repoUrl = "https://charts.kubesphere.io/main" diff --git a/pkg/controller/pipeline/pipeline_controller.go b/pkg/controller/pipeline/pipeline_controller.go index ad6a8bb7c..21ec16214 100644 --- a/pkg/controller/pipeline/pipeline_controller.go +++ b/pkg/controller/pipeline/pipeline_controller.go @@ -19,6 +19,10 @@ package pipeline import ( "context" "fmt" + "net/http" + "reflect" + "time" + "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -34,6 +38,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" devopsinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/devops/v1alpha3" @@ -44,9 +49,6 @@ import ( devopsClient "kubesphere.io/kubesphere/pkg/simple/client/devops" "kubesphere.io/kubesphere/pkg/utils/k8sutil" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "net/http" - "reflect" - "time" ) /** diff --git a/pkg/controller/pipeline/pipeline_controller_test.go b/pkg/controller/pipeline/pipeline_controller_test.go index 574c14e28..3fb3d43c4 100644 --- a/pkg/controller/pipeline/pipeline_controller_test.go +++ b/pkg/controller/pipeline/pipeline_controller_test.go @@ -17,14 +17,16 @@ limitations under the License. package pipeline import ( - v1 "k8s.io/api/core/v1" - "kubesphere.io/kubesphere/pkg/constants" - modelsdevops "kubesphere.io/kubesphere/pkg/models/devops" - fakeDevOps "kubesphere.io/kubesphere/pkg/simple/client/devops/fake" "reflect" "testing" "time" + v1 "k8s.io/api/core/v1" + + "kubesphere.io/kubesphere/pkg/constants" + modelsdevops "kubesphere.io/kubesphere/pkg/models/devops" + fakeDevOps "kubesphere.io/kubesphere/pkg/simple/client/devops/fake" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -34,6 +36,7 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" + devops "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/controller/quota/accessor.go b/pkg/controller/quota/accessor.go index ec28161fe..a31dd0ece 100644 --- a/pkg/controller/quota/accessor.go +++ b/pkg/controller/quota/accessor.go @@ -20,11 +20,13 @@ package quota import ( "context" + "time" + "k8s.io/apimachinery/pkg/types" "k8s.io/klog" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" "sigs.k8s.io/controller-runtime/pkg/client" - "time" + + quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" lru "github.com/hashicorp/golang-lru" @@ -32,6 +34,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" utilwait "k8s.io/apimachinery/pkg/util/wait" etcd "k8s.io/apiserver/pkg/storage/etcd3" + utilquota "kubesphere.io/kubesphere/kube/pkg/quota/v1" ) diff --git a/pkg/controller/quota/resourcequota_controller.go b/pkg/controller/quota/resourcequota_controller.go index 5593e07a4..a5411d6de 100644 --- a/pkg/controller/quota/resourcequota_controller.go +++ b/pkg/controller/quota/resourcequota_controller.go @@ -20,6 +20,9 @@ package quota import ( "context" + "math" + "time" + "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -29,6 +32,13 @@ import ( "k8s.io/apimachinery/pkg/util/clock" "k8s.io/client-go/tools/record" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + "sigs.k8s.io/controller-runtime/pkg/event" + "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/predicate" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + "sigs.k8s.io/controller-runtime/pkg/source" + evaluatorcore "kubesphere.io/kubesphere/kube/pkg/quota/v1/evaluator/core" "kubesphere.io/kubesphere/kube/pkg/quota/v1/generic" "kubesphere.io/kubesphere/kube/pkg/quota/v1/install" @@ -36,14 +46,6 @@ import ( tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "math" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "sigs.k8s.io/controller-runtime/pkg/event" - "sigs.k8s.io/controller-runtime/pkg/handler" - "sigs.k8s.io/controller-runtime/pkg/predicate" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/source" - "time" k8sinformers "k8s.io/client-go/informers" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controller/quota/resourcequota_webhook.go b/pkg/controller/quota/resourcequota_webhook.go index 5f047ebb3..2374d2c30 100644 --- a/pkg/controller/quota/resourcequota_webhook.go +++ b/pkg/controller/quota/resourcequota_webhook.go @@ -20,6 +20,10 @@ package quota import ( "context" + "net/http" + "sort" + "sync" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" @@ -29,17 +33,15 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + "kubesphere.io/kubesphere/kube/pkg/quota/v1" "kubesphere.io/kubesphere/kube/pkg/quota/v1/generic" "kubesphere.io/kubesphere/kube/pkg/quota/v1/install" "kubesphere.io/kubesphere/kube/plugin/pkg/admission/resourcequota" resourcequotaapi "kubesphere.io/kubesphere/kube/plugin/pkg/admission/resourcequota/apis/resourcequota" - "net/http" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/webhook" - "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "sort" - "sync" ) const ( diff --git a/pkg/controller/quota/util.go b/pkg/controller/quota/util.go index 0a8557503..4d46dbaad 100644 --- a/pkg/controller/quota/util.go +++ b/pkg/controller/quota/util.go @@ -20,11 +20,13 @@ package quota import ( "context" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" "sigs.k8s.io/controller-runtime/pkg/client" + + quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" ) // Following code copied from github.com/openshift/library-go/pkg/quota/quotautil diff --git a/pkg/controller/s2ibinary/s2ibinary_controller.go b/pkg/controller/s2ibinary/s2ibinary_controller.go index 85bba2be8..78a8d3735 100644 --- a/pkg/controller/s2ibinary/s2ibinary_controller.go +++ b/pkg/controller/s2ibinary/s2ibinary_controller.go @@ -19,6 +19,8 @@ package s2ibinary import ( "context" "fmt" + "time" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -31,9 +33,9 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "time" devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" devopsclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" diff --git a/pkg/controller/s2ibinary/s2ibinary_controller_test.go b/pkg/controller/s2ibinary/s2ibinary_controller_test.go index a94c1b1bf..e49b3859c 100644 --- a/pkg/controller/s2ibinary/s2ibinary_controller_test.go +++ b/pkg/controller/s2ibinary/s2ibinary_controller_test.go @@ -17,11 +17,12 @@ limitations under the License. package s2ibinary import ( - fakes3 "kubesphere.io/kubesphere/pkg/simple/client/s3/fake" "reflect" "testing" "time" + fakes3 "kubesphere.io/kubesphere/pkg/simple/client/s3/fake" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -30,6 +31,7 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" + s2i "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/controller/s2irun/s2irun_controller.go b/pkg/controller/s2irun/s2irun_controller.go index 31ea2f38b..9e540f373 100644 --- a/pkg/controller/s2irun/s2irun_controller.go +++ b/pkg/controller/s2irun/s2irun_controller.go @@ -19,6 +19,8 @@ package s2irun import ( "context" "fmt" + "time" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -32,8 +34,8 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "time" devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" devopsclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" diff --git a/pkg/controller/s2irun/s2irun_controller_test.go b/pkg/controller/s2irun/s2irun_controller_test.go index 680eef0d3..d3a64e8cf 100644 --- a/pkg/controller/s2irun/s2irun_controller_test.go +++ b/pkg/controller/s2irun/s2irun_controller_test.go @@ -29,6 +29,7 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" + s2i "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/controller/serviceaccount/serviceaccount_controller.go b/pkg/controller/serviceaccount/serviceaccount_controller.go index 523cc20f2..0ef7aad72 100644 --- a/pkg/controller/serviceaccount/serviceaccount_controller.go +++ b/pkg/controller/serviceaccount/serviceaccount_controller.go @@ -27,11 +27,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" ) const ( diff --git a/pkg/controller/serviceaccount/serviceaccount_controller_test.go b/pkg/controller/serviceaccount/serviceaccount_controller_test.go index fccdd3762..5ed62f102 100644 --- a/pkg/controller/serviceaccount/serviceaccount_controller_test.go +++ b/pkg/controller/serviceaccount/serviceaccount_controller_test.go @@ -29,11 +29,12 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - "kubesphere.io/kubesphere/pkg/utils/k8sutil" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/utils/k8sutil" ) func TestServiceAccountController(t *testing.T) { diff --git a/pkg/controller/storage/capability/capability_controller.go b/pkg/controller/storage/capability/capability_controller.go index 99c44d0bb..7a944d949 100644 --- a/pkg/controller/storage/capability/capability_controller.go +++ b/pkg/controller/storage/capability/capability_controller.go @@ -21,14 +21,15 @@ package capability import ( "context" "fmt" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/util/version" - "k8s.io/client-go/discovery" "reflect" "strconv" "strings" "time" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/version" + "k8s.io/client-go/discovery" + snapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1" snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/typed/volumesnapshot/v1beta1" snapinformers "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions/volumesnapshot/v1beta1" @@ -48,6 +49,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + capability "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" crdscheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" capabilityclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/storage/v1alpha1" diff --git a/pkg/controller/storage/capability/capability_controller_test.go b/pkg/controller/storage/capability/capability_controller_test.go index 101cc9637..475c7c11e 100644 --- a/pkg/controller/storage/capability/capability_controller_test.go +++ b/pkg/controller/storage/capability/capability_controller_test.go @@ -19,16 +19,21 @@ package capability import ( - "github.com/google/go-cmp/cmp" "math/rand" + "github.com/google/go-cmp/cmp" + //"github.com/google/go-cmp/cmp" + "reflect" + "testing" + "time" + snapbeta1 "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1" snapfake "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" snapinformers "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" storagev1 "k8s.io/api/storage/v1" storagev1beta1 "k8s.io/api/storage/v1beta1" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/diff" @@ -36,12 +41,10 @@ import ( k8sfake "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" + ksv1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" - "reflect" - "testing" - "time" ) var ( diff --git a/pkg/controller/storage/capability/csi_capability.go b/pkg/controller/storage/capability/csi_capability.go index 402ad44a1..625d5bb03 100644 --- a/pkg/controller/storage/capability/csi_capability.go +++ b/pkg/controller/storage/capability/csi_capability.go @@ -20,14 +20,16 @@ package capability import ( "context" "errors" + "net" + "net/url" + "time" + "github.com/container-storage-interface/spec/lib/go/csi" "google.golang.org/grpc" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/keepalive" + "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" - "net" - "net/url" - "time" ) const ( diff --git a/pkg/controller/storage/capability/csi_capability_test.go b/pkg/controller/storage/capability/csi_capability_test.go index 559e4c60f..0636d279a 100644 --- a/pkg/controller/storage/capability/csi_capability_test.go +++ b/pkg/controller/storage/capability/csi_capability_test.go @@ -20,18 +20,20 @@ package capability import ( "context" "fmt" - "github.com/container-storage-interface/spec/lib/go/csi" - "github.com/google/go-cmp/cmp" - "google.golang.org/grpc" - "k8s.io/apimachinery/pkg/util/rand" - "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" "net" "os" "path/filepath" "runtime" "strings" "testing" + + "github.com/container-storage-interface/spec/lib/go/csi" + "github.com/google/go-cmp/cmp" + "google.golang.org/grpc" + "k8s.io/apimachinery/pkg/util/rand" + "k8s.io/klog" + + "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" ) var DefaultControllerRPCType = []csi.ControllerServiceCapability_RPC_Type{ diff --git a/pkg/controller/storage/expansion/expansion_controller.go b/pkg/controller/storage/expansion/expansion_controller.go index 55008fe2b..0db3c05df 100644 --- a/pkg/controller/storage/expansion/expansion_controller.go +++ b/pkg/controller/storage/expansion/expansion_controller.go @@ -22,6 +22,8 @@ import ( "context" "errors" "fmt" + "time" + appsv1 "k8s.io/api/apps/v1" autoscalingv1 "k8s.io/api/autoscaling/v1" corev1 "k8s.io/api/core/v1" @@ -46,7 +48,6 @@ import ( "k8s.io/client-go/util/retry" "k8s.io/client-go/util/workqueue" "k8s.io/klog" - "time" ) const controllerAgentName = "expansion-controller" diff --git a/pkg/controller/storage/expansion/expansion_controller_test.go b/pkg/controller/storage/expansion/expansion_controller_test.go index fd059e9ec..0831db284 100644 --- a/pkg/controller/storage/expansion/expansion_controller_test.go +++ b/pkg/controller/storage/expansion/expansion_controller_test.go @@ -22,8 +22,12 @@ import ( "encoding/json" "flag" "fmt" + "os" + "testing" + "time" + appsv1 "k8s.io/api/apps/v1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -34,9 +38,6 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" clientgotesting "k8s.io/client-go/testing" - "os" - "testing" - "time" ) func TestMain(m *testing.M) { diff --git a/pkg/controller/storage/expansion/expansion_util.go b/pkg/controller/storage/expansion/expansion_util.go index 426a2a717..19de01318 100644 --- a/pkg/controller/storage/expansion/expansion_util.go +++ b/pkg/controller/storage/expansion/expansion_util.go @@ -20,6 +20,7 @@ package expansion import ( "fmt" + corev1 "k8s.io/api/core/v1" "k8s.io/klog" ) diff --git a/pkg/controller/user/user_controller.go b/pkg/controller/user/user_controller.go index a09690b21..dab1af841 100644 --- a/pkg/controller/user/user_controller.go +++ b/pkg/controller/user/user_controller.go @@ -20,10 +20,11 @@ import ( "context" "encoding/json" "fmt" - "kubesphere.io/kubesphere/pkg/controller/utils/controller" "reflect" "time" + "kubesphere.io/kubesphere/pkg/controller/utils/controller" + "golang.org/x/crypto/bcrypt" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -41,6 +42,8 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" @@ -53,7 +56,6 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/devops" ldapclient "kubesphere.io/kubesphere/pkg/simple/client/ldap" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) const ( diff --git a/pkg/controller/user/user_controller_test.go b/pkg/controller/user/user_controller_test.go index 95d7ada3d..54167a61b 100644 --- a/pkg/controller/user/user_controller_test.go +++ b/pkg/controller/user/user_controller_test.go @@ -18,6 +18,10 @@ package user import ( "fmt" + "reflect" + "testing" + "time" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/diff" @@ -26,14 +30,12 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" ldapclient "kubesphere.io/kubesphere/pkg/simple/client/ldap" - "reflect" - "testing" - "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/user/user_webhook.go b/pkg/controller/user/user_webhook.go index 4325ad840..93a8775c4 100644 --- a/pkg/controller/user/user_webhook.go +++ b/pkg/controller/user/user_webhook.go @@ -19,11 +19,13 @@ package user import ( "context" "fmt" - "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "net/http" "net/mail" + "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" ) type EmailValidator struct { diff --git a/pkg/controller/utils/hash.go b/pkg/controller/utils/hash.go index 8aba0fa3d..74ef05dca 100644 --- a/pkg/controller/utils/hash.go +++ b/pkg/controller/utils/hash.go @@ -2,9 +2,10 @@ package utils import ( "fmt" - "github.com/davecgh/go-spew/spew" "hash" "hash/fnv" + + "github.com/davecgh/go-spew/spew" "k8s.io/apimachinery/pkg/util/rand" ) diff --git a/pkg/controller/utils/servicemesh/application.go b/pkg/controller/utils/servicemesh/application.go index 2e3a016d1..d5aa65ce2 100644 --- a/pkg/controller/utils/servicemesh/application.go +++ b/pkg/controller/utils/servicemesh/application.go @@ -1,11 +1,12 @@ package servicemesh import ( + "strings" + apiv1alpha3 "istio.io/api/networking/v1alpha3" "istio.io/client-go/pkg/apis/networking/v1alpha3" corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1" - "strings" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( diff --git a/pkg/controller/virtualservice/virtualservice_controller.go b/pkg/controller/virtualservice/virtualservice_controller.go index ca0fde49a..0a4489086 100644 --- a/pkg/controller/virtualservice/virtualservice_controller.go +++ b/pkg/controller/virtualservice/virtualservice_controller.go @@ -19,6 +19,8 @@ package virtualservice import ( "context" "fmt" + "reflect" + apinetworkingv1alpha3 "istio.io/api/networking/v1alpha3" clientgonetworkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3" istioclient "istio.io/client-go/pkg/clientset/versioned" @@ -41,12 +43,12 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" log "k8s.io/klog" + servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" servicemeshclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" servicemeshinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/servicemesh/v1alpha2" servicemeshlisters "kubesphere.io/kubesphere/pkg/client/listers/servicemesh/v1alpha2" "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" - "reflect" "time" ) diff --git a/pkg/controller/virtualservice/virtualservice_controller_test.go b/pkg/controller/virtualservice/virtualservice_controller_test.go index 8616a892c..2385cb4d4 100644 --- a/pkg/controller/virtualservice/virtualservice_controller_test.go +++ b/pkg/controller/virtualservice/virtualservice_controller_test.go @@ -19,6 +19,8 @@ package virtualservice import ( "context" "fmt" + "testing" + apiv1alpha3 "istio.io/api/networking/v1alpha3" "istio.io/client-go/pkg/apis/networking/v1alpha3" istiofake "istio.io/client-go/pkg/clientset/versioned/fake" @@ -31,12 +33,12 @@ import ( kubefake "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" + "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" "kubesphere.io/kubesphere/pkg/utils/reflectutils" - "testing" ) var ( diff --git a/pkg/controller/workspace/metrics.go b/pkg/controller/workspace/metrics.go index b3e5c0a63..3c2ac5ddc 100644 --- a/pkg/controller/workspace/metrics.go +++ b/pkg/controller/workspace/metrics.go @@ -2,6 +2,7 @@ package workspace import ( compbasemetrics "k8s.io/component-base/metrics" + "kubesphere.io/kubesphere/pkg/utils/metrics" ) diff --git a/pkg/controller/workspace/workspace_controller.go b/pkg/controller/workspace/workspace_controller.go index e800267f0..2b5bad3b2 100644 --- a/pkg/controller/workspace/workspace_controller.go +++ b/pkg/controller/workspace/workspace_controller.go @@ -18,20 +18,22 @@ package workspace import ( "context" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/constants" controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/k8sutil" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) const ( diff --git a/pkg/controller/workspace/workspace_controller_suite_test.go b/pkg/controller/workspace/workspace_controller_suite_test.go index 987adc709..c671aecf6 100644 --- a/pkg/controller/workspace/workspace_controller_suite_test.go +++ b/pkg/controller/workspace/workspace_controller_suite_test.go @@ -17,17 +17,19 @@ limitations under the License. package workspace import ( + "os" + "path/filepath" + "testing" + "time" + "github.com/onsi/gomega/gexec" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog/klogr" - "kubesphere.io/kubesphere/pkg/apis" - "os" - "path/filepath" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - "testing" - "time" + + "kubesphere.io/kubesphere/pkg/apis" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/controller/workspace/workspace_controller_test.go b/pkg/controller/workspace/workspace_controller_test.go index 9f7326c11..def41e2cf 100644 --- a/pkg/controller/workspace/workspace_controller_test.go +++ b/pkg/controller/workspace/workspace_controller_test.go @@ -18,12 +18,14 @@ package workspace import ( "context" + "time" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - "time" ) var _ = Describe("Workspace", func() { diff --git a/pkg/controller/workspacerole/workspacerole_controller.go b/pkg/controller/workspacerole/workspacerole_controller.go index d4f329831..bccedab5f 100644 --- a/pkg/controller/workspacerole/workspacerole_controller.go +++ b/pkg/controller/workspacerole/workspacerole_controller.go @@ -18,6 +18,8 @@ package workspacerole import ( "context" + "reflect" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -26,17 +28,17 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/constants" controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/k8sutil" - "reflect" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) const ( diff --git a/pkg/controller/workspacerole/workspacerole_controller_suite_test.go b/pkg/controller/workspacerole/workspacerole_controller_suite_test.go index 44851ca53..08b6174b2 100644 --- a/pkg/controller/workspacerole/workspacerole_controller_suite_test.go +++ b/pkg/controller/workspacerole/workspacerole_controller_suite_test.go @@ -17,17 +17,19 @@ limitations under the License. package workspacerole import ( + "os" + "path/filepath" + "testing" + "time" + "github.com/onsi/gomega/gexec" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog/klogr" - "kubesphere.io/kubesphere/pkg/apis" - "os" - "path/filepath" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - "testing" - "time" + + "kubesphere.io/kubesphere/pkg/apis" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/controller/workspacerole/workspacerole_controller_test.go b/pkg/controller/workspacerole/workspacerole_controller_test.go index 73ea3438b..ff2653008 100644 --- a/pkg/controller/workspacerole/workspacerole_controller_test.go +++ b/pkg/controller/workspacerole/workspacerole_controller_test.go @@ -19,15 +19,17 @@ package workspacerole import ( "context" "fmt" + "time" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - "time" ) var _ = Describe("WorkspaceRole", func() { diff --git a/pkg/controller/workspacerolebinding/workspacerolebinding_controller.go b/pkg/controller/workspacerolebinding/workspacerolebinding_controller.go index 555c67e37..5c072ce8d 100644 --- a/pkg/controller/workspacerolebinding/workspacerolebinding_controller.go +++ b/pkg/controller/workspacerolebinding/workspacerolebinding_controller.go @@ -18,6 +18,8 @@ package workspacerolebinding import ( "context" + "reflect" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -26,17 +28,17 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/constants" controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/k8sutil" - "reflect" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) const ( diff --git a/pkg/controller/workspacerolebinding/workspacerolebinding_controller_suite_test.go b/pkg/controller/workspacerolebinding/workspacerolebinding_controller_suite_test.go index da6517988..41a10e2f5 100644 --- a/pkg/controller/workspacerolebinding/workspacerolebinding_controller_suite_test.go +++ b/pkg/controller/workspacerolebinding/workspacerolebinding_controller_suite_test.go @@ -17,17 +17,19 @@ limitations under the License. package workspacerolebinding import ( + "os" + "path/filepath" + "testing" + "time" + "github.com/onsi/gomega/gexec" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog/klogr" - "kubesphere.io/kubesphere/pkg/apis" - "os" - "path/filepath" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - "testing" - "time" + + "kubesphere.io/kubesphere/pkg/apis" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go b/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go index 20338a66c..687ab0f44 100644 --- a/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go +++ b/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go @@ -19,15 +19,17 @@ package workspacerolebinding import ( "context" "fmt" + "time" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - "time" ) var _ = Describe("WorkspaceRoleBinding", func() { diff --git a/pkg/controller/workspacetemplate/workspacetemplate_controller.go b/pkg/controller/workspacetemplate/workspacetemplate_controller.go index 2d5a38a49..d7194d779 100644 --- a/pkg/controller/workspacetemplate/workspacetemplate_controller.go +++ b/pkg/controller/workspacetemplate/workspacetemplate_controller.go @@ -20,6 +20,8 @@ import ( "bytes" "context" "fmt" + "reflect" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" @@ -30,6 +32,11 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" @@ -38,11 +45,6 @@ import ( "kubesphere.io/kubesphere/pkg/constants" controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "reflect" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) const ( diff --git a/pkg/controller/workspacetemplate/workspacetemplate_controller_suite_test.go b/pkg/controller/workspacetemplate/workspacetemplate_controller_suite_test.go index a1f69224f..4a79c7196 100644 --- a/pkg/controller/workspacetemplate/workspacetemplate_controller_suite_test.go +++ b/pkg/controller/workspacetemplate/workspacetemplate_controller_suite_test.go @@ -17,19 +17,21 @@ limitations under the License. package workspacetemplate import ( + "os" + "path/filepath" + "testing" + "time" + "github.com/onsi/gomega/gexec" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog/klogr" - "kubesphere.io/kubesphere/pkg/apis" - helmappscheme "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - "os" - "path/filepath" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - "testing" - "time" + + "kubesphere.io/kubesphere/pkg/apis" + helmappscheme "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go b/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go index d93838b78..481f927bf 100644 --- a/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go +++ b/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go @@ -18,17 +18,19 @@ package workspacetemplate import ( "context" + "time" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - "sigs.k8s.io/controller-runtime/pkg/client" - "time" ) var _ = Describe("WorkspaceTemplate", func() { diff --git a/pkg/informers/informers.go b/pkg/informers/informers.go index c9b6df4b3..c7b08c180 100644 --- a/pkg/informers/informers.go +++ b/pkg/informers/informers.go @@ -17,6 +17,8 @@ limitations under the License. package informers import ( + "time" + snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned" snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" prominformers "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions" @@ -27,9 +29,9 @@ import ( apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions" k8sinformers "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" - "time" ) // default re-sync period for all informer factories diff --git a/pkg/informers/null_informers.go b/pkg/informers/null_informers.go index 08f8f424b..84b89409f 100644 --- a/pkg/informers/null_informers.go +++ b/pkg/informers/null_informers.go @@ -26,6 +26,7 @@ import ( apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" ) diff --git a/pkg/kapis/alerting/v1/register.go b/pkg/kapis/alerting/v1/register.go index 99182259e..2118d332c 100644 --- a/pkg/kapis/alerting/v1/register.go +++ b/pkg/kapis/alerting/v1/register.go @@ -19,6 +19,7 @@ package v1 import ( "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" + "kubesphere.io/kubesphere/pkg/kapis/generic" ) diff --git a/pkg/kapis/alerting/v2alpha1/handler.go b/pkg/kapis/alerting/v2alpha1/handler.go index ab95c1d90..020f77a3c 100644 --- a/pkg/kapis/alerting/v2alpha1/handler.go +++ b/pkg/kapis/alerting/v2alpha1/handler.go @@ -20,6 +20,7 @@ import ( "github.com/emicklei/go-restful" promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" "k8s.io/klog" + ksapi "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/api/alerting/v2alpha1" "kubesphere.io/kubesphere/pkg/informers" diff --git a/pkg/kapis/alerting/v2alpha1/register.go b/pkg/kapis/alerting/v2alpha1/register.go index 3960c5901..a53286976 100644 --- a/pkg/kapis/alerting/v2alpha1/register.go +++ b/pkg/kapis/alerting/v2alpha1/register.go @@ -23,6 +23,7 @@ import ( restfulspec "github.com/emicklei/go-restful-openapi" promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" "k8s.io/apimachinery/pkg/runtime/schema" + ksapi "kubesphere.io/kubesphere/pkg/api" alertingv2alpha1 "kubesphere.io/kubesphere/pkg/api/alerting/v2alpha1" "kubesphere.io/kubesphere/pkg/apiserver/runtime" diff --git a/pkg/kapis/config/v1alpha2/register.go b/pkg/kapis/config/v1alpha2/register.go index b0785d9df..f941beeae 100644 --- a/pkg/kapis/config/v1alpha2/register.go +++ b/pkg/kapis/config/v1alpha2/register.go @@ -19,6 +19,7 @@ package v1alpha2 import ( "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" + kubesphereconfig "kubesphere.io/kubesphere/pkg/apiserver/config" "kubesphere.io/kubesphere/pkg/apiserver/runtime" ) diff --git a/pkg/kapis/devops/v1alpha2/devops.go b/pkg/kapis/devops/v1alpha2/devops.go index 4e8bb15b3..02d59e76d 100644 --- a/pkg/kapis/devops/v1alpha2/devops.go +++ b/pkg/kapis/devops/v1alpha2/devops.go @@ -27,6 +27,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" log "k8s.io/klog" "k8s.io/klog/v2" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" diff --git a/pkg/kapis/devops/v1alpha2/pipeline_sonar.go b/pkg/kapis/devops/v1alpha2/pipeline_sonar.go index 68eea4dd6..648d43ee9 100644 --- a/pkg/kapis/devops/v1alpha2/pipeline_sonar.go +++ b/pkg/kapis/devops/v1alpha2/pipeline_sonar.go @@ -19,6 +19,7 @@ package v1alpha2 import ( "github.com/emicklei/go-restful" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" ) diff --git a/pkg/kapis/devops/v1alpha2/register.go b/pkg/kapis/devops/v1alpha2/register.go index 545f66676..91f280a58 100644 --- a/pkg/kapis/devops/v1alpha2/register.go +++ b/pkg/kapis/devops/v1alpha2/register.go @@ -19,11 +19,15 @@ package v1alpha2 import ( "context" "fmt" + "net/url" + "strings" + "github.com/emicklei/go-restful" - "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/proxy" "k8s.io/klog" + devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/runtime" @@ -33,11 +37,10 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins" "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/simple/client/sonarqube" - "net/url" - "strings" + + "net/http" "kubesphere.io/kubesphere/pkg/simple/client/devops" - "net/http" ) const ( diff --git a/pkg/kapis/devops/v1alpha2/s2ibinary.go b/pkg/kapis/devops/v1alpha2/s2ibinary.go index ac1017e9c..ac2aff78e 100644 --- a/pkg/kapis/devops/v1alpha2/s2ibinary.go +++ b/pkg/kapis/devops/v1alpha2/s2ibinary.go @@ -17,14 +17,16 @@ limitations under the License. package v1alpha2 import ( - "code.cloudfoundry.org/bytefmt" "fmt" + "net/http" + + "code.cloudfoundry.org/bytefmt" "github.com/emicklei/go-restful" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/models/devops" "kubesphere.io/kubesphere/pkg/utils/hashutil" - "net/http" ) type S2iBinaryHandler struct { diff --git a/pkg/kapis/devops/v1alpha3/handler.go b/pkg/kapis/devops/v1alpha3/handler.go index 10af9fb3f..783ed2e33 100644 --- a/pkg/kapis/devops/v1alpha3/handler.go +++ b/pkg/kapis/devops/v1alpha3/handler.go @@ -23,6 +23,7 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/kapis/devops/v1alpha3/register.go b/pkg/kapis/devops/v1alpha3/register.go index 085eca8af..15c63bccf 100644 --- a/pkg/kapis/devops/v1alpha3/register.go +++ b/pkg/kapis/devops/v1alpha3/register.go @@ -19,12 +19,15 @@ package v1alpha3 import ( + "net/http" + "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/apiserver/query" @@ -34,7 +37,6 @@ import ( "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/server/params" devopsClient "kubesphere.io/kubesphere/pkg/simple/client/devops" - "net/http" ) const ( diff --git a/pkg/kapis/generic/generic.go b/pkg/kapis/generic/generic.go index 7a5a281a6..41a67e472 100644 --- a/pkg/kapis/generic/generic.go +++ b/pkg/kapis/generic/generic.go @@ -18,15 +18,17 @@ package generic import ( "fmt" + "net/http" + "net/url" + "strings" + "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/proxy" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/runtime" - "net/http" - "net/url" - "strings" ) // genericProxy is a simple proxy for external service. diff --git a/pkg/kapis/generic/generic_test.go b/pkg/kapis/generic/generic_test.go index 79f4a7215..fb6b1d8c5 100644 --- a/pkg/kapis/generic/generic_test.go +++ b/pkg/kapis/generic/generic_test.go @@ -17,11 +17,12 @@ limitations under the License. package generic import ( - "github.com/emicklei/go-restful" - "github.com/google/go-cmp/cmp" "net/http/httptest" "net/url" "testing" + + "github.com/emicklei/go-restful" + "github.com/google/go-cmp/cmp" ) var group = "test.kubesphere.io" diff --git a/pkg/kapis/iam/v1alpha2/handler.go b/pkg/kapis/iam/v1alpha2/handler.go index 3aa9691e6..24ddb7260 100644 --- a/pkg/kapis/iam/v1alpha2/handler.go +++ b/pkg/kapis/iam/v1alpha2/handler.go @@ -21,6 +21,7 @@ import ( "strings" authuser "k8s.io/apiserver/pkg/authentication/user" + "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/models/auth" @@ -28,6 +29,7 @@ import ( rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" diff --git a/pkg/kapis/iam/v1alpha2/register.go b/pkg/kapis/iam/v1alpha2/register.go index 7399c6da4..fc85db188 100644 --- a/pkg/kapis/iam/v1alpha2/register.go +++ b/pkg/kapis/iam/v1alpha2/register.go @@ -26,6 +26,7 @@ import ( rbacv1 "k8s.io/api/rbac/v1" v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime/schema" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/runtime" diff --git a/pkg/kapis/kubeedge/v1alpha1/register.go b/pkg/kapis/kubeedge/v1alpha1/register.go index 631f27c2c..781afc7c3 100644 --- a/pkg/kapis/kubeedge/v1alpha1/register.go +++ b/pkg/kapis/kubeedge/v1alpha1/register.go @@ -19,6 +19,7 @@ package v1 import ( "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" + "kubesphere.io/kubesphere/pkg/kapis/generic" ) diff --git a/pkg/kapis/metering/v1alpha1/handler.go b/pkg/kapis/metering/v1alpha1/handler.go index f19bf17c8..b1e5204bf 100644 --- a/pkg/kapis/metering/v1alpha1/handler.go +++ b/pkg/kapis/metering/v1alpha1/handler.go @@ -21,6 +21,7 @@ package v1alpha1 import ( "github.com/emicklei/go-restful" "k8s.io/client-go/kubernetes" + "kubesphere.io/kubesphere/pkg/informers" monitorhle "kubesphere.io/kubesphere/pkg/kapis/monitoring/v1alpha3" resourcev1alpha3 "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/resource" diff --git a/pkg/kapis/metering/v1alpha1/register.go b/pkg/kapis/metering/v1alpha1/register.go index 4cf4a0b81..7d6e5ab88 100644 --- a/pkg/kapis/metering/v1alpha1/register.go +++ b/pkg/kapis/metering/v1alpha1/register.go @@ -21,9 +21,11 @@ import ( "net/http" "github.com/emicklei/go-restful" - "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" + "sigs.k8s.io/controller-runtime/pkg/cache" + "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/informers" @@ -31,7 +33,6 @@ import ( model "kubesphere.io/kubesphere/pkg/models/monitoring" resourcev1alpha3 "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/resource" "kubesphere.io/kubesphere/pkg/simple/client/monitoring" - "sigs.k8s.io/controller-runtime/pkg/cache" ) const ( diff --git a/pkg/kapis/monitoring/v1alpha3/handler.go b/pkg/kapis/monitoring/v1alpha3/handler.go index ab098e27f..fcd83d1f3 100644 --- a/pkg/kapis/monitoring/v1alpha3/handler.go +++ b/pkg/kapis/monitoring/v1alpha3/handler.go @@ -25,6 +25,7 @@ import ( "github.com/emicklei/go-restful" "k8s.io/client-go/kubernetes" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/informers" model "kubesphere.io/kubesphere/pkg/models/monitoring" diff --git a/pkg/kapis/monitoring/v1alpha3/helper.go b/pkg/kapis/monitoring/v1alpha3/helper.go index eb1d08a4e..b541fa542 100644 --- a/pkg/kapis/monitoring/v1alpha3/helper.go +++ b/pkg/kapis/monitoring/v1alpha3/helper.go @@ -20,15 +20,17 @@ import ( "bytes" "context" "fmt" - "github.com/jszwec/csvutil" "io" "strconv" "strings" "time" + "github.com/jszwec/csvutil" + "github.com/emicklei/go-restful" "github.com/pkg/errors" corev1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" model "kubesphere.io/kubesphere/pkg/models/monitoring" "kubesphere.io/kubesphere/pkg/simple/client/monitoring" diff --git a/pkg/kapis/monitoring/v1alpha3/helper_test.go b/pkg/kapis/monitoring/v1alpha3/helper_test.go index 317099464..514ee886b 100644 --- a/pkg/kapis/monitoring/v1alpha3/helper_test.go +++ b/pkg/kapis/monitoring/v1alpha3/helper_test.go @@ -25,6 +25,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/informers" model "kubesphere.io/kubesphere/pkg/models/monitoring" "kubesphere.io/kubesphere/pkg/simple/client/monitoring" diff --git a/pkg/kapis/monitoring/v1alpha3/meter.go b/pkg/kapis/monitoring/v1alpha3/meter.go index 5c837d2b1..22bf4a7b6 100644 --- a/pkg/kapis/monitoring/v1alpha3/meter.go +++ b/pkg/kapis/monitoring/v1alpha3/meter.go @@ -6,6 +6,7 @@ import ( "github.com/emicklei/go-restful" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" model "kubesphere.io/kubesphere/pkg/models/monitoring" "kubesphere.io/kubesphere/pkg/simple/client/monitoring" diff --git a/pkg/kapis/monitoring/v1alpha3/register.go b/pkg/kapis/monitoring/v1alpha3/register.go index 41e2aed4a..507b78e5f 100644 --- a/pkg/kapis/monitoring/v1alpha3/register.go +++ b/pkg/kapis/monitoring/v1alpha3/register.go @@ -21,9 +21,10 @@ import ( "net/http" "github.com/emicklei/go-restful" - "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" + "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/informers" diff --git a/pkg/kapis/network/v1alpha2/register.go b/pkg/kapis/network/v1alpha2/register.go index 300480308..8a8c38f32 100644 --- a/pkg/kapis/network/v1alpha2/register.go +++ b/pkg/kapis/network/v1alpha2/register.go @@ -22,6 +22,7 @@ import ( restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" + "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/constants" ) diff --git a/pkg/kapis/notification/v1/register.go b/pkg/kapis/notification/v1/register.go index efe09aee9..10b60af08 100644 --- a/pkg/kapis/notification/v1/register.go +++ b/pkg/kapis/notification/v1/register.go @@ -19,6 +19,7 @@ package v1 import ( "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" + "kubesphere.io/kubesphere/pkg/kapis/generic" ) diff --git a/pkg/kapis/notification/v2beta1/handler.go b/pkg/kapis/notification/v2beta1/handler.go index 39ed02e5a..eeec19dad 100644 --- a/pkg/kapis/notification/v2beta1/handler.go +++ b/pkg/kapis/notification/v2beta1/handler.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/kubernetes" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" diff --git a/pkg/kapis/notification/v2beta1/register.go b/pkg/kapis/notification/v2beta1/register.go index a9d4a65a2..3e8f9ad01 100644 --- a/pkg/kapis/notification/v2beta1/register.go +++ b/pkg/kapis/notification/v2beta1/register.go @@ -19,10 +19,13 @@ package v2beta1 import ( + "net/http" + "github.com/emicklei/go-restful" openapi "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/apiserver/runtime" @@ -30,7 +33,6 @@ import ( "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/server/errors" - "net/http" ) const ( diff --git a/pkg/kapis/oauth/handler.go b/pkg/kapis/oauth/handler.go index 27b5e62f0..3eb855387 100644 --- a/pkg/kapis/oauth/handler.go +++ b/pkg/kapis/oauth/handler.go @@ -18,11 +18,14 @@ package oauth import ( "fmt" + "net/http" + "github.com/emicklei/go-restful" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" @@ -30,7 +33,6 @@ import ( "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/models/auth" "kubesphere.io/kubesphere/pkg/models/iam/im" - "net/http" ) const ( diff --git a/pkg/kapis/oauth/register.go b/pkg/kapis/oauth/register.go index 5447895f3..0e0db0599 100644 --- a/pkg/kapis/oauth/register.go +++ b/pkg/kapis/oauth/register.go @@ -17,15 +17,17 @@ limitations under the License. package oauth import ( + "net/http" + "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/models/auth" "kubesphere.io/kubesphere/pkg/models/iam/im" - "net/http" ) // ks-apiserver includes a built-in OAuth server. Users obtain OAuth access tokens to authenticate themselves to the API. diff --git a/pkg/kapis/openpitrix/v1/handler.go b/pkg/kapis/openpitrix/v1/handler.go index 54be36327..12dd46115 100644 --- a/pkg/kapis/openpitrix/v1/handler.go +++ b/pkg/kapis/openpitrix/v1/handler.go @@ -16,13 +16,18 @@ package v1 import ( "encoding/json" "fmt" + "io/ioutil" + "net/url" + "strconv" + "strings" + "github.com/emicklei/go-restful" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "io/ioutil" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/request" @@ -36,9 +41,6 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/utils/idutils" "kubesphere.io/kubesphere/pkg/utils/stringutils" - "net/url" - "strconv" - "strings" ) type openpitrixHandler struct { diff --git a/pkg/kapis/openpitrix/v1/register.go b/pkg/kapis/openpitrix/v1/register.go index 80ddc5e9e..4c23981ca 100644 --- a/pkg/kapis/openpitrix/v1/register.go +++ b/pkg/kapis/openpitrix/v1/register.go @@ -14,9 +14,12 @@ limitations under the License. package v1 import ( + "net/http" + "github.com/emicklei/go-restful" - "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/client/clientset/versioned" @@ -27,7 +30,6 @@ import ( "kubesphere.io/kubesphere/pkg/server/errors" "kubesphere.io/kubesphere/pkg/server/params" openpitrixoptions "kubesphere.io/kubesphere/pkg/simple/client/openpitrix" - "net/http" ) const ( diff --git a/pkg/kapis/openpitrix/v2alpha1/handler.go b/pkg/kapis/openpitrix/v2alpha1/handler.go index 707632377..19535fbe5 100644 --- a/pkg/kapis/openpitrix/v2alpha1/handler.go +++ b/pkg/kapis/openpitrix/v2alpha1/handler.go @@ -17,6 +17,7 @@ import ( "github.com/emicklei/go-restful" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned" diff --git a/pkg/kapis/openpitrix/v2alpha1/register.go b/pkg/kapis/openpitrix/v2alpha1/register.go index 0617962e5..e392b0501 100644 --- a/pkg/kapis/openpitrix/v2alpha1/register.go +++ b/pkg/kapis/openpitrix/v2alpha1/register.go @@ -14,9 +14,12 @@ limitations under the License. package v2alpha1 import ( + "net/http" + "github.com/emicklei/go-restful" - "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" @@ -27,7 +30,6 @@ import ( "kubesphere.io/kubesphere/pkg/models/openpitrix" "kubesphere.io/kubesphere/pkg/server/params" openpitrixoptions "kubesphere.io/kubesphere/pkg/simple/client/openpitrix" - "net/http" ) const ( diff --git a/pkg/kapis/operations/v1alpha2/handler.go b/pkg/kapis/operations/v1alpha2/handler.go index cdf8674ae..18c59389c 100644 --- a/pkg/kapis/operations/v1alpha2/handler.go +++ b/pkg/kapis/operations/v1alpha2/handler.go @@ -18,12 +18,14 @@ package v1alpha2 import ( "fmt" + "net/http" + "github.com/emicklei/go-restful" k8serr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/kubernetes" + "kubesphere.io/kubesphere/pkg/models/workloads" "kubesphere.io/kubesphere/pkg/server/errors" - "net/http" ) type operationHandler struct { diff --git a/pkg/kapis/operations/v1alpha2/register.go b/pkg/kapis/operations/v1alpha2/register.go index 321484f57..104dd0e0a 100644 --- a/pkg/kapis/operations/v1alpha2/register.go +++ b/pkg/kapis/operations/v1alpha2/register.go @@ -17,13 +17,15 @@ limitations under the License. package v1alpha2 import ( + "net/http" + "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/server/errors" - "net/http" ) const ( diff --git a/pkg/kapis/resources/v1alpha2/handler.go b/pkg/kapis/resources/v1alpha2/handler.go index 6f93dc5f1..0840c5150 100644 --- a/pkg/kapis/resources/v1alpha2/handler.go +++ b/pkg/kapis/resources/v1alpha2/handler.go @@ -27,6 +27,7 @@ import ( k8serr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/kubernetes" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/models/components" diff --git a/pkg/kapis/resources/v1alpha2/register.go b/pkg/kapis/resources/v1alpha2/register.go index 03418ee5b..53ab1af00 100644 --- a/pkg/kapis/resources/v1alpha2/register.go +++ b/pkg/kapis/resources/v1alpha2/register.go @@ -25,6 +25,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/api/resource/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/runtime" diff --git a/pkg/kapis/resources/v1alpha3/handler.go b/pkg/kapis/resources/v1alpha3/handler.go index 2c4633b4d..4f7e63d40 100644 --- a/pkg/kapis/resources/v1alpha3/handler.go +++ b/pkg/kapis/resources/v1alpha3/handler.go @@ -17,8 +17,11 @@ limitations under the License. package v1alpha3 import ( + "strings" + "github.com/emicklei/go-restful" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/components" @@ -26,7 +29,6 @@ import ( resourcev1alpha2 "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2/resource" resourcev1alpha3 "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/resource" "kubesphere.io/kubesphere/pkg/server/params" - "strings" ) type Handler struct { diff --git a/pkg/kapis/resources/v1alpha3/handler_test.go b/pkg/kapis/resources/v1alpha3/handler_test.go index be59b1bca..f2dcf44ae 100644 --- a/pkg/kapis/resources/v1alpha3/handler_test.go +++ b/pkg/kapis/resources/v1alpha3/handler_test.go @@ -17,6 +17,8 @@ limitations under the License. package v1alpha3 import ( + "testing" + "github.com/google/go-cmp/cmp" fakesnapshot "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" fakeistio "istio.io/client-go/pkg/clientset/versioned/fake" @@ -25,6 +27,7 @@ import ( fakeapiextensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakek8s "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" @@ -33,7 +36,6 @@ import ( resourcev1alpha2 "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2/resource" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/resource" resourcev1alpha3 "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/resource" - "testing" ) func TestResourceV1alpha2Fallback(t *testing.T) { diff --git a/pkg/kapis/resources/v1alpha3/register.go b/pkg/kapis/resources/v1alpha3/register.go index 157d5922f..933d0aca4 100644 --- a/pkg/kapis/resources/v1alpha3/register.go +++ b/pkg/kapis/resources/v1alpha3/register.go @@ -18,8 +18,10 @@ package v1alpha3 import ( "github.com/emicklei/go-restful" - "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/cache" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/api/resource/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" @@ -28,7 +30,6 @@ import ( "kubesphere.io/kubesphere/pkg/models/components" resourcev1alpha2 "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2/resource" resourcev1alpha3 "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/resource" - "sigs.k8s.io/controller-runtime/pkg/cache" "net/http" ) diff --git a/pkg/kapis/servicemesh/metrics/install/install.go b/pkg/kapis/servicemesh/metrics/install/install.go index 9592c7662..e17c6f179 100644 --- a/pkg/kapis/servicemesh/metrics/install/install.go +++ b/pkg/kapis/servicemesh/metrics/install/install.go @@ -19,6 +19,7 @@ package install import ( "github.com/emicklei/go-restful" urlruntime "k8s.io/apimachinery/pkg/util/runtime" + "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/kapis/servicemesh/metrics/v1alpha2" ) diff --git a/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go b/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go index a41a237eb..fb1142d35 100644 --- a/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go +++ b/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go @@ -18,11 +18,13 @@ package v1alpha2 import ( "fmt" - "github.com/emicklei/go-restful" "io/ioutil" - "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/api" "net/http" + + "github.com/emicklei/go-restful" + "k8s.io/klog" + + "kubesphere.io/kubesphere/pkg/api" ) // default jaeger query api endpoint address diff --git a/pkg/kapis/servicemesh/metrics/v1alpha2/register.go b/pkg/kapis/servicemesh/metrics/v1alpha2/register.go index 185c2bb54..211bee4ce 100644 --- a/pkg/kapis/servicemesh/metrics/v1alpha2/register.go +++ b/pkg/kapis/servicemesh/metrics/v1alpha2/register.go @@ -17,11 +17,13 @@ limitations under the License. package v1alpha2 import ( - "github.com/emicklei/go-restful" - "github.com/emicklei/go-restful-openapi" - "k8s.io/apimachinery/pkg/runtime/schema" - "kubesphere.io/kubesphere/pkg/apiserver/runtime" "net/http" + + "github.com/emicklei/go-restful" + restfulspec "github.com/emicklei/go-restful-openapi" + "k8s.io/apimachinery/pkg/runtime/schema" + + "kubesphere.io/kubesphere/pkg/apiserver/runtime" ) const groupName = "servicemesh.kubesphere.io" diff --git a/pkg/kapis/tenant/v1alpha2/handler.go b/pkg/kapis/tenant/v1alpha2/handler.go index 542a4ea2e..219d09f97 100644 --- a/pkg/kapis/tenant/v1alpha2/handler.go +++ b/pkg/kapis/tenant/v1alpha2/handler.go @@ -26,6 +26,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/client-go/kubernetes" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" auditingv1alpha1 "kubesphere.io/kubesphere/pkg/api/auditing/v1alpha1" eventsv1alpha1 "kubesphere.io/kubesphere/pkg/api/events/v1alpha1" diff --git a/pkg/kapis/tenant/v1alpha2/metering.go b/pkg/kapis/tenant/v1alpha2/metering.go index c68d92a82..5f1fef10b 100644 --- a/pkg/kapis/tenant/v1alpha2/metering.go +++ b/pkg/kapis/tenant/v1alpha2/metering.go @@ -5,6 +5,7 @@ import ( "github.com/emicklei/go-restful" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" meteringv1alpha1 "kubesphere.io/kubesphere/pkg/api/metering/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/request" diff --git a/pkg/kapis/tenant/v1alpha2/register.go b/pkg/kapis/tenant/v1alpha2/register.go index 70427e90b..233f20214 100644 --- a/pkg/kapis/tenant/v1alpha2/register.go +++ b/pkg/kapis/tenant/v1alpha2/register.go @@ -19,14 +19,16 @@ package v1alpha2 import ( "net/http" - "kubesphere.io/kubesphere/pkg/models/metering" "sigs.k8s.io/controller-runtime/pkg/cache" + "kubesphere.io/kubesphere/pkg/models/metering" + "github.com/emicklei/go-restful" - "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" + "kubesphere.io/kubesphere/pkg/api" auditingv1alpha1 "kubesphere.io/kubesphere/pkg/api/auditing/v1alpha1" eventsv1alpha1 "kubesphere.io/kubesphere/pkg/api/events/v1alpha1" diff --git a/pkg/kapis/terminal/v1alpha2/handler.go b/pkg/kapis/terminal/v1alpha2/handler.go index 5b671d390..ac500b242 100644 --- a/pkg/kapis/terminal/v1alpha2/handler.go +++ b/pkg/kapis/terminal/v1alpha2/handler.go @@ -17,13 +17,15 @@ limitations under the License. package v1alpha2 import ( + "net/http" + "github.com/emicklei/go-restful" "github.com/gorilla/websocket" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/models/terminal" - "net/http" ) var upgrader = websocket.Upgrader{ diff --git a/pkg/kapis/terminal/v1alpha2/register.go b/pkg/kapis/terminal/v1alpha2/register.go index 2fca256b9..00138812b 100644 --- a/pkg/kapis/terminal/v1alpha2/register.go +++ b/pkg/kapis/terminal/v1alpha2/register.go @@ -18,10 +18,11 @@ package v1alpha2 import ( "github.com/emicklei/go-restful" - "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/models" diff --git a/pkg/kapis/version/register.go b/pkg/kapis/version/register.go index 74c28c67f..456c85300 100644 --- a/pkg/kapis/version/register.go +++ b/pkg/kapis/version/register.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/version" ) diff --git a/pkg/models/alerting/alerting.go b/pkg/models/alerting/alerting.go index c59fc14a3..9f8f0ace9 100644 --- a/pkg/models/alerting/alerting.go +++ b/pkg/models/alerting/alerting.go @@ -14,6 +14,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/intstr" coreinformersv1 "k8s.io/client-go/informers/core/v1" + "kubesphere.io/kubesphere/pkg/api/alerting/v2alpha1" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/informers" diff --git a/pkg/models/alerting/rules/cache.go b/pkg/models/alerting/rules/cache.go index 5284e4d07..3728c66f5 100644 --- a/pkg/models/alerting/rules/cache.go +++ b/pkg/models/alerting/rules/cache.go @@ -9,6 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + "kubesphere.io/kubesphere/pkg/api/alerting/v2alpha1" "kubesphere.io/kubesphere/pkg/server/errors" ) diff --git a/pkg/models/alerting/rules/rule.go b/pkg/models/alerting/rules/rule.go index 2faade7fe..f8b405788 100644 --- a/pkg/models/alerting/rules/rule.go +++ b/pkg/models/alerting/rules/rule.go @@ -2,6 +2,7 @@ package rules import ( promresourcesv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "kubesphere.io/kubesphere/pkg/api/alerting/v2alpha1" ) diff --git a/pkg/models/alerting/rules/ruler.go b/pkg/models/alerting/rules/ruler.go index c73f48667..12766e42b 100644 --- a/pkg/models/alerting/rules/ruler.go +++ b/pkg/models/alerting/rules/ruler.go @@ -19,6 +19,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/util/retry" + "kubesphere.io/kubesphere/pkg/api/alerting/v2alpha1" ) diff --git a/pkg/models/alerting/rules/utils.go b/pkg/models/alerting/rules/utils.go index d4995bae0..c243c4ba2 100644 --- a/pkg/models/alerting/rules/utils.go +++ b/pkg/models/alerting/rules/utils.go @@ -14,6 +14,7 @@ import ( "github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/rules" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api/alerting/v2alpha1" "kubesphere.io/kubesphere/pkg/simple/client/alerting" ) diff --git a/pkg/models/alerting/rules/utils_test.go b/pkg/models/alerting/rules/utils_test.go index 6d0643eda..4de9fc2a9 100644 --- a/pkg/models/alerting/rules/utils_test.go +++ b/pkg/models/alerting/rules/utils_test.go @@ -7,6 +7,7 @@ import ( promresourcesv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/prometheus/prometheus/rules" "k8s.io/apimachinery/pkg/util/intstr" + "kubesphere.io/kubesphere/pkg/api/alerting/v2alpha1" "kubesphere.io/kubesphere/pkg/simple/client/alerting" ) diff --git a/pkg/models/auditing/events.go b/pkg/models/auditing/events.go index fe21ed682..a9df45c3d 100644 --- a/pkg/models/auditing/events.go +++ b/pkg/models/auditing/events.go @@ -17,10 +17,11 @@ limitations under the License. package auditing import ( + "strconv" + "kubesphere.io/kubesphere/pkg/api/auditing/v1alpha1" "kubesphere.io/kubesphere/pkg/simple/client/auditing" "kubesphere.io/kubesphere/pkg/utils/stringutils" - "strconv" ) type Interface interface { diff --git a/pkg/models/auth/authenticator.go b/pkg/models/auth/authenticator.go index 93aa02928..155341042 100644 --- a/pkg/models/auth/authenticator.go +++ b/pkg/models/auth/authenticator.go @@ -20,16 +20,19 @@ package auth import ( "fmt" + "net/mail" + "golang.org/x/crypto/bcrypt" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" - "net/mail" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" authuser "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" diff --git a/pkg/models/auth/authenticator_test.go b/pkg/models/auth/authenticator_test.go index 894df4235..9853f79b6 100644 --- a/pkg/models/auth/authenticator_test.go +++ b/pkg/models/auth/authenticator_test.go @@ -19,8 +19,9 @@ package auth import ( - "golang.org/x/crypto/bcrypt" "testing" + + "golang.org/x/crypto/bcrypt" ) func TestEncryptPassword(t *testing.T) { diff --git a/pkg/models/auth/login_recoder.go b/pkg/models/auth/login_recoder.go index 60b9fe4f0..939c06bfd 100644 --- a/pkg/models/auth/login_recoder.go +++ b/pkg/models/auth/login_recoder.go @@ -19,9 +19,11 @@ package auth import ( "context" "fmt" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" iamv1alpha2listers "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/models/auth/token.go b/pkg/models/auth/token.go index 300812ab6..210b6b2fe 100644 --- a/pkg/models/auth/token.go +++ b/pkg/models/auth/token.go @@ -21,13 +21,15 @@ package auth import ( "errors" "fmt" + "time" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" "kubesphere.io/kubesphere/pkg/apiserver/authentication/token" "kubesphere.io/kubesphere/pkg/simple/client/cache" - "time" ) type TokenManagementInterface interface { diff --git a/pkg/models/components/components.go b/pkg/models/components/components.go index dc0bc9f62..c1575a937 100644 --- a/pkg/models/components/components.go +++ b/pkg/models/components/components.go @@ -18,6 +18,7 @@ package components import ( "fmt" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/informers" diff --git a/pkg/models/components/components_test.go b/pkg/models/components/components_test.go index 822ba882f..d5e9e82dd 100644 --- a/pkg/models/components/components_test.go +++ b/pkg/models/components/components_test.go @@ -18,15 +18,17 @@ package components import ( "fmt" + "testing" + "time" + "github.com/google/go-cmp/cmp" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api/resource/v1alpha2" - "testing" - "time" ) func service(name, namespace string, selector map[string]string) runtime.Object { diff --git a/pkg/models/devops/common.go b/pkg/models/devops/common.go index 7af00a998..f1ac4dcad 100644 --- a/pkg/models/devops/common.go +++ b/pkg/models/devops/common.go @@ -18,10 +18,12 @@ package devops import ( "fmt" + "time" + "github.com/fatih/structs" + "kubesphere.io/kubesphere/pkg/simple/client/devops" "kubesphere.io/kubesphere/pkg/utils/stringutils" - "time" ) func GetColumnsFromStruct(s interface{}) []string { diff --git a/pkg/models/devops/devops.go b/pkg/models/devops/devops.go index d8879a8db..cd2d70024 100644 --- a/pkg/models/devops/devops.go +++ b/pkg/models/devops/devops.go @@ -23,6 +23,11 @@ import ( "fmt" "io" "io/ioutil" + "net/http" + "sort" + "strings" + "sync" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -32,6 +37,7 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" @@ -41,10 +47,6 @@ import ( "kubesphere.io/kubesphere/pkg/client/informers/externalversions" resourcesV1alpha3 "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" "kubesphere.io/kubesphere/pkg/simple/client/devops" - "net/http" - "sort" - "strings" - "sync" ) const ( diff --git a/pkg/models/devops/devops_test.go b/pkg/models/devops/devops_test.go index e0e7f987e..22eab4030 100644 --- a/pkg/models/devops/devops_test.go +++ b/pkg/models/devops/devops_test.go @@ -17,10 +17,11 @@ limitations under the License. package devops import ( - "kubesphere.io/kubesphere/pkg/simple/client/devops" - "kubesphere.io/kubesphere/pkg/simple/client/devops/fake" "net/http" "testing" + + "kubesphere.io/kubesphere/pkg/simple/client/devops" + "kubesphere.io/kubesphere/pkg/simple/client/devops/fake" ) const baseUrl = "http://127.0.0.1/kapis/devops.kubesphere.io/v1alpha2/" diff --git a/pkg/models/devops/project.go b/pkg/models/devops/project.go index ab8aa4a89..adcc6fa28 100644 --- a/pkg/models/devops/project.go +++ b/pkg/models/devops/project.go @@ -17,9 +17,10 @@ limitations under the License. package devops import ( + "time" + "kubesphere.io/kubesphere/pkg/api/devops/v1alpha2" "kubesphere.io/kubesphere/pkg/utils/idutils" - "time" ) var DevOpsProjectColumns = GetColumnsFromStruct(&v1alpha2.DevOpsProject{}) diff --git a/pkg/models/devops/project_credential_handler.go b/pkg/models/devops/project_credential_handler.go index bdc798c3e..c22b4ab8b 100644 --- a/pkg/models/devops/project_credential_handler.go +++ b/pkg/models/devops/project_credential_handler.go @@ -18,6 +18,7 @@ package devops import ( "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) diff --git a/pkg/models/devops/project_pipeline_sonar_handler.go b/pkg/models/devops/project_pipeline_sonar_handler.go index 567a02178..71f04b34a 100644 --- a/pkg/models/devops/project_pipeline_sonar_handler.go +++ b/pkg/models/devops/project_pipeline_sonar_handler.go @@ -17,12 +17,14 @@ limitations under the License. package devops import ( + "net/http" + "github.com/emicklei/go-restful" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/server/errors" "kubesphere.io/kubesphere/pkg/simple/client/devops" "kubesphere.io/kubesphere/pkg/simple/client/sonarqube" - "net/http" ) type PipelineSonarGetter interface { diff --git a/pkg/models/devops/s2ibinary_handler.go b/pkg/models/devops/s2ibinary_handler.go index f9f56e8fd..ff17bc280 100644 --- a/pkg/models/devops/s2ibinary_handler.go +++ b/pkg/models/devops/s2ibinary_handler.go @@ -17,22 +17,24 @@ limitations under the License. package devops import ( - "code.cloudfoundry.org/bytefmt" "context" "fmt" + "mime/multipart" + "net/http" + "reflect" + + "code.cloudfoundry.org/bytefmt" "github.com/aws/aws-sdk-go/aws/awserr" awsS3 "github.com/aws/aws-sdk-go/service/s3" "github.com/emicklei/go-restful" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/simple/client/s3" - "mime/multipart" - "net/http" - "reflect" ) const ( diff --git a/pkg/models/devops/s2ibinary_handler_test.go b/pkg/models/devops/s2ibinary_handler_test.go index bd1909666..ae0655f09 100644 --- a/pkg/models/devops/s2ibinary_handler_test.go +++ b/pkg/models/devops/s2ibinary_handler_test.go @@ -17,21 +17,23 @@ limitations under the License. package devops import ( - "code.cloudfoundry.org/bytefmt" "fmt" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/watch" - clientgotesting "k8s.io/client-go/testing" - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" - "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" - ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" - fakeS3 "kubesphere.io/kubesphere/pkg/simple/client/s3/fake" - "kubesphere.io/kubesphere/pkg/utils/hashutil" "mime/multipart" "reflect" "strings" "testing" "time" + + "code.cloudfoundry.org/bytefmt" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/watch" + clientgotesting "k8s.io/client-go/testing" + + "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" + ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" + fakeS3 "kubesphere.io/kubesphere/pkg/simple/client/s3/fake" + "kubesphere.io/kubesphere/pkg/utils/hashutil" ) const ( diff --git a/pkg/models/git/git.go b/pkg/models/git/git.go index d1f012d83..5f63f8dc9 100644 --- a/pkg/models/git/git.go +++ b/pkg/models/git/git.go @@ -18,6 +18,7 @@ package git import ( "fmt" + "gopkg.in/src-d/go-git.v4" "gopkg.in/src-d/go-git.v4/config" "gopkg.in/src-d/go-git.v4/plumbing/transport/http" diff --git a/pkg/models/iam/am/am.go b/pkg/models/iam/am/am.go index 2f16073e3..24385db89 100644 --- a/pkg/models/iam/am/am.go +++ b/pkg/models/iam/am/am.go @@ -28,6 +28,7 @@ import ( "k8s.io/client-go/kubernetes" listersv1 "k8s.io/client-go/listers/core/v1" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" diff --git a/pkg/models/iam/group/group.go b/pkg/models/iam/group/group.go index 5daf8ac33..532ecf409 100644 --- a/pkg/models/iam/group/group.go +++ b/pkg/models/iam/group/group.go @@ -29,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/client-go/kubernetes" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" diff --git a/pkg/models/iam/im/im.go b/pkg/models/iam/im/im.go index 26fcf3997..62168bfcf 100644 --- a/pkg/models/iam/im/im.go +++ b/pkg/models/iam/im/im.go @@ -18,8 +18,10 @@ package im import ( "context" "fmt" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" diff --git a/pkg/models/kubeconfig/kubeconfig.go b/pkg/models/kubeconfig/kubeconfig.go index 14bd3a300..d674ed506 100644 --- a/pkg/models/kubeconfig/kubeconfig.go +++ b/pkg/models/kubeconfig/kubeconfig.go @@ -24,6 +24,8 @@ import ( "encoding/pem" "fmt" "io/ioutil" + "time" + certificatesv1beta1 "k8s.io/api/certificates/v1beta1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -36,12 +38,12 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" certutil "k8s.io/client-go/util/cert" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/utils/pkiutil" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "time" ) const ( diff --git a/pkg/models/kubectl/kubectl.go b/pkg/models/kubectl/kubectl.go index 31a92f99d..0c081cd30 100644 --- a/pkg/models/kubectl/kubectl.go +++ b/pkg/models/kubectl/kubectl.go @@ -19,8 +19,10 @@ package kubectl import ( "context" "fmt" + "math/rand" + appsv1 "k8s.io/api/apps/v1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -29,10 +31,10 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + iamv1alpha2informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/models" - "math/rand" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "kubesphere.io/kubesphere/pkg/constants" ) diff --git a/pkg/models/logging/logging.go b/pkg/models/logging/logging.go index dd4a07a98..1c7f9f283 100644 --- a/pkg/models/logging/logging.go +++ b/pkg/models/logging/logging.go @@ -18,6 +18,7 @@ package logging import ( "io" + "kubesphere.io/kubesphere/pkg/api/logging/v1alpha2" "kubesphere.io/kubesphere/pkg/simple/client/logging" ) diff --git a/pkg/models/monitoring/expressions/prometheus_test.go b/pkg/models/monitoring/expressions/prometheus_test.go index 9bdd373f1..175ef185b 100644 --- a/pkg/models/monitoring/expressions/prometheus_test.go +++ b/pkg/models/monitoring/expressions/prometheus_test.go @@ -18,8 +18,9 @@ package expressions import ( "fmt" - "github.com/google/go-cmp/cmp" "testing" + + "github.com/google/go-cmp/cmp" ) func TestLabelReplace(t *testing.T) { diff --git a/pkg/models/monitoring/monitoring.go b/pkg/models/monitoring/monitoring.go index 53670481f..258e7e884 100644 --- a/pkg/models/monitoring/monitoring.go +++ b/pkg/models/monitoring/monitoring.go @@ -28,6 +28,9 @@ import ( "k8s.io/apimachinery/pkg/selection" "k8s.io/client-go/kubernetes" "k8s.io/klog" + "sigs.k8s.io/application/api/v1beta1" + appv1beta1 "sigs.k8s.io/application/api/v1beta1" + "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" @@ -39,8 +42,6 @@ import ( "kubesphere.io/kubesphere/pkg/server/errors" "kubesphere.io/kubesphere/pkg/server/params" "kubesphere.io/kubesphere/pkg/simple/client/monitoring" - "sigs.k8s.io/application/api/v1beta1" - appv1beta1 "sigs.k8s.io/application/api/v1beta1" ) type MonitoringOperator interface { diff --git a/pkg/models/monitoring/sort_page.go b/pkg/models/monitoring/sort_page.go index 814f1a453..fba5d2259 100644 --- a/pkg/models/monitoring/sort_page.go +++ b/pkg/models/monitoring/sort_page.go @@ -17,9 +17,10 @@ limitations under the License. package monitoring import ( - "kubesphere.io/kubesphere/pkg/simple/client/monitoring" "math" "sort" + + "kubesphere.io/kubesphere/pkg/simple/client/monitoring" ) const ( diff --git a/pkg/models/monitoring/sort_page_test.go b/pkg/models/monitoring/sort_page_test.go index c6958677a..2f21bb0c1 100644 --- a/pkg/models/monitoring/sort_page_test.go +++ b/pkg/models/monitoring/sort_page_test.go @@ -18,11 +18,12 @@ package monitoring import ( "fmt" - "github.com/google/go-cmp/cmp" - "github.com/json-iterator/go" "io/ioutil" "math" "testing" + + "github.com/google/go-cmp/cmp" + jsoniter "github.com/json-iterator/go" ) func TestSort(t *testing.T) { diff --git a/pkg/models/monitoring/utils.go b/pkg/models/monitoring/utils.go index 762a5746e..6cd6425cf 100644 --- a/pkg/models/monitoring/utils.go +++ b/pkg/models/monitoring/utils.go @@ -6,6 +6,7 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/simple/client/monitoring" ) diff --git a/pkg/models/notification/notification.go b/pkg/models/notification/notification.go index b1a72a614..7a75cbe85 100644 --- a/pkg/models/notification/notification.go +++ b/pkg/models/notification/notification.go @@ -3,6 +3,8 @@ package notification import ( "context" "fmt" + "reflect" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -10,6 +12,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" @@ -17,7 +20,6 @@ import ( "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/resource" - "reflect" ) const ( diff --git a/pkg/models/notification/notification_test.go b/pkg/models/notification/notification_test.go index f8059df93..f382dd017 100644 --- a/pkg/models/notification/notification_test.go +++ b/pkg/models/notification/notification_test.go @@ -17,18 +17,20 @@ limitations under the License. package notification import ( + "reflect" + "testing" + "github.com/google/go-cmp/cmp" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakek8s "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/informers" - "reflect" - "testing" ) func TestOperator_List(t *testing.T) { diff --git a/pkg/models/openpitrix/applications.go b/pkg/models/openpitrix/applications.go index fa08e010b..7df552b54 100644 --- a/pkg/models/openpitrix/applications.go +++ b/pkg/models/openpitrix/applications.go @@ -18,10 +18,16 @@ import ( "context" "errors" "fmt" + "sort" + "strings" + "time" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/client" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned" v1alpha13 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/application/v1alpha1" @@ -35,10 +41,6 @@ import ( "kubesphere.io/kubesphere/pkg/utils/idutils" "kubesphere.io/kubesphere/pkg/utils/reposcache" "kubesphere.io/kubesphere/pkg/utils/stringutils" - "sigs.k8s.io/controller-runtime/pkg/client" - "sort" - "strings" - "time" ) type ApplicationInterface interface { diff --git a/pkg/models/openpitrix/applications_test.go b/pkg/models/openpitrix/applications_test.go index 37fa5a3a4..18330b66f 100644 --- a/pkg/models/openpitrix/applications_test.go +++ b/pkg/models/openpitrix/applications_test.go @@ -19,17 +19,19 @@ package openpitrix import ( "context" "encoding/base64" + "testing" + "github.com/go-openapi/strfmt" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" fakek8s "k8s.io/client-go/kubernetes/fake" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned" fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/server/params" "kubesphere.io/kubesphere/pkg/simple/client/s3/fake" - "testing" ) var rawChartData = "H4sIFAAAAAAA/ykAK2FIUjBjSE02THk5NWIzVjBkUzVpWlM5Nk9WVjZNV2xqYW5keVRRbz1IZWxtAOxYUW/bNhDOM3/FTVmBNltoubEdQEAfirTAim1pMA/ZwzAUtHSS2FAkS1JOvLT77QNJ2XGUZEmxJukw34NEkcfj3fG+41EOrRsc1Mw4umCN2LoPStM0nYxG4Z2maf+dDif7W8NROhyP0v3R/t5WOnw+nAy3IL0XbXrUWsfMVvqv1+ob9x8hpvkxGsuVzGD+nDCtV59DOpzQlBRoc8O1C30v4QcUDeQ+YKBUBn5sZ2gkOrREsgYz8AFF3EJjBkxrwXPmZ5L5UmpKhzQlj232hjoK+J8z0aK9twRwG/6fD8d9/I+GG/w/CBkMGD1QrXQZDAnhDaswIwAGtbLcKbPIQFZcnhEA3QpxpATPFxm8KQ+VOzJoUToC4FiVQZJ0Ao5aIaaYG3Q2g9//CLnh7RyN4QUGtrIV4krnYzvjf0gB/w4bLZhDO3hXo9BoLHX6y6WCW/C/t7c/6eF/NN6c/w9D5+eDHZjzJgOLDkou0J/dLxrvlrzGDHYGnz4Rz0Ven2kmC3A1gkcuqDK0Qy1ASce3CwWWXCIkPrKoZ0xg92KItcIBjQXnoZdCj+Phs54M4CM408ocJnuhyZtpW5b8DJLdBDpZKAvfjKodGGQOga1W8OllAR9aJnjJsfClSFCakt8wyg78zq/gDbAww5y1FsGqBteqmmhqyVEUFphBELzhDgtwClzNLTydLYIbXh1OPS+XFViN+TNK3pRgUCCznb9yJR3j0nbVU+jjDk65EDBDaK3X0wILynfaXu/VZfK88CwvV47sZ9alw24cv4uzhV3J+TYonr24+25e6LhyQRRCf4n+iXOXel7q/EzltOHSlZA8sbtPbNKTFRe9e2xd37wUcWtb6bHRVbl+G8N2drERuQSbobhpSwPLxX727Vh3cWx3ZTp89Ae1YDlC8l0Cybvk88GjmkbJqJ69Qb04GPWrUTTU1oOgcgbn58BlLtqiZwqNi/UGLQrMnTI/dQLpWnR0lr1c3UH8GNOanqzgSLkarK4S5+fXTPkIH1rlsGfpVSkNk6zCYne2iIKWkTJFM+d5f3701LRT/p991Tdx99r1423pin8irOn1OnNpHZM5XtZ4HTzXxWg/YdvOQpbnvurzmay1eKMxgfll5D28KelcZqN5XLmX9p9eNvUii9FnNwmS67at4XwpMukayZ0EXMHyY5++j0+9+i9XsuRVw/SXvAze+v9nnPbqv3E63tR/D0InXBYZHIRt/5lp0qBjBXPM3wBXKWoZH1eBG/PU2i+kIVnO9qwZ+C8CsEHaV0oB/9Qf6bySyuB9rHEb/sd7V/7/7E3GG/w/BG3DEXMOjbS+DogxAKc1Spi1XBT+OqNZfsIqtJRsw6/+ymNbrZVxFmyNQkAl1Awa5vKay+p7f+dhjs8RNHP1Wj+TBdkGiVX4IQxPtcGSn2EBp9zV8M0zCm+lWICSYaZXCTQaEFwiJfTV9N3UKYNkG7p69fhgCgU3ltCKu0F4RvUJnf1pBuG57KirgX8sP+1cDi4EzVh+0upw97Vkh9pTTXbojJ2QHeoa31aGV2TnL7INx8xw1Vp48+q1JVQb9R5zRygvkA0iu1HvCZ3bXBU42CS9DW1oQ18z/R0AAP//GfF7tgAeAAA=" diff --git a/pkg/models/openpitrix/applicationversions.go b/pkg/models/openpitrix/applicationversions.go index c48a9d480..1fa4229d0 100644 --- a/pkg/models/openpitrix/applicationversions.go +++ b/pkg/models/openpitrix/applicationversions.go @@ -24,26 +24,28 @@ import ( "encoding/base64" "errors" "fmt" + "io" + "io/ioutil" + "math" + "reflect" + "sort" + "strings" + "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/s3" "github.com/go-openapi/strfmt" - "io" - "io/ioutil" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/client" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/models" "kubesphere.io/kubesphere/pkg/server/params" "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" "kubesphere.io/kubesphere/pkg/utils/stringutils" - "math" - "reflect" - "sigs.k8s.io/controller-runtime/pkg/client" - "sort" - "strings" ) func (c *applicationOperator) GetAppVersionPackage(appId, versionId string) (*GetAppVersionPackageResponse, error) { diff --git a/pkg/models/openpitrix/attachments.go b/pkg/models/openpitrix/attachments.go index 756e6145f..799dfba4e 100644 --- a/pkg/models/openpitrix/attachments.go +++ b/pkg/models/openpitrix/attachments.go @@ -15,8 +15,10 @@ package openpitrix import ( "bytes" + "github.com/go-openapi/strfmt" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/utils/idutils" diff --git a/pkg/models/openpitrix/categories.go b/pkg/models/openpitrix/categories.go index 1b91c6a97..afe3a9e8a 100644 --- a/pkg/models/openpitrix/categories.go +++ b/pkg/models/openpitrix/categories.go @@ -15,10 +15,14 @@ package openpitrix import ( "context" + "sort" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/client" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned" typed_v1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/application/v1alpha1" @@ -28,8 +32,6 @@ import ( "kubesphere.io/kubesphere/pkg/server/errors" "kubesphere.io/kubesphere/pkg/server/params" "kubesphere.io/kubesphere/pkg/utils/idutils" - "sigs.k8s.io/controller-runtime/pkg/client" - "sort" ) type CategoryInterface interface { diff --git a/pkg/models/openpitrix/category_test.go b/pkg/models/openpitrix/category_test.go index 0a0a46abf..5c3c273f5 100644 --- a/pkg/models/openpitrix/category_test.go +++ b/pkg/models/openpitrix/category_test.go @@ -18,13 +18,15 @@ package openpitrix import ( "context" + "testing" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakek8s "k8s.io/client-go/kubernetes/fake" "k8s.io/klog" + fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/server/params" - "testing" ) func TestOpenPitrixCategory(t *testing.T) { diff --git a/pkg/models/openpitrix/interface.go b/pkg/models/openpitrix/interface.go index 53d23b940..3f6804490 100644 --- a/pkg/models/openpitrix/interface.go +++ b/pkg/models/openpitrix/interface.go @@ -17,15 +17,17 @@ limitations under the License. package openpitrix import ( + "sync" + "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/cache" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned" ks_informers "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/utils/reposcache" - "sync" ) type Interface interface { diff --git a/pkg/models/openpitrix/metric.go b/pkg/models/openpitrix/metric.go index 506d52011..0814c8e2f 100644 --- a/pkg/models/openpitrix/metric.go +++ b/pkg/models/openpitrix/metric.go @@ -18,6 +18,7 @@ package openpitrix import ( compbasemetrics "k8s.io/component-base/metrics" + "kubesphere.io/kubesphere/pkg/utils/metrics" ) diff --git a/pkg/models/openpitrix/release.go b/pkg/models/openpitrix/release.go index 022965fd3..f12e269c3 100644 --- a/pkg/models/openpitrix/release.go +++ b/pkg/models/openpitrix/release.go @@ -21,6 +21,10 @@ import ( "context" "errors" "fmt" + "math" + "sort" + "strings" + "github.com/go-openapi/strfmt" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -28,6 +32,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/client" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned" typed_v1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/application/v1alpha1" @@ -42,10 +48,6 @@ import ( "kubesphere.io/kubesphere/pkg/utils/reposcache" "kubesphere.io/kubesphere/pkg/utils/resourceparse" "kubesphere.io/kubesphere/pkg/utils/stringutils" - "math" - "sigs.k8s.io/controller-runtime/pkg/client" - "sort" - "strings" ) type ReleaseInterface interface { diff --git a/pkg/models/openpitrix/release_test.go b/pkg/models/openpitrix/release_test.go index 7bc7e3f5b..7cb03f19b 100644 --- a/pkg/models/openpitrix/release_test.go +++ b/pkg/models/openpitrix/release_test.go @@ -19,11 +19,13 @@ package openpitrix import ( "context" "encoding/base64" + "testing" + "github.com/go-openapi/strfmt" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/server/params" - "testing" ) func TestOpenPitrixRelease(t *testing.T) { diff --git a/pkg/models/openpitrix/repo_test.go b/pkg/models/openpitrix/repo_test.go index 0720431b8..d29ef8d8b 100644 --- a/pkg/models/openpitrix/repo_test.go +++ b/pkg/models/openpitrix/repo_test.go @@ -18,16 +18,18 @@ package openpitrix import ( "context" + "testing" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakek8s "k8s.io/client-go/kubernetes/fake" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/server/params" "kubesphere.io/kubesphere/pkg/utils/idutils" - "testing" ) func TestOpenPitrixRepo(t *testing.T) { diff --git a/pkg/models/openpitrix/repos.go b/pkg/models/openpitrix/repos.go index aad2bb0c5..9f7b4b97e 100644 --- a/pkg/models/openpitrix/repos.go +++ b/pkg/models/openpitrix/repos.go @@ -16,6 +16,10 @@ package openpitrix import ( "context" "encoding/json" + "net/url" + "sort" + "strings" + "github.com/go-openapi/strfmt" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -23,6 +27,8 @@ import ( "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/types" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/client" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned" typed_v1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/application/v1alpha1" @@ -34,10 +40,6 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" "kubesphere.io/kubesphere/pkg/utils/reposcache" "kubesphere.io/kubesphere/pkg/utils/stringutils" - "net/url" - "sigs.k8s.io/controller-runtime/pkg/client" - "sort" - "strings" ) const DescriptionLen = 512 diff --git a/pkg/models/openpitrix/utils.go b/pkg/models/openpitrix/utils.go index f594d45d9..3abe7bea4 100644 --- a/pkg/models/openpitrix/utils.go +++ b/pkg/models/openpitrix/utils.go @@ -18,11 +18,17 @@ package openpitrix import ( "fmt" + "path" + "regexp" + "strings" + "time" + "github.com/Masterminds/semver/v3" "github.com/go-openapi/strfmt" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/resource" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/server/params" @@ -30,10 +36,6 @@ import ( "kubesphere.io/kubesphere/pkg/utils/idutils" "kubesphere.io/kubesphere/pkg/utils/sliceutil" "kubesphere.io/kubesphere/pkg/utils/stringutils" - "path" - "regexp" - "strings" - "time" ) func convertRepoEvent(meta *metav1.ObjectMeta, state *v1alpha1.HelmRepoSyncState) *RepoEvent { diff --git a/pkg/models/openpitrix/v2alpha1/applications.go b/pkg/models/openpitrix/v2alpha1/applications.go index 43fd1cee3..f556d54dc 100644 --- a/pkg/models/openpitrix/v2alpha1/applications.go +++ b/pkg/models/openpitrix/v2alpha1/applications.go @@ -17,6 +17,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/openpitrix/v2alpha1/applicationsversions.go b/pkg/models/openpitrix/v2alpha1/applicationsversions.go index db47db079..3ec746e8a 100644 --- a/pkg/models/openpitrix/v2alpha1/applicationsversions.go +++ b/pkg/models/openpitrix/v2alpha1/applicationsversions.go @@ -17,6 +17,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/openpitrix/v2alpha1/categories.go b/pkg/models/openpitrix/v2alpha1/categories.go index 0b8270c8f..f418e366f 100644 --- a/pkg/models/openpitrix/v2alpha1/categories.go +++ b/pkg/models/openpitrix/v2alpha1/categories.go @@ -15,6 +15,7 @@ package v2alpha1 import ( "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/openpitrix/v2alpha1/release.go b/pkg/models/openpitrix/v2alpha1/release.go index e79ec3c38..63a2a616a 100644 --- a/pkg/models/openpitrix/v2alpha1/release.go +++ b/pkg/models/openpitrix/v2alpha1/release.go @@ -20,6 +20,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/openpitrix/v2alpha1/repos.go b/pkg/models/openpitrix/v2alpha1/repos.go index 9fa647d33..d622b9533 100644 --- a/pkg/models/openpitrix/v2alpha1/repos.go +++ b/pkg/models/openpitrix/v2alpha1/repos.go @@ -19,6 +19,7 @@ package v2alpha1 import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/quotas/quotas.go b/pkg/models/quotas/quotas.go index 32b68f961..bff0907af 100644 --- a/pkg/models/quotas/quotas.go +++ b/pkg/models/quotas/quotas.go @@ -17,12 +17,13 @@ limitations under the License. package quotas import ( - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/informers" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" ) diff --git a/pkg/models/registries/blob.go b/pkg/models/registries/blob.go index 083408b24..4ffef25b7 100644 --- a/pkg/models/registries/blob.go +++ b/pkg/models/registries/blob.go @@ -19,9 +19,10 @@ package registries import ( "encoding/json" "fmt" + "net/http" + "github.com/docker/distribution/manifest/schema2" log "k8s.io/klog" - "net/http" ) // Digest returns the digest for an image. diff --git a/pkg/models/registries/image.go b/pkg/models/registries/image.go index f280cde6f..1850bbb36 100644 --- a/pkg/models/registries/image.go +++ b/pkg/models/registries/image.go @@ -18,11 +18,12 @@ package registries import ( "fmt" + "net/url" + "strings" + "github.com/docker/distribution/reference" "github.com/opencontainers/go-digest" log "k8s.io/klog" - "net/url" - "strings" ) // Image holds information about an image. diff --git a/pkg/models/registries/image_type.go b/pkg/models/registries/image_type.go index e33c11ffb..0d0c9f0c7 100644 --- a/pkg/models/registries/image_type.go +++ b/pkg/models/registries/image_type.go @@ -17,8 +17,9 @@ limitations under the License. package registries import ( - "github.com/opencontainers/go-digest" "time" + + "github.com/opencontainers/go-digest" ) // ImageBlobInfo describes the info of an image. diff --git a/pkg/models/registries/registries.go b/pkg/models/registries/registries.go index aab53a541..a7faef8d2 100644 --- a/pkg/models/registries/registries.go +++ b/pkg/models/registries/registries.go @@ -29,6 +29,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/client-go/informers" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" ) diff --git a/pkg/models/resources/v1alpha2/clusterrole/clusterroles.go b/pkg/models/resources/v1alpha2/clusterrole/clusterroles.go index b7f1b30f4..fa8c3b462 100644 --- a/pkg/models/resources/v1alpha2/clusterrole/clusterroles.go +++ b/pkg/models/resources/v1alpha2/clusterrole/clusterroles.go @@ -17,14 +17,16 @@ limitations under the License. package clusterrole import ( + "sort" + rbac "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" "kubesphere.io/kubesphere/pkg/server/params" "kubesphere.io/kubesphere/pkg/utils/k8sutil" - "sort" ) type clusterRoleSearcher struct { diff --git a/pkg/models/resources/v1alpha2/configmap/configmaps.go b/pkg/models/resources/v1alpha2/configmap/configmaps.go index cbdbfa8e6..626964962 100644 --- a/pkg/models/resources/v1alpha2/configmap/configmaps.go +++ b/pkg/models/resources/v1alpha2/configmap/configmaps.go @@ -17,12 +17,14 @@ limitations under the License. package configmap import ( - "k8s.io/api/core/v1" + "sort" + + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" "kubesphere.io/kubesphere/pkg/server/params" - "sort" ) type configMapSearcher struct { diff --git a/pkg/models/resources/v1alpha2/cronjob/cronjobs.go b/pkg/models/resources/v1alpha2/cronjob/cronjobs.go index 4aec0177c..d94625667 100644 --- a/pkg/models/resources/v1alpha2/cronjob/cronjobs.go +++ b/pkg/models/resources/v1alpha2/cronjob/cronjobs.go @@ -17,11 +17,13 @@ limitations under the License. package cronjob import ( + "sort" + "k8s.io/api/batch/v1beta1" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" "kubesphere.io/kubesphere/pkg/server/params" - "sort" "k8s.io/apimachinery/pkg/labels" ) diff --git a/pkg/models/resources/v1alpha2/daemonset/daemonsets.go b/pkg/models/resources/v1alpha2/daemonset/daemonsets.go index 98a6787e1..b3cda437a 100644 --- a/pkg/models/resources/v1alpha2/daemonset/daemonsets.go +++ b/pkg/models/resources/v1alpha2/daemonset/daemonsets.go @@ -17,12 +17,14 @@ limitations under the License. package daemonset import ( - "k8s.io/api/apps/v1" + "sort" + + v1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" "kubesphere.io/kubesphere/pkg/server/params" - "sort" ) type daemonSetSearcher struct { diff --git a/pkg/models/resources/v1alpha2/deployment/deployments.go b/pkg/models/resources/v1alpha2/deployment/deployments.go index 2aa8d05d8..5815386f9 100644 --- a/pkg/models/resources/v1alpha2/deployment/deployments.go +++ b/pkg/models/resources/v1alpha2/deployment/deployments.go @@ -33,16 +33,18 @@ limitations under the License. package deployment import ( - "k8s.io/client-go/informers" - "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" - "kubesphere.io/kubesphere/pkg/server/params" "sort" "strings" "time" + "k8s.io/client-go/informers" + + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" + "kubesphere.io/kubesphere/pkg/server/params" + "k8s.io/apimachinery/pkg/labels" - "k8s.io/api/apps/v1" + v1 "k8s.io/api/apps/v1" ) type deploymentSearcher struct { diff --git a/pkg/models/resources/v1alpha2/hpa/horizontalpodautoscalers.go b/pkg/models/resources/v1alpha2/hpa/horizontalpodautoscalers.go index 342f4069e..79fda7886 100644 --- a/pkg/models/resources/v1alpha2/hpa/horizontalpodautoscalers.go +++ b/pkg/models/resources/v1alpha2/hpa/horizontalpodautoscalers.go @@ -16,12 +16,14 @@ limitations under the License. package hpa import ( + "sort" + autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" "kubesphere.io/kubesphere/pkg/server/params" - "sort" ) type hpaSearcher struct { diff --git a/pkg/models/resources/v1alpha2/ingress/ingresses.go b/pkg/models/resources/v1alpha2/ingress/ingresses.go index 46fc5f889..800444902 100644 --- a/pkg/models/resources/v1alpha2/ingress/ingresses.go +++ b/pkg/models/resources/v1alpha2/ingress/ingresses.go @@ -17,11 +17,13 @@ limitations under the License. package ingress import ( + "sort" + "k8s.io/api/extensions/v1beta1" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" "kubesphere.io/kubesphere/pkg/server/params" - "sort" "k8s.io/apimachinery/pkg/labels" ) diff --git a/pkg/models/resources/v1alpha2/interface.go b/pkg/models/resources/v1alpha2/interface.go index e1c4cc40d..a3be826c8 100644 --- a/pkg/models/resources/v1alpha2/interface.go +++ b/pkg/models/resources/v1alpha2/interface.go @@ -17,11 +17,13 @@ limitations under the License. package v1alpha2 import ( + "strings" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/server/params" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "strings" ) const ( diff --git a/pkg/models/resources/v1alpha2/job/jobs.go b/pkg/models/resources/v1alpha2/job/jobs.go index 3fde10e2c..fa88cbdb6 100644 --- a/pkg/models/resources/v1alpha2/job/jobs.go +++ b/pkg/models/resources/v1alpha2/job/jobs.go @@ -18,12 +18,14 @@ package job import ( "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" + "sort" + "time" + "kubesphere.io/kubesphere/pkg/server/params" "kubesphere.io/kubesphere/pkg/utils/k8sutil" - "sort" - "time" batchv1 "k8s.io/api/batch/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/models/resources/v1alpha2/namespace/namespaces.go b/pkg/models/resources/v1alpha2/namespace/namespaces.go index 30ab09c99..596a6f142 100644 --- a/pkg/models/resources/v1alpha2/namespace/namespaces.go +++ b/pkg/models/resources/v1alpha2/namespace/namespaces.go @@ -18,12 +18,15 @@ package namespace import ( "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" - "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/labels" - "kubesphere.io/kubesphere/pkg/server/params" "sort" + + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/labels" + + "kubesphere.io/kubesphere/pkg/server/params" ) type namespaceSearcher struct { diff --git a/pkg/models/resources/v1alpha2/node/nodes.go b/pkg/models/resources/v1alpha2/node/nodes.go index 102f15d25..f0caced4e 100644 --- a/pkg/models/resources/v1alpha2/node/nodes.go +++ b/pkg/models/resources/v1alpha2/node/nodes.go @@ -18,13 +18,17 @@ package node import ( "fmt" + "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" - "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/labels" - "kubesphere.io/kubesphere/pkg/server/params" "sort" + + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/labels" + + "kubesphere.io/kubesphere/pkg/server/params" ) const ( diff --git a/pkg/models/resources/v1alpha2/persistentvolumeclaim/persistentvolumeclaims.go b/pkg/models/resources/v1alpha2/persistentvolumeclaim/persistentvolumeclaims.go index 9eb538cef..1d1994f8f 100644 --- a/pkg/models/resources/v1alpha2/persistentvolumeclaim/persistentvolumeclaims.go +++ b/pkg/models/resources/v1alpha2/persistentvolumeclaim/persistentvolumeclaims.go @@ -17,17 +17,20 @@ limitations under the License. package persistentvolumeclaim import ( - snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" - "k8s.io/client-go/informers" - "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" "strconv" - "kubesphere.io/kubesphere/pkg/server/params" - "kubesphere.io/kubesphere/pkg/utils/sliceutil" + snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" + "k8s.io/client-go/informers" + + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" + "sort" "strings" - "k8s.io/api/core/v1" + "kubesphere.io/kubesphere/pkg/server/params" + "kubesphere.io/kubesphere/pkg/utils/sliceutil" + + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" ) diff --git a/pkg/models/resources/v1alpha2/pod/pods.go b/pkg/models/resources/v1alpha2/pod/pods.go index 6139107d4..4da453bed 100644 --- a/pkg/models/resources/v1alpha2/pod/pods.go +++ b/pkg/models/resources/v1alpha2/pod/pods.go @@ -19,12 +19,15 @@ package pod import ( appsv1 "k8s.io/api/apps/v1" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" - "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/labels" - "kubesphere.io/kubesphere/pkg/server/params" "sort" + + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/labels" + + "kubesphere.io/kubesphere/pkg/server/params" ) type podSearcher struct { diff --git a/pkg/models/resources/v1alpha2/resource/resource_test.go b/pkg/models/resources/v1alpha2/resource/resource_test.go index 6fc19b930..69e863d5e 100644 --- a/pkg/models/resources/v1alpha2/resource/resource_test.go +++ b/pkg/models/resources/v1alpha2/resource/resource_test.go @@ -17,6 +17,8 @@ limitations under the License. package resource import ( + "testing" + "github.com/google/go-cmp/cmp" fakesnapshot "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" fakeistio "istio.io/client-go/pkg/clientset/versioned/fake" @@ -24,12 +26,12 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakek8s "k8s.io/client-go/kubernetes/fake" + fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/models" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" "kubesphere.io/kubesphere/pkg/server/params" - "testing" ) func TestConditions(t *testing.T) { diff --git a/pkg/models/resources/v1alpha2/resource/resources.go b/pkg/models/resources/v1alpha2/resource/resources.go index db3794d55..b0565a59b 100644 --- a/pkg/models/resources/v1alpha2/resource/resources.go +++ b/pkg/models/resources/v1alpha2/resource/resources.go @@ -18,7 +18,9 @@ package resource import ( "errors" + "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/models" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" diff --git a/pkg/models/resources/v1alpha2/role/roles.go b/pkg/models/resources/v1alpha2/role/roles.go index f3faeea07..3c8f960b9 100644 --- a/pkg/models/resources/v1alpha2/role/roles.go +++ b/pkg/models/resources/v1alpha2/role/roles.go @@ -18,13 +18,16 @@ package role import ( "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" + "sort" + rbac "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/labels" + "kubesphere.io/kubesphere/pkg/server/params" - "sort" ) type roleSearcher struct { diff --git a/pkg/models/resources/v1alpha2/s2buildertemplate/s2ibuildertemplate.go b/pkg/models/resources/v1alpha2/s2buildertemplate/s2ibuildertemplate.go index e369af1fc..257676f7a 100644 --- a/pkg/models/resources/v1alpha2/s2buildertemplate/s2ibuildertemplate.go +++ b/pkg/models/resources/v1alpha2/s2buildertemplate/s2ibuildertemplate.go @@ -21,9 +21,11 @@ import ( "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" - "k8s.io/apimachinery/pkg/labels" - "kubesphere.io/kubesphere/pkg/server/params" "sort" + + "k8s.io/apimachinery/pkg/labels" + + "kubesphere.io/kubesphere/pkg/server/params" ) type s2iBuilderTemplateSearcher struct { diff --git a/pkg/models/resources/v1alpha2/s2ibuilder/s2ibuilder.go b/pkg/models/resources/v1alpha2/s2ibuilder/s2ibuilder.go index 95e475750..b1b839e9d 100644 --- a/pkg/models/resources/v1alpha2/s2ibuilder/s2ibuilder.go +++ b/pkg/models/resources/v1alpha2/s2ibuilder/s2ibuilder.go @@ -18,12 +18,14 @@ package s2ibuilder import ( "k8s.io/apimachinery/pkg/labels" + "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" - "kubesphere.io/kubesphere/pkg/server/params" "sort" + + "kubesphere.io/kubesphere/pkg/server/params" ) type s2iBuilderSearcher struct { diff --git a/pkg/models/resources/v1alpha2/s2irun/s2irun.go b/pkg/models/resources/v1alpha2/s2irun/s2irun.go index 4aa3a340b..5459cc9bb 100644 --- a/pkg/models/resources/v1alpha2/s2irun/s2irun.go +++ b/pkg/models/resources/v1alpha2/s2irun/s2irun.go @@ -17,12 +17,14 @@ limitations under the License. package s2irun import ( + "sort" + "k8s.io/apimachinery/pkg/labels" + "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" "kubesphere.io/kubesphere/pkg/server/params" - "sort" ) type s2iRunSearcher struct { diff --git a/pkg/models/resources/v1alpha2/secret/secrets.go b/pkg/models/resources/v1alpha2/secret/secrets.go index 43a5e6a01..522068ad6 100644 --- a/pkg/models/resources/v1alpha2/secret/secrets.go +++ b/pkg/models/resources/v1alpha2/secret/secrets.go @@ -18,12 +18,15 @@ package secret import ( "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" - "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/labels" - "kubesphere.io/kubesphere/pkg/server/params" "sort" + + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/labels" + + "kubesphere.io/kubesphere/pkg/server/params" ) type secretSearcher struct { diff --git a/pkg/models/resources/v1alpha2/service/services.go b/pkg/models/resources/v1alpha2/service/services.go index 450c755e7..8506a6e76 100644 --- a/pkg/models/resources/v1alpha2/service/services.go +++ b/pkg/models/resources/v1alpha2/service/services.go @@ -18,12 +18,15 @@ package service import ( "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" - "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/labels" - "kubesphere.io/kubesphere/pkg/server/params" "sort" + + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/labels" + + "kubesphere.io/kubesphere/pkg/server/params" ) type serviceSearcher struct { diff --git a/pkg/models/resources/v1alpha2/statefulset/statefulsets.go b/pkg/models/resources/v1alpha2/statefulset/statefulsets.go index 246c9491d..58c95c190 100644 --- a/pkg/models/resources/v1alpha2/statefulset/statefulsets.go +++ b/pkg/models/resources/v1alpha2/statefulset/statefulsets.go @@ -18,12 +18,15 @@ package statefulset import ( "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" - "k8s.io/api/apps/v1" - "k8s.io/apimachinery/pkg/labels" - "kubesphere.io/kubesphere/pkg/server/params" "sort" + + v1 "k8s.io/api/apps/v1" + "k8s.io/apimachinery/pkg/labels" + + "kubesphere.io/kubesphere/pkg/server/params" ) type statefulSetSearcher struct { diff --git a/pkg/models/resources/v1alpha2/storageclass/storageclasses.go b/pkg/models/resources/v1alpha2/storageclass/storageclasses.go index 1bf9aa651..98034ab26 100644 --- a/pkg/models/resources/v1alpha2/storageclass/storageclasses.go +++ b/pkg/models/resources/v1alpha2/storageclass/storageclasses.go @@ -17,15 +17,17 @@ limitations under the License. package storageclass import ( - snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" - corev1 "k8s.io/api/core/v1" - "k8s.io/api/storage/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/informers" - "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" - "kubesphere.io/kubesphere/pkg/server/params" "sort" "strconv" + + snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" + corev1 "k8s.io/api/core/v1" + v1 "k8s.io/api/storage/v1" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/client-go/informers" + + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" + "kubesphere.io/kubesphere/pkg/server/params" ) type storageClassesSearcher struct { diff --git a/pkg/models/resources/v1alpha2/storageclass/storageclasses_test.go b/pkg/models/resources/v1alpha2/storageclass/storageclasses_test.go index 5224dc50a..5c85c2d1e 100644 --- a/pkg/models/resources/v1alpha2/storageclass/storageclasses_test.go +++ b/pkg/models/resources/v1alpha2/storageclass/storageclasses_test.go @@ -1,6 +1,8 @@ package storageclass import ( + "testing" + "github.com/google/go-cmp/cmp" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/storage/v1" @@ -8,9 +10,9 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" "k8s.io/utils/pointer" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" "kubesphere.io/kubesphere/pkg/server/params" - "testing" ) var ( diff --git a/pkg/models/resources/v1alpha2/workspace/workspaces.go b/pkg/models/resources/v1alpha2/workspace/workspaces.go index 159027d8f..c6c680630 100644 --- a/pkg/models/resources/v1alpha2/workspace/workspaces.go +++ b/pkg/models/resources/v1alpha2/workspace/workspaces.go @@ -21,9 +21,11 @@ import ( "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" - "k8s.io/apimachinery/pkg/labels" - "kubesphere.io/kubesphere/pkg/server/params" "sort" + + "k8s.io/apimachinery/pkg/labels" + + "kubesphere.io/kubesphere/pkg/server/params" ) type workspaceSearcher struct { diff --git a/pkg/models/resources/v1alpha3/application/applications.go b/pkg/models/resources/v1alpha3/application/applications.go index fae008a27..5830ea3c6 100644 --- a/pkg/models/resources/v1alpha3/application/applications.go +++ b/pkg/models/resources/v1alpha3/application/applications.go @@ -18,16 +18,18 @@ package application import ( "context" + "time" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apiserver/query" - "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" appv1beta1 "sigs.k8s.io/application/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "time" + + "kubesphere.io/kubesphere/pkg/api" + "kubesphere.io/kubesphere/pkg/apiserver/query" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" ) type applicationsGetter struct { diff --git a/pkg/models/resources/v1alpha3/application/applications_test.go b/pkg/models/resources/v1alpha3/application/applications_test.go index 0b7d2b6d0..0fd056058 100644 --- a/pkg/models/resources/v1alpha3/application/applications_test.go +++ b/pkg/models/resources/v1alpha3/application/applications_test.go @@ -18,18 +18,20 @@ package application import ( "context" + "path/filepath" + "reflect" + "testing" + core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog/v2" - "kubesphere.io/kubesphere/pkg/apiserver/query" - "path/filepath" - "reflect" appv1beta1 "sigs.k8s.io/application/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "testing" + + "kubesphere.io/kubesphere/pkg/apiserver/query" ) var c client.Client diff --git a/pkg/models/resources/v1alpha3/cluster/clusters.go b/pkg/models/resources/v1alpha3/cluster/clusters.go index 8d75f6db2..4a9400efd 100644 --- a/pkg/models/resources/v1alpha3/cluster/clusters.go +++ b/pkg/models/resources/v1alpha3/cluster/clusters.go @@ -18,6 +18,7 @@ package cluster import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/cluster/clusters_test.go b/pkg/models/resources/v1alpha3/cluster/clusters_test.go index 051f0fdc9..8c47b5207 100644 --- a/pkg/models/resources/v1alpha3/cluster/clusters_test.go +++ b/pkg/models/resources/v1alpha3/cluster/clusters_test.go @@ -17,15 +17,17 @@ limitations under the License. package cluster import ( + "testing" + "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" - "testing" ) var clusters = []*clusterv1alpha1.Cluster{ diff --git a/pkg/models/resources/v1alpha3/clusterdashboard/clusterdashboard.go b/pkg/models/resources/v1alpha3/clusterdashboard/clusterdashboard.go index d03d46ccd..8bd3e729d 100644 --- a/pkg/models/resources/v1alpha3/clusterdashboard/clusterdashboard.go +++ b/pkg/models/resources/v1alpha3/clusterdashboard/clusterdashboard.go @@ -22,12 +22,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apiserver/query" - "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" monitoringdashboardv1alpha1 "kubesphere.io/monitoring-dashboard/api/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" + + "kubesphere.io/kubesphere/pkg/api" + "kubesphere.io/kubesphere/pkg/apiserver/query" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" ) type dashboardGetter struct { diff --git a/pkg/models/resources/v1alpha3/clusterdashboard/clusterdashboard_test.go b/pkg/models/resources/v1alpha3/clusterdashboard/clusterdashboard_test.go index 58dabb22f..28440b6f8 100644 --- a/pkg/models/resources/v1alpha3/clusterdashboard/clusterdashboard_test.go +++ b/pkg/models/resources/v1alpha3/clusterdashboard/clusterdashboard_test.go @@ -24,11 +24,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" - "kubesphere.io/kubesphere/pkg/apiserver/query" monitoringdashboardv1alpha1 "kubesphere.io/monitoring-dashboard/api/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" + + "kubesphere.io/kubesphere/pkg/apiserver/query" ) var c client.Client diff --git a/pkg/models/resources/v1alpha3/clusterrole/clusterroles.go b/pkg/models/resources/v1alpha3/clusterrole/clusterroles.go index 7d9efcfe1..c3fd2282e 100644 --- a/pkg/models/resources/v1alpha3/clusterrole/clusterroles.go +++ b/pkg/models/resources/v1alpha3/clusterrole/clusterroles.go @@ -18,11 +18,13 @@ package clusterrole import ( "encoding/json" + rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/clusterrole/clusterroles_test.go b/pkg/models/resources/v1alpha3/clusterrole/clusterroles_test.go index e8edbdc8f..4ad0bc02a 100644 --- a/pkg/models/resources/v1alpha3/clusterrole/clusterroles_test.go +++ b/pkg/models/resources/v1alpha3/clusterrole/clusterroles_test.go @@ -17,15 +17,17 @@ limitations under the License. package clusterrole import ( + "testing" + "github.com/google/go-cmp/cmp" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListClusterRoles(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/clusterrolebinding/clusterrolebindings.go b/pkg/models/resources/v1alpha3/clusterrolebinding/clusterrolebindings.go index 116af454f..ba52825ca 100644 --- a/pkg/models/resources/v1alpha3/clusterrolebinding/clusterrolebindings.go +++ b/pkg/models/resources/v1alpha3/clusterrolebinding/clusterrolebindings.go @@ -20,6 +20,7 @@ import ( rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/clusterrolebinding/clusterrolebindings_test.go b/pkg/models/resources/v1alpha3/clusterrolebinding/clusterrolebindings_test.go index c4fcb4f90..70e16720f 100644 --- a/pkg/models/resources/v1alpha3/clusterrolebinding/clusterrolebindings_test.go +++ b/pkg/models/resources/v1alpha3/clusterrolebinding/clusterrolebindings_test.go @@ -17,15 +17,17 @@ limitations under the License. package clusterrolebinding import ( + "testing" + "github.com/google/go-cmp/cmp" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListRoles(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/configmap/configmaps.go b/pkg/models/resources/v1alpha3/configmap/configmaps.go index 4457f359d..ccabc24dc 100644 --- a/pkg/models/resources/v1alpha3/configmap/configmaps.go +++ b/pkg/models/resources/v1alpha3/configmap/configmaps.go @@ -20,6 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/configmap/configmaps_test.go b/pkg/models/resources/v1alpha3/configmap/configmaps_test.go index 3089fe193..5fed18c26 100644 --- a/pkg/models/resources/v1alpha3/configmap/configmaps_test.go +++ b/pkg/models/resources/v1alpha3/configmap/configmaps_test.go @@ -17,15 +17,17 @@ limitations under the License. package configmap import ( + "testing" + "github.com/google/go-cmp/cmp" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListConfigMaps(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions.go b/pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions.go index d2d21cd7b..1ce4535b8 100644 --- a/pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions.go +++ b/pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions.go @@ -17,13 +17,15 @@ limitations under the License. package customresourcedefinition import ( + "strings" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions" "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strings" ) type crdGetter struct { diff --git a/pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions_test.go b/pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions_test.go index 0901d294a..ed781a42b 100644 --- a/pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions_test.go +++ b/pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions_test.go @@ -17,15 +17,17 @@ limitations under the License. package customresourcedefinition import ( + "testing" + "github.com/google/go-cmp/cmp" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" fakeapiextensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake" apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" - "testing" ) var crds = []*v1beta1.CustomResourceDefinition{ diff --git a/pkg/models/resources/v1alpha3/daemonset/daemonset.go b/pkg/models/resources/v1alpha3/daemonset/daemonset.go index 41543128d..2ceb800c8 100644 --- a/pkg/models/resources/v1alpha3/daemonset/daemonset.go +++ b/pkg/models/resources/v1alpha3/daemonset/daemonset.go @@ -17,13 +17,15 @@ limitations under the License. package daemonset import ( + "strings" + appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strings" ) const ( diff --git a/pkg/models/resources/v1alpha3/daemonset/daemonset_test.go b/pkg/models/resources/v1alpha3/daemonset/daemonset_test.go index ec0740c91..2ea7b6dd2 100644 --- a/pkg/models/resources/v1alpha3/daemonset/daemonset_test.go +++ b/pkg/models/resources/v1alpha3/daemonset/daemonset_test.go @@ -17,15 +17,17 @@ limitations under the License. package daemonset import ( + "testing" + "github.com/google/go-cmp/cmp" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListDaemonSets(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/dashboard/dashboard.go b/pkg/models/resources/v1alpha3/dashboard/dashboard.go index 207919675..9f419c271 100644 --- a/pkg/models/resources/v1alpha3/dashboard/dashboard.go +++ b/pkg/models/resources/v1alpha3/dashboard/dashboard.go @@ -22,12 +22,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apiserver/query" - "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" monitoringdashboardv1alpha1 "kubesphere.io/monitoring-dashboard/api/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" + + "kubesphere.io/kubesphere/pkg/api" + "kubesphere.io/kubesphere/pkg/apiserver/query" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" ) type dashboardGetter struct { diff --git a/pkg/models/resources/v1alpha3/dashboard/dashboard_test.go b/pkg/models/resources/v1alpha3/dashboard/dashboard_test.go index 051aea32d..57d860305 100644 --- a/pkg/models/resources/v1alpha3/dashboard/dashboard_test.go +++ b/pkg/models/resources/v1alpha3/dashboard/dashboard_test.go @@ -26,11 +26,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog/v2" - "kubesphere.io/kubesphere/pkg/apiserver/query" monitoringdashboardv1alpha1 "kubesphere.io/monitoring-dashboard/api/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" + + "kubesphere.io/kubesphere/pkg/apiserver/query" ) var c client.Client diff --git a/pkg/models/resources/v1alpha3/deployment/deployments.go b/pkg/models/resources/v1alpha3/deployment/deployments.go index 6c89bab32..8bd5b7ae7 100644 --- a/pkg/models/resources/v1alpha3/deployment/deployments.go +++ b/pkg/models/resources/v1alpha3/deployment/deployments.go @@ -17,15 +17,17 @@ limitations under the License. package deployment import ( - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/informers" - "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apiserver/query" - "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" "strings" "time" - "k8s.io/api/apps/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/informers" + + "kubesphere.io/kubesphere/pkg/api" + "kubesphere.io/kubesphere/pkg/apiserver/query" + "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" + + v1 "k8s.io/api/apps/v1" ) const ( diff --git a/pkg/models/resources/v1alpha3/deployment/deployments_test.go b/pkg/models/resources/v1alpha3/deployment/deployments_test.go index daea8b46c..2c72f8dea 100644 --- a/pkg/models/resources/v1alpha3/deployment/deployments_test.go +++ b/pkg/models/resources/v1alpha3/deployment/deployments_test.go @@ -17,15 +17,17 @@ limitations under the License. package deployment import ( + "testing" + "github.com/google/go-cmp/cmp" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListDeployments(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/devops/devops.go b/pkg/models/resources/v1alpha3/devops/devops.go index 22f49136d..d19a2901f 100644 --- a/pkg/models/resources/v1alpha3/devops/devops.go +++ b/pkg/models/resources/v1alpha3/devops/devops.go @@ -18,6 +18,7 @@ package devops import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/federatedapplication/federatedapplications.go b/pkg/models/resources/v1alpha3/federatedapplication/federatedapplications.go index e962eeec1..0b86293c5 100644 --- a/pkg/models/resources/v1alpha3/federatedapplication/federatedapplications.go +++ b/pkg/models/resources/v1alpha3/federatedapplication/federatedapplications.go @@ -18,6 +18,7 @@ package federatedapplication import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/federatedconfigmap/federatedconfigmaps.go b/pkg/models/resources/v1alpha3/federatedconfigmap/federatedconfigmaps.go index 86b42c5c2..499e08f3d 100644 --- a/pkg/models/resources/v1alpha3/federatedconfigmap/federatedconfigmaps.go +++ b/pkg/models/resources/v1alpha3/federatedconfigmap/federatedconfigmaps.go @@ -18,6 +18,7 @@ package federatedconfigmap import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/federateddeployment/federateddeployments.go b/pkg/models/resources/v1alpha3/federateddeployment/federateddeployments.go index 4e08146ee..2e1a1a5ee 100644 --- a/pkg/models/resources/v1alpha3/federateddeployment/federateddeployments.go +++ b/pkg/models/resources/v1alpha3/federateddeployment/federateddeployments.go @@ -18,6 +18,7 @@ package federateddeployment import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/federatedingress/federatedingresses.go b/pkg/models/resources/v1alpha3/federatedingress/federatedingresses.go index 5f41c49a6..396c0cf9d 100644 --- a/pkg/models/resources/v1alpha3/federatedingress/federatedingresses.go +++ b/pkg/models/resources/v1alpha3/federatedingress/federatedingresses.go @@ -17,6 +17,7 @@ package federatedingress import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/federatednamespace/federatednamespaces.go b/pkg/models/resources/v1alpha3/federatednamespace/federatednamespaces.go index cb216e337..a1f5c65dd 100644 --- a/pkg/models/resources/v1alpha3/federatednamespace/federatednamespaces.go +++ b/pkg/models/resources/v1alpha3/federatednamespace/federatednamespaces.go @@ -18,6 +18,7 @@ package federatednamespace import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/federatedpersistentvolumeclaim/federatedpersistentvolumeclaims.go b/pkg/models/resources/v1alpha3/federatedpersistentvolumeclaim/federatedpersistentvolumeclaims.go index 74c9a11db..1f4d6b65e 100644 --- a/pkg/models/resources/v1alpha3/federatedpersistentvolumeclaim/federatedpersistentvolumeclaims.go +++ b/pkg/models/resources/v1alpha3/federatedpersistentvolumeclaim/federatedpersistentvolumeclaims.go @@ -18,6 +18,7 @@ package federatedpersistentvolumeclaim import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/federatedsecret/federatedsecret.go b/pkg/models/resources/v1alpha3/federatedsecret/federatedsecret.go index 011b3dc9f..92cde11d5 100644 --- a/pkg/models/resources/v1alpha3/federatedsecret/federatedsecret.go +++ b/pkg/models/resources/v1alpha3/federatedsecret/federatedsecret.go @@ -17,13 +17,15 @@ limitations under the License. package federatedsecret import ( + "strings" + "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strings" ) type fedSecretGetter struct { diff --git a/pkg/models/resources/v1alpha3/federatedservice/federatedservices.go b/pkg/models/resources/v1alpha3/federatedservice/federatedservices.go index 3ce951dec..ab2175170 100644 --- a/pkg/models/resources/v1alpha3/federatedservice/federatedservices.go +++ b/pkg/models/resources/v1alpha3/federatedservice/federatedservices.go @@ -18,6 +18,7 @@ package federatedservice import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/federatedstatefulset/federatedstatefulsets.go b/pkg/models/resources/v1alpha3/federatedstatefulset/federatedstatefulsets.go index fef5c6f0e..20cb02874 100644 --- a/pkg/models/resources/v1alpha3/federatedstatefulset/federatedstatefulsets.go +++ b/pkg/models/resources/v1alpha3/federatedstatefulset/federatedstatefulsets.go @@ -18,6 +18,7 @@ package federatedstatefulset import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/globalrole/globalroles.go b/pkg/models/resources/v1alpha3/globalrole/globalroles.go index 49633726c..e59c64ff1 100644 --- a/pkg/models/resources/v1alpha3/globalrole/globalroles.go +++ b/pkg/models/resources/v1alpha3/globalrole/globalroles.go @@ -18,9 +18,11 @@ package globalrole import ( "encoding/json" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/globalrole/globalroles_test.go b/pkg/models/resources/v1alpha3/globalrole/globalroles_test.go index 1a2d0f981..a756d02f3 100644 --- a/pkg/models/resources/v1alpha3/globalrole/globalroles_test.go +++ b/pkg/models/resources/v1alpha3/globalrole/globalroles_test.go @@ -17,15 +17,17 @@ limitations under the License. package globalrole import ( + "testing" + "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListGlobalRoles(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings.go b/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings.go index 83d9df077..c6216da53 100644 --- a/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings.go +++ b/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings.go @@ -18,6 +18,7 @@ package globalrolebinding import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings_test.go b/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings_test.go index e5a34e594..5ede15eff 100644 --- a/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings_test.go +++ b/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings_test.go @@ -17,15 +17,17 @@ limitations under the License. package globalrolebinding import ( + "testing" + "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListRoles(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/group/group.go b/pkg/models/resources/v1alpha3/group/group.go index 3c49acc98..fe361705a 100644 --- a/pkg/models/resources/v1alpha3/group/group.go +++ b/pkg/models/resources/v1alpha3/group/group.go @@ -18,6 +18,7 @@ package group import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/group/group_test.go b/pkg/models/resources/v1alpha3/group/group_test.go index b0f643ff8..2229c3b3b 100644 --- a/pkg/models/resources/v1alpha3/group/group_test.go +++ b/pkg/models/resources/v1alpha3/group/group_test.go @@ -21,6 +21,7 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/groupbinding/groupbinding.go b/pkg/models/resources/v1alpha3/groupbinding/groupbinding.go index edee6c72d..c5b117358 100644 --- a/pkg/models/resources/v1alpha3/groupbinding/groupbinding.go +++ b/pkg/models/resources/v1alpha3/groupbinding/groupbinding.go @@ -18,6 +18,7 @@ package groupbinding import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/groupbinding/groupbinding_test.go b/pkg/models/resources/v1alpha3/groupbinding/groupbinding_test.go index 8f30f7665..61b29b114 100644 --- a/pkg/models/resources/v1alpha3/groupbinding/groupbinding_test.go +++ b/pkg/models/resources/v1alpha3/groupbinding/groupbinding_test.go @@ -21,6 +21,7 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/ingress/ingresses.go b/pkg/models/resources/v1alpha3/ingress/ingresses.go index db7f2bdcf..c44a84a3e 100644 --- a/pkg/models/resources/v1alpha3/ingress/ingresses.go +++ b/pkg/models/resources/v1alpha3/ingress/ingresses.go @@ -20,6 +20,7 @@ import ( "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/ingress/ingresses_test.go b/pkg/models/resources/v1alpha3/ingress/ingresses_test.go index cb72dfcab..5ef4f05aa 100644 --- a/pkg/models/resources/v1alpha3/ingress/ingresses_test.go +++ b/pkg/models/resources/v1alpha3/ingress/ingresses_test.go @@ -17,15 +17,17 @@ limitations under the License. package ingress import ( + "testing" + "github.com/google/go-cmp/cmp" "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListIngresses(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/interface.go b/pkg/models/resources/v1alpha3/interface.go index 3dbfb802b..da51178f5 100644 --- a/pkg/models/resources/v1alpha3/interface.go +++ b/pkg/models/resources/v1alpha3/interface.go @@ -17,12 +17,14 @@ limitations under the License. package v1alpha3 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apiserver/query" "sort" "strings" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + + "kubesphere.io/kubesphere/pkg/api" + "kubesphere.io/kubesphere/pkg/apiserver/query" ) type Interface interface { diff --git a/pkg/models/resources/v1alpha3/ippool/ippools.go b/pkg/models/resources/v1alpha3/ippool/ippools.go index 138ac14f4..b6322251a 100644 --- a/pkg/models/resources/v1alpha3/ippool/ippools.go +++ b/pkg/models/resources/v1alpha3/ippool/ippools.go @@ -20,6 +20,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" k8sinformers "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/ippool/ippools_test.go b/pkg/models/resources/v1alpha3/ippool/ippools_test.go index 4ae689ce2..2405259cc 100644 --- a/pkg/models/resources/v1alpha3/ippool/ippools_test.go +++ b/pkg/models/resources/v1alpha3/ippool/ippools_test.go @@ -17,11 +17,14 @@ limitations under the License. package ippool import ( + "testing" + "github.com/google/go-cmp/cmp" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sinformers "k8s.io/client-go/informers" k8sfake "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" @@ -30,7 +33,6 @@ import ( informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListIPPools(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/job/jobs.go b/pkg/models/resources/v1alpha3/job/jobs.go index 3996045b5..521aff4bf 100644 --- a/pkg/models/resources/v1alpha3/job/jobs.go +++ b/pkg/models/resources/v1alpha3/job/jobs.go @@ -17,15 +17,17 @@ limitations under the License. package job import ( + "strings" + "time" + batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strings" - "time" ) const ( diff --git a/pkg/models/resources/v1alpha3/loginrecord/loginrecords.go b/pkg/models/resources/v1alpha3/loginrecord/loginrecords.go index a42328fdc..36c74e688 100644 --- a/pkg/models/resources/v1alpha3/loginrecord/loginrecords.go +++ b/pkg/models/resources/v1alpha3/loginrecord/loginrecords.go @@ -18,6 +18,7 @@ package loginrecord import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/loginrecord/loginrecords_test.go b/pkg/models/resources/v1alpha3/loginrecord/loginrecords_test.go index f0cd4893c..3f01d5cb7 100644 --- a/pkg/models/resources/v1alpha3/loginrecord/loginrecords_test.go +++ b/pkg/models/resources/v1alpha3/loginrecord/loginrecords_test.go @@ -17,15 +17,17 @@ limitations under the License. package loginrecord import ( + "testing" + "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListLoginRecords(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/namespace/namespaces.go b/pkg/models/resources/v1alpha3/namespace/namespaces.go index 6f90090ee..369591da7 100644 --- a/pkg/models/resources/v1alpha3/namespace/namespaces.go +++ b/pkg/models/resources/v1alpha3/namespace/namespaces.go @@ -17,13 +17,15 @@ limitations under the License. package namespace import ( + "strings" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strings" ) type namespacesGetter struct { diff --git a/pkg/models/resources/v1alpha3/networkpolicy/networkpolicies.go b/pkg/models/resources/v1alpha3/networkpolicy/networkpolicies.go index b91056701..514ff5f6f 100644 --- a/pkg/models/resources/v1alpha3/networkpolicy/networkpolicies.go +++ b/pkg/models/resources/v1alpha3/networkpolicy/networkpolicies.go @@ -20,6 +20,7 @@ import ( v1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/networkpolicy/networkpolicies_test.go b/pkg/models/resources/v1alpha3/networkpolicy/networkpolicies_test.go index 31d8e43c8..a628b3f24 100644 --- a/pkg/models/resources/v1alpha3/networkpolicy/networkpolicies_test.go +++ b/pkg/models/resources/v1alpha3/networkpolicy/networkpolicies_test.go @@ -17,15 +17,17 @@ limitations under the License. package networkpolicy import ( + "testing" + "github.com/google/go-cmp/cmp" netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListNetworkPolicies(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/node/nodes.go b/pkg/models/resources/v1alpha3/node/nodes.go index d9fd89f86..ed256fce7 100644 --- a/pkg/models/resources/v1alpha3/node/nodes.go +++ b/pkg/models/resources/v1alpha3/node/nodes.go @@ -18,18 +18,20 @@ package node import ( "fmt" + "sort" + "sync" + "time" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" resourceheper "k8s.io/kubectl/pkg/util/resource" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "sort" - "sync" - "time" ) // Those annotations were added to node only for display purposes diff --git a/pkg/models/resources/v1alpha3/node/nodes_test.go b/pkg/models/resources/v1alpha3/node/nodes_test.go index e53cee418..6464f30e0 100644 --- a/pkg/models/resources/v1alpha3/node/nodes_test.go +++ b/pkg/models/resources/v1alpha3/node/nodes_test.go @@ -17,17 +17,19 @@ limitations under the License. package node import ( + "strconv" + "testing" + "github.com/google/go-cmp/cmp" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strconv" - "testing" ) // mergeResourceLists will merge resoure lists. When two lists have the same resourece, the value from diff --git a/pkg/models/resources/v1alpha3/notification/notification.go b/pkg/models/resources/v1alpha3/notification/notification.go index 47ad0ff30..480ed56ab 100644 --- a/pkg/models/resources/v1alpha3/notification/notification.go +++ b/pkg/models/resources/v1alpha3/notification/notification.go @@ -17,13 +17,15 @@ limitations under the License. package notification import ( + "strings" + "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strings" ) type configGetter struct { diff --git a/pkg/models/resources/v1alpha3/notification/notification_test.go b/pkg/models/resources/v1alpha3/notification/notification_test.go index 6be481afa..828bbe9f3 100644 --- a/pkg/models/resources/v1alpha3/notification/notification_test.go +++ b/pkg/models/resources/v1alpha3/notification/notification_test.go @@ -17,11 +17,16 @@ limitations under the License. package notification import ( + "math/rand" + "sort" + "testing" + "github.com/google/go-cmp/cmp" "github.com/google/uuid" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/cache" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" @@ -29,9 +34,6 @@ import ( ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" "kubesphere.io/kubesphere/pkg/server/errors" - "math/rand" - "sort" - "testing" ) const ( diff --git a/pkg/models/resources/v1alpha3/openpitrix/application/applications.go b/pkg/models/resources/v1alpha3/openpitrix/application/applications.go index 18e9e699a..3153c20ca 100644 --- a/pkg/models/resources/v1alpha3/openpitrix/application/applications.go +++ b/pkg/models/resources/v1alpha3/openpitrix/application/applications.go @@ -16,14 +16,16 @@ limitations under the License. package application import ( + "strings" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strings" ) type helmApplicationsGetter struct { diff --git a/pkg/models/resources/v1alpha3/openpitrix/applicationversion/applicationsversions.go b/pkg/models/resources/v1alpha3/openpitrix/applicationversion/applicationsversions.go index 96ca0f9d8..4a0201c91 100644 --- a/pkg/models/resources/v1alpha3/openpitrix/applicationversion/applicationsversions.go +++ b/pkg/models/resources/v1alpha3/openpitrix/applicationversion/applicationsversions.go @@ -16,14 +16,16 @@ limitations under the License. package applicationversion import ( + "strings" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strings" ) type applicationVersionsGetter struct { diff --git a/pkg/models/resources/v1alpha3/openpitrix/category/category.go b/pkg/models/resources/v1alpha3/openpitrix/category/category.go index 7bb748b28..9fec3861f 100644 --- a/pkg/models/resources/v1alpha3/openpitrix/category/category.go +++ b/pkg/models/resources/v1alpha3/openpitrix/category/category.go @@ -16,14 +16,16 @@ limitations under the License. package category import ( + "strings" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strings" ) type helmCategoriesGetter struct { diff --git a/pkg/models/resources/v1alpha3/openpitrix/helmrelease/releases.go b/pkg/models/resources/v1alpha3/openpitrix/helmrelease/releases.go index 2c23240dd..343533774 100644 --- a/pkg/models/resources/v1alpha3/openpitrix/helmrelease/releases.go +++ b/pkg/models/resources/v1alpha3/openpitrix/helmrelease/releases.go @@ -16,14 +16,16 @@ limitations under the License. package helmrelease import ( + "strings" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strings" ) type helmReleasesGetter struct { diff --git a/pkg/models/resources/v1alpha3/openpitrix/repo/repo.go b/pkg/models/resources/v1alpha3/openpitrix/repo/repo.go index 3fa140e31..6236228fd 100644 --- a/pkg/models/resources/v1alpha3/openpitrix/repo/repo.go +++ b/pkg/models/resources/v1alpha3/openpitrix/repo/repo.go @@ -17,13 +17,15 @@ limitations under the License. package repo import ( + "strings" + "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strings" ) type reposGetter struct { diff --git a/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim.go b/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim.go index f9ae0d2ba..85d57432d 100644 --- a/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim.go +++ b/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim.go @@ -17,16 +17,18 @@ limitations under the License. package persistentvolumeclaim import ( + "strconv" + "strings" + snapshotinformers "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "strconv" - "strings" ) const ( diff --git a/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim_test.go b/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim_test.go index d233e28e2..10719519b 100644 --- a/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim_test.go +++ b/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim_test.go @@ -17,6 +17,8 @@ limitations under the License. package persistentvolumeclaim import ( + "testing" + "github.com/google/go-cmp/cmp" snapshot "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1" snapshotefakeclient "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" @@ -25,10 +27,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) var ( diff --git a/pkg/models/resources/v1alpha3/pod/pods.go b/pkg/models/resources/v1alpha3/pod/pods.go index c4f15594e..2f8893b6a 100644 --- a/pkg/models/resources/v1alpha3/pod/pods.go +++ b/pkg/models/resources/v1alpha3/pod/pods.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/pod/pods_test.go b/pkg/models/resources/v1alpha3/pod/pods_test.go index 959117250..cc861ef54 100644 --- a/pkg/models/resources/v1alpha3/pod/pods_test.go +++ b/pkg/models/resources/v1alpha3/pod/pods_test.go @@ -17,15 +17,17 @@ limitations under the License. package pod import ( + "testing" + "github.com/google/go-cmp/cmp" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListPods(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/resource/resource.go b/pkg/models/resources/v1alpha3/resource/resource.go index f03b05c03..072eb1f3c 100644 --- a/pkg/models/resources/v1alpha3/resource/resource.go +++ b/pkg/models/resources/v1alpha3/resource/resource.go @@ -18,10 +18,14 @@ package resource import ( "errors" + snapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + monitoringdashboardv1alpha1 "kubesphere.io/monitoring-dashboard/api/v1alpha1" + "sigs.k8s.io/controller-runtime/pkg/cache" + "kubesphere.io/kubesphere/pkg/api" clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" @@ -80,8 +84,6 @@ import ( "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/workspacerole" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/workspacerolebinding" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/workspacetemplate" - monitoringdashboardv1alpha1 "kubesphere.io/monitoring-dashboard/api/v1alpha1" - "sigs.k8s.io/controller-runtime/pkg/cache" ) var ErrResourceNotSupported = errors.New("resource is not supported") diff --git a/pkg/models/resources/v1alpha3/resource/resource_test.go b/pkg/models/resources/v1alpha3/resource/resource_test.go index ac6333744..f341f48f2 100644 --- a/pkg/models/resources/v1alpha3/resource/resource_test.go +++ b/pkg/models/resources/v1alpha3/resource/resource_test.go @@ -17,6 +17,8 @@ limitations under the License. package resource import ( + "testing" + "github.com/google/go-cmp/cmp" fakesnapshot "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" fakeistio "istio.io/client-go/pkg/clientset/versioned/fake" @@ -24,11 +26,11 @@ import ( fakeapiextensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakek8s "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/informers" - "testing" ) func TestResourceGetter(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/role/roles.go b/pkg/models/resources/v1alpha3/role/roles.go index ef99ef6fe..3cf69c46a 100644 --- a/pkg/models/resources/v1alpha3/role/roles.go +++ b/pkg/models/resources/v1alpha3/role/roles.go @@ -18,11 +18,13 @@ package role import ( "encoding/json" + rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/role/roles_test.go b/pkg/models/resources/v1alpha3/role/roles_test.go index a45dfbf06..91b32bc43 100644 --- a/pkg/models/resources/v1alpha3/role/roles_test.go +++ b/pkg/models/resources/v1alpha3/role/roles_test.go @@ -17,15 +17,17 @@ limitations under the License. package role import ( + "testing" + "github.com/google/go-cmp/cmp" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListRoles(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/rolebinding/rolebindings.go b/pkg/models/resources/v1alpha3/rolebinding/rolebindings.go index ed43bda65..07fea75b8 100644 --- a/pkg/models/resources/v1alpha3/rolebinding/rolebindings.go +++ b/pkg/models/resources/v1alpha3/rolebinding/rolebindings.go @@ -20,6 +20,7 @@ import ( rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/rolebinding/rolebindings_test.go b/pkg/models/resources/v1alpha3/rolebinding/rolebindings_test.go index 635d7819e..6b6b0dfd9 100644 --- a/pkg/models/resources/v1alpha3/rolebinding/rolebindings_test.go +++ b/pkg/models/resources/v1alpha3/rolebinding/rolebindings_test.go @@ -17,15 +17,17 @@ limitations under the License. package rolebinding import ( + "testing" + "github.com/google/go-cmp/cmp" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListRoles(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/secret/secrets.go b/pkg/models/resources/v1alpha3/secret/secrets.go index 3c2569299..64295fe6a 100644 --- a/pkg/models/resources/v1alpha3/secret/secrets.go +++ b/pkg/models/resources/v1alpha3/secret/secrets.go @@ -19,11 +19,12 @@ package secret import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" ) type secretSearcher struct { diff --git a/pkg/models/resources/v1alpha3/service/services.go b/pkg/models/resources/v1alpha3/service/services.go index 2dd8babb0..79883a62c 100644 --- a/pkg/models/resources/v1alpha3/service/services.go +++ b/pkg/models/resources/v1alpha3/service/services.go @@ -20,6 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/service/services_test.go b/pkg/models/resources/v1alpha3/service/services_test.go index df467c196..40a80c785 100644 --- a/pkg/models/resources/v1alpha3/service/services_test.go +++ b/pkg/models/resources/v1alpha3/service/services_test.go @@ -17,15 +17,17 @@ limitations under the License. package service import ( + "testing" + "github.com/google/go-cmp/cmp" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListServices(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/serviceaccount/serviceaccount.go b/pkg/models/resources/v1alpha3/serviceaccount/serviceaccount.go index f310c6655..b3776de10 100644 --- a/pkg/models/resources/v1alpha3/serviceaccount/serviceaccount.go +++ b/pkg/models/resources/v1alpha3/serviceaccount/serviceaccount.go @@ -20,6 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/serviceaccount/serviceaccount_test.go b/pkg/models/resources/v1alpha3/serviceaccount/serviceaccount_test.go index b1e10f549..20f91503e 100644 --- a/pkg/models/resources/v1alpha3/serviceaccount/serviceaccount_test.go +++ b/pkg/models/resources/v1alpha3/serviceaccount/serviceaccount_test.go @@ -24,6 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/statefulset/statefulsets.go b/pkg/models/resources/v1alpha3/statefulset/statefulsets.go index 84c4736cf..00118f9bb 100644 --- a/pkg/models/resources/v1alpha3/statefulset/statefulsets.go +++ b/pkg/models/resources/v1alpha3/statefulset/statefulsets.go @@ -20,6 +20,7 @@ import ( appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/statefulset/statefulsets_test.go b/pkg/models/resources/v1alpha3/statefulset/statefulsets_test.go index 6f0afa611..4d0f85c1b 100644 --- a/pkg/models/resources/v1alpha3/statefulset/statefulsets_test.go +++ b/pkg/models/resources/v1alpha3/statefulset/statefulsets_test.go @@ -17,15 +17,17 @@ limitations under the License. package statefulset import ( + "testing" + "github.com/google/go-cmp/cmp" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListStatefulSets(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/user/users.go b/pkg/models/resources/v1alpha3/user/users.go index a50dac399..715303cad 100644 --- a/pkg/models/resources/v1alpha3/user/users.go +++ b/pkg/models/resources/v1alpha3/user/users.go @@ -22,6 +22,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" k8sinformers "k8s.io/client-go/informers" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" diff --git a/pkg/models/resources/v1alpha3/user/users_test.go b/pkg/models/resources/v1alpha3/user/users_test.go index c901a6d21..46ab0055f 100644 --- a/pkg/models/resources/v1alpha3/user/users_test.go +++ b/pkg/models/resources/v1alpha3/user/users_test.go @@ -17,15 +17,17 @@ limitations under the License. package user import ( + "testing" + "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListUsers(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot.go b/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot.go index 3520b281e..0da51657f 100644 --- a/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot.go +++ b/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot.go @@ -20,6 +20,7 @@ import ( "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1" "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot_test.go b/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot_test.go index ef8e3573e..b6cfa27b5 100644 --- a/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot_test.go +++ b/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot_test.go @@ -18,15 +18,17 @@ package volumesnapshot import ( "encoding/json" + "testing" + "time" + "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1" "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/apiserver/query" - "testing" - "time" ) const ( diff --git a/pkg/models/resources/v1alpha3/workspace/workspaces.go b/pkg/models/resources/v1alpha3/workspace/workspaces.go index 949a66909..08d3d72fe 100644 --- a/pkg/models/resources/v1alpha3/workspace/workspaces.go +++ b/pkg/models/resources/v1alpha3/workspace/workspaces.go @@ -18,6 +18,7 @@ package workspace import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/workspace/workspaces_test.go b/pkg/models/resources/v1alpha3/workspace/workspaces_test.go index 3d162c221..6c40d58e5 100644 --- a/pkg/models/resources/v1alpha3/workspace/workspaces_test.go +++ b/pkg/models/resources/v1alpha3/workspace/workspaces_test.go @@ -17,15 +17,17 @@ limitations under the License. package workspace import ( + "testing" + "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListWorkspaces(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/workspacerole/workspaceroles.go b/pkg/models/resources/v1alpha3/workspacerole/workspaceroles.go index b6a30df0b..640d5f5df 100644 --- a/pkg/models/resources/v1alpha3/workspacerole/workspaceroles.go +++ b/pkg/models/resources/v1alpha3/workspacerole/workspaceroles.go @@ -18,9 +18,11 @@ package workspacerole import ( "encoding/json" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" diff --git a/pkg/models/resources/v1alpha3/workspacerole/workspaceroles_test.go b/pkg/models/resources/v1alpha3/workspacerole/workspaceroles_test.go index a1c8da77c..ffe1b3670 100644 --- a/pkg/models/resources/v1alpha3/workspacerole/workspaceroles_test.go +++ b/pkg/models/resources/v1alpha3/workspacerole/workspaceroles_test.go @@ -17,15 +17,17 @@ limitations under the License. package workspacerole import ( + "testing" + "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListWorkspaceRoles(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings.go b/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings.go index cfea258be..fcfd076ae 100644 --- a/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings.go +++ b/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings.go @@ -18,6 +18,7 @@ package workspacerolebinding import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings_test.go b/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings_test.go index 483f3c680..96dc6241d 100644 --- a/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings_test.go +++ b/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings_test.go @@ -17,15 +17,17 @@ limitations under the License. package workspacerolebinding import ( + "testing" + "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListRoles(t *testing.T) { diff --git a/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates.go b/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates.go index 9fcca5885..78b44c1d1 100644 --- a/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates.go +++ b/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates.go @@ -18,6 +18,7 @@ package workspacetemplate import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/kubesphere/pkg/api" tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates_test.go b/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates_test.go index bb1aefb62..98ad3aedb 100644 --- a/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates_test.go +++ b/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates_test.go @@ -17,15 +17,17 @@ limitations under the License. package workspacetemplate import ( + "testing" + "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" - "testing" ) func TestListWorkspaces(t *testing.T) { diff --git a/pkg/models/revisions/revisions.go b/pkg/models/revisions/revisions.go index ab0a55443..7047709dd 100644 --- a/pkg/models/revisions/revisions.go +++ b/pkg/models/revisions/revisions.go @@ -18,10 +18,11 @@ package revisions import ( "fmt" + "k8s.io/client-go/informers" "k8s.io/klog" - "k8s.io/api/apps/v1" + v1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/labels" ) diff --git a/pkg/models/routers/routers.go b/pkg/models/routers/routers.go index de05a6c90..f27063825 100644 --- a/pkg/models/routers/routers.go +++ b/pkg/models/routers/routers.go @@ -20,6 +20,9 @@ import ( "context" "fmt" "io/ioutil" + "sort" + "strings" + v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -30,8 +33,6 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog" - "sort" - "strings" ) // choose router node ip by labels, currently select master node diff --git a/pkg/models/storage/storage.go b/pkg/models/storage/storage.go index 9fd96dc0c..6cd22b57e 100644 --- a/pkg/models/storage/storage.go +++ b/pkg/models/storage/storage.go @@ -17,10 +17,11 @@ limitations under the License. package storage import ( - "k8s.io/client-go/informers" "strconv" - "k8s.io/api/core/v1" + "k8s.io/client-go/informers" + + v1 "k8s.io/api/core/v1" storageV1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/models/tenant/devops.go b/pkg/models/tenant/devops.go index 3c3f92a0f..c8447a50b 100644 --- a/pkg/models/tenant/devops.go +++ b/pkg/models/tenant/devops.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" diff --git a/pkg/models/tenant/metering.go b/pkg/models/tenant/metering.go index 0094362d5..427845305 100644 --- a/pkg/models/tenant/metering.go +++ b/pkg/models/tenant/metering.go @@ -3,19 +3,21 @@ package tenant import ( "context" "fmt" - "kubesphere.io/kubesphere/pkg/constants" - "kubesphere.io/kubesphere/pkg/models/metering" "regexp" "strconv" "strings" "time" + "kubesphere.io/kubesphere/pkg/constants" + "kubesphere.io/kubesphere/pkg/models/metering" + "github.com/pkg/errors" appv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" meteringv1alpha1 "kubesphere.io/kubesphere/pkg/api/metering/v1alpha1" tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" diff --git a/pkg/models/tenant/resourcequota.go b/pkg/models/tenant/resourcequota.go index 22272ed95..e11c54df5 100644 --- a/pkg/models/tenant/resourcequota.go +++ b/pkg/models/tenant/resourcequota.go @@ -20,9 +20,11 @@ package tenant import ( "context" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" ) diff --git a/pkg/models/tenant/tenant.go b/pkg/models/tenant/tenant.go index 731d3492c..2d5808057 100644 --- a/pkg/models/tenant/tenant.go +++ b/pkg/models/tenant/tenant.go @@ -33,6 +33,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/client-go/kubernetes" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/api" auditingv1alpha1 "kubesphere.io/kubesphere/pkg/api/auditing/v1alpha1" eventsv1alpha1 "kubesphere.io/kubesphere/pkg/api/events/v1alpha1" diff --git a/pkg/models/tenant/tenent_test.go b/pkg/models/tenant/tenent_test.go index 2f31eecc4..2e2ac6654 100644 --- a/pkg/models/tenant/tenent_test.go +++ b/pkg/models/tenant/tenent_test.go @@ -17,6 +17,9 @@ limitations under the License. package tenant import ( + "reflect" + "testing" + "github.com/google/go-cmp/cmp" fakeistio "istio.io/client-go/pkg/clientset/versioned/fake" corev1 "k8s.io/api/core/v1" @@ -26,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authentication/user" fakek8s "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" @@ -35,8 +39,6 @@ import ( fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/models/iam/am" - "reflect" - "testing" ) func TestTenantOperator_ListWorkspaces(t *testing.T) { diff --git a/pkg/models/terminal/terminal.go b/pkg/models/terminal/terminal.go index 212c21425..dd5dff3bb 100644 --- a/pkg/models/terminal/terminal.go +++ b/pkg/models/terminal/terminal.go @@ -23,15 +23,16 @@ package terminal import ( "encoding/json" "fmt" - "github.com/gorilla/websocket" "io" - "k8s.io/api/core/v1" + "time" + + "github.com/gorilla/websocket" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" "k8s.io/klog" - "time" ) const ( diff --git a/pkg/models/workloads/jobs.go b/pkg/models/workloads/jobs.go index 2112aa219..ac99abb7b 100644 --- a/pkg/models/workloads/jobs.go +++ b/pkg/models/workloads/jobs.go @@ -19,14 +19,15 @@ package workloads import ( "context" "fmt" - "k8s.io/api/batch/v1" + "strings" + "time" + + v1 "k8s.io/api/batch/v1" k8serr "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" "k8s.io/klog" - "strings" - "time" ) const retryTimes = 3 diff --git a/pkg/server/errors/errors.go b/pkg/server/errors/errors.go index 9c50fbbfd..7bc0ebb45 100644 --- a/pkg/server/errors/errors.go +++ b/pkg/server/errors/errors.go @@ -18,8 +18,9 @@ package errors import ( "fmt" - "github.com/emicklei/go-restful" "net/http" + + "github.com/emicklei/go-restful" ) type Error struct { diff --git a/pkg/server/options/options.go b/pkg/server/options/options.go index f8575c51d..6b592da9d 100644 --- a/pkg/server/options/options.go +++ b/pkg/server/options/options.go @@ -18,9 +18,11 @@ package options import ( "fmt" - "github.com/spf13/pflag" - "kubesphere.io/kubesphere/pkg/utils/net" "os" + + "github.com/spf13/pflag" + + "kubesphere.io/kubesphere/pkg/utils/net" ) type ServerRunOptions struct { diff --git a/pkg/server/params/params.go b/pkg/server/params/params.go index f8712bed0..0f33e90be 100644 --- a/pkg/server/params/params.go +++ b/pkg/server/params/params.go @@ -18,10 +18,11 @@ package params import ( "fmt" - "github.com/emicklei/go-restful" "regexp" "strconv" "strings" + + "github.com/emicklei/go-restful" ) const ( diff --git a/pkg/server/params/params_test.go b/pkg/server/params/params_test.go index 7fc09e86f..33c60d6a9 100644 --- a/pkg/server/params/params_test.go +++ b/pkg/server/params/params_test.go @@ -17,12 +17,13 @@ limitations under the License. package params import ( - "gotest.tools/assert" "net/http" "net/url" "reflect" "testing" + "gotest.tools/assert" + "github.com/emicklei/go-restful" ) diff --git a/pkg/simple/client/alerting/options.go b/pkg/simple/client/alerting/options.go index c8a419e92..dd301e262 100644 --- a/pkg/simple/client/alerting/options.go +++ b/pkg/simple/client/alerting/options.go @@ -21,6 +21,7 @@ import ( "strings" "github.com/spf13/pflag" + "kubesphere.io/kubesphere/pkg/utils/reflectutils" ) diff --git a/pkg/simple/client/alerting/rule_client.go b/pkg/simple/client/alerting/rule_client.go index e0d82b1b4..a51275653 100644 --- a/pkg/simple/client/alerting/rule_client.go +++ b/pkg/simple/client/alerting/rule_client.go @@ -4,8 +4,9 @@ import ( "context" "encoding/json" "fmt" - "github.com/pkg/errors" "net/http" + + "github.com/pkg/errors" ) import "github.com/prometheus/client_golang/api" diff --git a/pkg/simple/client/auditing/elasticsearch/elasticsearch.go b/pkg/simple/client/auditing/elasticsearch/elasticsearch.go index 2ea556efc..5e46b6cea 100644 --- a/pkg/simple/client/auditing/elasticsearch/elasticsearch.go +++ b/pkg/simple/client/auditing/elasticsearch/elasticsearch.go @@ -18,7 +18,9 @@ package elasticsearch import ( "fmt" - "github.com/json-iterator/go" + + jsoniter "github.com/json-iterator/go" + "kubesphere.io/kubesphere/pkg/simple/client/auditing" "kubesphere.io/kubesphere/pkg/simple/client/es" "kubesphere.io/kubesphere/pkg/simple/client/es/query" diff --git a/pkg/simple/client/auditing/elasticsearch/elasticsearch_test.go b/pkg/simple/client/auditing/elasticsearch/elasticsearch_test.go index a1270d074..125d5a30e 100644 --- a/pkg/simple/client/auditing/elasticsearch/elasticsearch_test.go +++ b/pkg/simple/client/auditing/elasticsearch/elasticsearch_test.go @@ -17,14 +17,16 @@ limitations under the License. package elasticsearch import ( - "github.com/google/go-cmp/cmp" - "github.com/stretchr/testify/assert" - "kubesphere.io/kubesphere/pkg/simple/client/auditing" "net/http" "net/http/httptest" "strings" "testing" "time" + + "github.com/google/go-cmp/cmp" + "github.com/stretchr/testify/assert" + + "kubesphere.io/kubesphere/pkg/simple/client/auditing" ) func MockElasticsearchService(pattern string, fakeCode int, fakeResp string) *httptest.Server { diff --git a/pkg/simple/client/auditing/options.go b/pkg/simple/client/auditing/options.go index bd3f2ee25..c12359a23 100644 --- a/pkg/simple/client/auditing/options.go +++ b/pkg/simple/client/auditing/options.go @@ -17,9 +17,11 @@ limitations under the License. package auditing import ( - "github.com/spf13/pflag" - "kubesphere.io/kubesphere/pkg/utils/reflectutils" "time" + + "github.com/spf13/pflag" + + "kubesphere.io/kubesphere/pkg/utils/reflectutils" ) type Options struct { diff --git a/pkg/simple/client/cache/options.go b/pkg/simple/client/cache/options.go index 3590acbc6..a9f0bb50d 100644 --- a/pkg/simple/client/cache/options.go +++ b/pkg/simple/client/cache/options.go @@ -18,6 +18,7 @@ package cache import ( "fmt" + "github.com/spf13/pflag" ) diff --git a/pkg/simple/client/cache/redis.go b/pkg/simple/client/cache/redis.go index a98d0a038..77877afd5 100644 --- a/pkg/simple/client/cache/redis.go +++ b/pkg/simple/client/cache/redis.go @@ -18,9 +18,10 @@ package cache import ( "fmt" + "time" + "github.com/go-redis/redis" "k8s.io/klog" - "time" ) type Client struct { diff --git a/pkg/simple/client/cache/simple_cache.go b/pkg/simple/client/cache/simple_cache.go index ab60198ff..8b9922fb3 100644 --- a/pkg/simple/client/cache/simple_cache.go +++ b/pkg/simple/client/cache/simple_cache.go @@ -17,10 +17,11 @@ limitations under the License. package cache import ( - "kubesphere.io/kubesphere/pkg/server/errors" "regexp" "strings" "time" + + "kubesphere.io/kubesphere/pkg/server/errors" ) var ErrNoSuchKey = errors.New("no such key") diff --git a/pkg/simple/client/cache/simple_cache_test.go b/pkg/simple/client/cache/simple_cache_test.go index 4b2ec73ae..c444364e6 100644 --- a/pkg/simple/client/cache/simple_cache_test.go +++ b/pkg/simple/client/cache/simple_cache_test.go @@ -17,10 +17,11 @@ limitations under the License. package cache import ( - "github.com/google/go-cmp/cmp" - "k8s.io/apimachinery/pkg/util/sets" "testing" "time" + + "github.com/google/go-cmp/cmp" + "k8s.io/apimachinery/pkg/util/sets" ) var dataSet = map[string]string{ diff --git a/pkg/simple/client/devops/fake/fakedevops.go b/pkg/simple/client/devops/fake/fakedevops.go index 994f9642c..25fa6b830 100644 --- a/pkg/simple/client/devops/fake/fakedevops.go +++ b/pkg/simple/client/devops/fake/fakedevops.go @@ -18,14 +18,16 @@ package fake import ( "fmt" - "github.com/emicklei/go-restful" "io/ioutil" - v1 "k8s.io/api/core/v1" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" - "kubesphere.io/kubesphere/pkg/simple/client/devops" "net/http" "net/url" "strings" + + "github.com/emicklei/go-restful" + v1 "k8s.io/api/core/v1" + + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) type Devops struct { diff --git a/pkg/simple/client/devops/interface.go b/pkg/simple/client/devops/interface.go index eaf866743..71b9b08da 100644 --- a/pkg/simple/client/devops/interface.go +++ b/pkg/simple/client/devops/interface.go @@ -18,9 +18,10 @@ package devops import ( "fmt" - "github.com/asaskevich/govalidator" "net/http" "strconv" + + "github.com/asaskevich/govalidator" ) type Interface interface { diff --git a/pkg/simple/client/devops/jenkins/build.go b/pkg/simple/client/devops/jenkins/build.go index 8c97777c8..830d60400 100644 --- a/pkg/simple/client/devops/jenkins/build.go +++ b/pkg/simple/client/devops/jenkins/build.go @@ -17,12 +17,14 @@ package jenkins import ( "bytes" "errors" - "github.com/emicklei/go-restful" - "kubesphere.io/kubesphere/pkg/simple/client/devops" "net/http" "net/url" "strconv" "time" + + "github.com/emicklei/go-restful" + + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) const ( diff --git a/pkg/simple/client/devops/jenkins/credential.go b/pkg/simple/client/devops/jenkins/credential.go index 85cc7fa68..4c0fd9637 100644 --- a/pkg/simple/client/devops/jenkins/credential.go +++ b/pkg/simple/client/devops/jenkins/credential.go @@ -16,13 +16,15 @@ package jenkins import ( "errors" "fmt" + "net/http" + "strconv" + "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" "k8s.io/klog" + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/simple/client/devops" - "net/http" - "strconv" ) const SSHCrenditalStaplerClass = "com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey" diff --git a/pkg/simple/client/devops/jenkins/credential_test.go b/pkg/simple/client/devops/jenkins/credential_test.go index f252eee99..6fd469b9d 100644 --- a/pkg/simple/client/devops/jenkins/credential_test.go +++ b/pkg/simple/client/devops/jenkins/credential_test.go @@ -17,9 +17,10 @@ limitations under the License. package jenkins import ( + "testing" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "testing" ) func TestNewUsernamePasswordCredential(t *testing.T) { diff --git a/pkg/simple/client/devops/jenkins/internal/bitbucket.go b/pkg/simple/client/devops/jenkins/internal/bitbucket.go index 6a0378d41..a361ace24 100644 --- a/pkg/simple/client/devops/jenkins/internal/bitbucket.go +++ b/pkg/simple/client/devops/jenkins/internal/bitbucket.go @@ -1,11 +1,12 @@ package internal import ( - "github.com/beevik/etree" - "k8s.io/klog" "strconv" "strings" + "github.com/beevik/etree" + "k8s.io/klog" + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" ) diff --git a/pkg/simple/client/devops/jenkins/internal/git.go b/pkg/simple/client/devops/jenkins/internal/git.go index cf18965fb..48ca6f30d 100644 --- a/pkg/simple/client/devops/jenkins/internal/git.go +++ b/pkg/simple/client/devops/jenkins/internal/git.go @@ -1,10 +1,12 @@ package internal import ( + "strconv" + "github.com/beevik/etree" "k8s.io/klog" + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" - "strconv" ) func AppendGitSourceToEtree(source *etree.Element, gitSource *devopsv1alpha3.GitSource) { diff --git a/pkg/simple/client/devops/jenkins/internal/github.go b/pkg/simple/client/devops/jenkins/internal/github.go index 1a4fb1e17..7b539b60a 100644 --- a/pkg/simple/client/devops/jenkins/internal/github.go +++ b/pkg/simple/client/devops/jenkins/internal/github.go @@ -1,11 +1,13 @@ package internal import ( - "github.com/beevik/etree" - "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "strconv" "strings" + + "github.com/beevik/etree" + "k8s.io/klog" + + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" ) func AppendGithubSourceToEtree(source *etree.Element, githubSource *devopsv1alpha3.GithubSource) { diff --git a/pkg/simple/client/devops/jenkins/internal/gitlab.go b/pkg/simple/client/devops/jenkins/internal/gitlab.go index d37ffea5f..3a09d964e 100644 --- a/pkg/simple/client/devops/jenkins/internal/gitlab.go +++ b/pkg/simple/client/devops/jenkins/internal/gitlab.go @@ -1,11 +1,13 @@ package internal import ( - "github.com/beevik/etree" - "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "strconv" "strings" + + "github.com/beevik/etree" + "k8s.io/klog" + + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" ) func AppendGitlabSourceToEtree(source *etree.Element, gitSource *devopsv1alpha3.GitlabSource) { diff --git a/pkg/simple/client/devops/jenkins/internal/pull_request_test.go b/pkg/simple/client/devops/jenkins/internal/pull_request_test.go index 04e15a516..fd9907dbb 100644 --- a/pkg/simple/client/devops/jenkins/internal/pull_request_test.go +++ b/pkg/simple/client/devops/jenkins/internal/pull_request_test.go @@ -1,8 +1,9 @@ package internal import ( - "github.com/stretchr/testify/assert" "testing" + + "github.com/stretchr/testify/assert" ) func TestPRDiscoverTrust(t *testing.T) { diff --git a/pkg/simple/client/devops/jenkins/jenkins.go b/pkg/simple/client/devops/jenkins/jenkins.go index 4c25efad3..ba671bc01 100644 --- a/pkg/simple/client/devops/jenkins/jenkins.go +++ b/pkg/simple/client/devops/jenkins/jenkins.go @@ -21,8 +21,6 @@ import ( "fmt" "io" "io/ioutil" - "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/simple/client/devops" "log" "net/http" "net/url" @@ -30,6 +28,10 @@ import ( "reflect" "strconv" "strings" + + "k8s.io/klog" + + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) // Basic Authentication diff --git a/pkg/simple/client/devops/jenkins/job.go b/pkg/simple/client/devops/jenkins/job.go index 413cd3966..33dfda3e8 100644 --- a/pkg/simple/client/devops/jenkins/job.go +++ b/pkg/simple/client/devops/jenkins/job.go @@ -19,11 +19,12 @@ import ( "encoding/json" "errors" "fmt" - "kubesphere.io/kubesphere/pkg/simple/client/devops" "net/url" "path" "strconv" "strings" + + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) type Job struct { diff --git a/pkg/simple/client/devops/jenkins/options.go b/pkg/simple/client/devops/jenkins/options.go index bf322f610..451a600d5 100644 --- a/pkg/simple/client/devops/jenkins/options.go +++ b/pkg/simple/client/devops/jenkins/options.go @@ -18,7 +18,9 @@ package jenkins import ( "fmt" + "github.com/spf13/pflag" + "kubesphere.io/kubesphere/pkg/utils/reflectutils" ) diff --git a/pkg/simple/client/devops/jenkins/pipeline.go b/pkg/simple/client/devops/jenkins/pipeline.go index c830892bb..c1d89c304 100644 --- a/pkg/simple/client/devops/jenkins/pipeline.go +++ b/pkg/simple/client/devops/jenkins/pipeline.go @@ -20,14 +20,16 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/PuerkitoBio/goquery" - "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/simple/client/devops" "net/http" "net/url" "strconv" "strings" "time" + + "github.com/PuerkitoBio/goquery" + "k8s.io/klog" + + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) type Pipeline struct { diff --git a/pkg/simple/client/devops/jenkins/pipeline_internal.go b/pkg/simple/client/devops/jenkins/pipeline_internal.go index 882ec6225..7e0d47fff 100644 --- a/pkg/simple/client/devops/jenkins/pipeline_internal.go +++ b/pkg/simple/client/devops/jenkins/pipeline_internal.go @@ -18,12 +18,14 @@ package jenkins import ( "fmt" - "github.com/beevik/etree" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" - "kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins/internal" "strconv" "strings" "time" + + "github.com/beevik/etree" + + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins/internal" ) func replaceXmlVersion(config, oldVersion, targetVersion string) string { diff --git a/pkg/simple/client/devops/jenkins/pipeline_internal_test.go b/pkg/simple/client/devops/jenkins/pipeline_internal_test.go index 1dbd847d1..82b469f4e 100644 --- a/pkg/simple/client/devops/jenkins/pipeline_internal_test.go +++ b/pkg/simple/client/devops/jenkins/pipeline_internal_test.go @@ -17,9 +17,10 @@ limitations under the License. package jenkins import ( - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "reflect" "testing" + + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" ) func Test_NoScmPipelineConfig(t *testing.T) { diff --git a/pkg/simple/client/devops/jenkins/pipeline_test.go b/pkg/simple/client/devops/jenkins/pipeline_test.go index ca4bca6e3..26922fb34 100644 --- a/pkg/simple/client/devops/jenkins/pipeline_test.go +++ b/pkg/simple/client/devops/jenkins/pipeline_test.go @@ -2,11 +2,13 @@ package jenkins import ( "fmt" - "github.com/stretchr/testify/assert" - "kubesphere.io/kubesphere/pkg/simple/client/devops" "net/url" "strconv" "testing" + + "github.com/stretchr/testify/assert" + + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) func TestResetPaging(t *testing.T) { diff --git a/pkg/simple/client/devops/jenkins/project.go b/pkg/simple/client/devops/jenkins/project.go index 31939cd17..31cd36b7b 100644 --- a/pkg/simple/client/devops/jenkins/project.go +++ b/pkg/simple/client/devops/jenkins/project.go @@ -19,6 +19,7 @@ package jenkins import ( "github.com/emicklei/go-restful" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) diff --git a/pkg/simple/client/devops/jenkins/project_pipeline.go b/pkg/simple/client/devops/jenkins/project_pipeline.go index a4c2f2cd4..6b38a3e8c 100644 --- a/pkg/simple/client/devops/jenkins/project_pipeline.go +++ b/pkg/simple/client/devops/jenkins/project_pipeline.go @@ -18,11 +18,13 @@ package jenkins import ( "fmt" + "net/http" + "github.com/emicklei/go-restful" "k8s.io/klog" + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/simple/client/devops" - "net/http" ) func (j *Jenkins) CreateProjectPipeline(projectId string, pipeline *devopsv1alpha3.Pipeline) (string, error) { diff --git a/pkg/simple/client/devops/jenkins/pure_request.go b/pkg/simple/client/devops/jenkins/pure_request.go index 875cf67b7..0638d65a7 100644 --- a/pkg/simple/client/devops/jenkins/pure_request.go +++ b/pkg/simple/client/devops/jenkins/pure_request.go @@ -17,11 +17,13 @@ limitations under the License. package jenkins import ( - "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/simple/client/devops" "net/http" "net/url" "time" + + "k8s.io/klog" + + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) // TODO: deprecated, use SendJenkinsRequestWithHeaderResp() instead diff --git a/pkg/simple/client/devops/jenkins/request.go b/pkg/simple/client/devops/jenkins/request.go index 6addc258d..ac381fbb6 100644 --- a/pkg/simple/client/devops/jenkins/request.go +++ b/pkg/simple/client/devops/jenkins/request.go @@ -20,17 +20,19 @@ import ( "encoding/json" "errors" "fmt" - "github.com/dgrijalva/jwt-go" "io" "io/ioutil" - authtoken "kubesphere.io/kubesphere/pkg/apiserver/authentication/token" - "kubesphere.io/kubesphere/pkg/simple/client/devops" "mime/multipart" "net/http" "net/url" "os" "path/filepath" "strings" + + "github.com/dgrijalva/jwt-go" + + authtoken "kubesphere.io/kubesphere/pkg/apiserver/authentication/token" + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) // Request Methods diff --git a/pkg/simple/client/devops/jenkins/role.go b/pkg/simple/client/devops/jenkins/role.go index 7fd8825ea..b76879433 100644 --- a/pkg/simple/client/devops/jenkins/role.go +++ b/pkg/simple/client/devops/jenkins/role.go @@ -18,11 +18,12 @@ package jenkins import ( "errors" - "kubesphere.io/kubesphere/pkg/simple/client/devops" "net/http" "reflect" "strconv" "strings" + + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) type GlobalRoleResponse struct { diff --git a/pkg/simple/client/devops/jenkins/utils.go b/pkg/simple/client/devops/jenkins/utils.go index 1987f778b..1b040f5de 100644 --- a/pkg/simple/client/devops/jenkins/utils.go +++ b/pkg/simple/client/devops/jenkins/utils.go @@ -19,12 +19,13 @@ import ( "encoding/json" "io" "io/ioutil" - "k8s.io/klog" "net/http" "net/url" "strings" "time" "unicode/utf8" + + "k8s.io/klog" ) func makeJson(data interface{}) string { diff --git a/pkg/simple/client/devops/jenkins/utils_test.go b/pkg/simple/client/devops/jenkins/utils_test.go index e29379d68..0acc08800 100644 --- a/pkg/simple/client/devops/jenkins/utils_test.go +++ b/pkg/simple/client/devops/jenkins/utils_test.go @@ -1,9 +1,10 @@ package jenkins import ( - "github.com/stretchr/testify/assert" "net/url" "testing" + + "github.com/stretchr/testify/assert" ) func TestParseJenkinsQuery(t *testing.T) { diff --git a/pkg/simple/client/devops/pipeline_test.go b/pkg/simple/client/devops/pipeline_test.go index 92b9e5e8e..c33210fa5 100644 --- a/pkg/simple/client/devops/pipeline_test.go +++ b/pkg/simple/client/devops/pipeline_test.go @@ -2,8 +2,9 @@ package devops import ( "fmt" - "gotest.tools/assert" "testing" + + "gotest.tools/assert" ) func TestGetSubmitters(t *testing.T) { diff --git a/pkg/simple/client/es/client.go b/pkg/simple/client/es/client.go index 41e8dbe4b..4e84add26 100644 --- a/pkg/simple/client/es/client.go +++ b/pkg/simple/client/es/client.go @@ -19,16 +19,18 @@ package es import ( "context" "fmt" - "github.com/json-iterator/go" - "kubesphere.io/kubesphere/pkg/simple/client/es/query" - "kubesphere.io/kubesphere/pkg/simple/client/es/versions" - "kubesphere.io/kubesphere/pkg/simple/client/es/versions/v5" - "kubesphere.io/kubesphere/pkg/simple/client/es/versions/v6" - "kubesphere.io/kubesphere/pkg/simple/client/es/versions/v7" - "kubesphere.io/kubesphere/pkg/utils/esutil" "strings" "sync" "time" + + jsoniter "github.com/json-iterator/go" + + "kubesphere.io/kubesphere/pkg/simple/client/es/query" + "kubesphere.io/kubesphere/pkg/simple/client/es/versions" + v5 "kubesphere.io/kubesphere/pkg/simple/client/es/versions/v5" + v6 "kubesphere.io/kubesphere/pkg/simple/client/es/versions/v6" + v7 "kubesphere.io/kubesphere/pkg/simple/client/es/versions/v7" + "kubesphere.io/kubesphere/pkg/utils/esutil" ) const ( diff --git a/pkg/simple/client/es/client_test.go b/pkg/simple/client/es/client_test.go index 67534ea6e..059366839 100644 --- a/pkg/simple/client/es/client_test.go +++ b/pkg/simple/client/es/client_test.go @@ -18,14 +18,16 @@ package es import ( "fmt" - "github.com/google/go-cmp/cmp" - "github.com/json-iterator/go" "io/ioutil" - "kubesphere.io/kubesphere/pkg/simple/client/es/query" "net/http" "net/http/httptest" "testing" "time" + + "github.com/google/go-cmp/cmp" + jsoniter "github.com/json-iterator/go" + + "kubesphere.io/kubesphere/pkg/simple/client/es/query" ) func TestNewClient(t *testing.T) { diff --git a/pkg/simple/client/es/query/builder.go b/pkg/simple/client/es/query/builder.go index 27a4fa1b2..8376314b1 100644 --- a/pkg/simple/client/es/query/builder.go +++ b/pkg/simple/client/es/query/builder.go @@ -1,8 +1,9 @@ package query import ( - "github.com/json-iterator/go" "reflect" + + jsoniter "github.com/json-iterator/go" ) // TODO: elastic/go-elasticsearch is working on Query DSL support. diff --git a/pkg/simple/client/es/response.go b/pkg/simple/client/es/response.go index 946cb7f41..0cf81857d 100644 --- a/pkg/simple/client/es/response.go +++ b/pkg/simple/client/es/response.go @@ -1,7 +1,7 @@ package es import ( - "github.com/json-iterator/go" + jsoniter "github.com/json-iterator/go" "k8s.io/klog" ) diff --git a/pkg/simple/client/es/versions/v5/v5.go b/pkg/simple/client/es/versions/v5/v5.go index d3dda6114..5ff02f43b 100644 --- a/pkg/simple/client/es/versions/v5/v5.go +++ b/pkg/simple/client/es/versions/v5/v5.go @@ -21,10 +21,11 @@ import ( "context" "encoding/json" "fmt" - "github.com/elastic/go-elasticsearch/v5" - "github.com/elastic/go-elasticsearch/v5/esapi" "io/ioutil" "time" + + "github.com/elastic/go-elasticsearch/v5" + "github.com/elastic/go-elasticsearch/v5/esapi" ) type Elastic struct { diff --git a/pkg/simple/client/es/versions/v6/v6.go b/pkg/simple/client/es/versions/v6/v6.go index fb4d49683..0f92d60ba 100644 --- a/pkg/simple/client/es/versions/v6/v6.go +++ b/pkg/simple/client/es/versions/v6/v6.go @@ -21,10 +21,11 @@ import ( "context" "encoding/json" "fmt" - "github.com/elastic/go-elasticsearch/v6" - "github.com/elastic/go-elasticsearch/v6/esapi" "io/ioutil" "time" + + "github.com/elastic/go-elasticsearch/v6" + "github.com/elastic/go-elasticsearch/v6/esapi" ) type Elastic struct { diff --git a/pkg/simple/client/es/versions/v7/v7.go b/pkg/simple/client/es/versions/v7/v7.go index 050b1dbed..cd8509090 100644 --- a/pkg/simple/client/es/versions/v7/v7.go +++ b/pkg/simple/client/es/versions/v7/v7.go @@ -21,10 +21,11 @@ import ( "context" "encoding/json" "fmt" - "github.com/elastic/go-elasticsearch/v7" - "github.com/elastic/go-elasticsearch/v7/esapi" "io/ioutil" "time" + + "github.com/elastic/go-elasticsearch/v7" + "github.com/elastic/go-elasticsearch/v7/esapi" ) type Elastic struct { diff --git a/pkg/simple/client/events/elasticsearch/elasticsearch.go b/pkg/simple/client/events/elasticsearch/elasticsearch.go index c990adf8b..c829f3bde 100644 --- a/pkg/simple/client/events/elasticsearch/elasticsearch.go +++ b/pkg/simple/client/events/elasticsearch/elasticsearch.go @@ -18,6 +18,7 @@ package elasticsearch import ( "fmt" + "kubesphere.io/kubesphere/pkg/simple/client/es" "kubesphere.io/kubesphere/pkg/simple/client/es/query" "kubesphere.io/kubesphere/pkg/simple/client/events" diff --git a/pkg/simple/client/events/elasticsearch/elasticsearch_test.go b/pkg/simple/client/events/elasticsearch/elasticsearch_test.go index fa59261bc..1687ded2e 100644 --- a/pkg/simple/client/events/elasticsearch/elasticsearch_test.go +++ b/pkg/simple/client/events/elasticsearch/elasticsearch_test.go @@ -18,14 +18,16 @@ package elasticsearch import ( "encoding/json" - "github.com/google/go-cmp/cmp" - "github.com/stretchr/testify/assert" - "kubesphere.io/kubesphere/pkg/simple/client/events" "net/http" "net/http/httptest" "strings" "testing" "time" + + "github.com/google/go-cmp/cmp" + "github.com/stretchr/testify/assert" + + "kubesphere.io/kubesphere/pkg/simple/client/events" ) func MockElasticsearchService(pattern string, fakeCode int, fakeResp string) *httptest.Server { diff --git a/pkg/simple/client/events/options.go b/pkg/simple/client/events/options.go index 66a958462..a995e7555 100644 --- a/pkg/simple/client/events/options.go +++ b/pkg/simple/client/events/options.go @@ -18,6 +18,7 @@ package events import ( "github.com/spf13/pflag" + "kubesphere.io/kubesphere/pkg/utils/reflectutils" ) diff --git a/pkg/simple/client/k8s/fake_client.go b/pkg/simple/client/k8s/fake_client.go index 8b611502f..0e117b194 100644 --- a/pkg/simple/client/k8s/fake_client.go +++ b/pkg/simple/client/k8s/fake_client.go @@ -24,6 +24,7 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" ) diff --git a/pkg/simple/client/k8s/kubernetes.go b/pkg/simple/client/k8s/kubernetes.go index 8301a29ff..2c2e378a3 100644 --- a/pkg/simple/client/k8s/kubernetes.go +++ b/pkg/simple/client/k8s/kubernetes.go @@ -27,6 +27,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" + kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" ) diff --git a/pkg/simple/client/k8s/null_client.go b/pkg/simple/client/k8s/null_client.go index b98eb2178..34ce38bf1 100644 --- a/pkg/simple/client/k8s/null_client.go +++ b/pkg/simple/client/k8s/null_client.go @@ -24,6 +24,7 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" ) diff --git a/pkg/simple/client/k8s/options.go b/pkg/simple/client/k8s/options.go index 65c9deb53..c72699f82 100644 --- a/pkg/simple/client/k8s/options.go +++ b/pkg/simple/client/k8s/options.go @@ -17,9 +17,11 @@ limitations under the License. package k8s import ( - "github.com/spf13/pflag" - "kubesphere.io/kubesphere/pkg/utils/reflectutils" "os" + + "github.com/spf13/pflag" + + "kubesphere.io/kubesphere/pkg/utils/reflectutils" ) type KubernetesOptions struct { diff --git a/pkg/simple/client/kubeedge/options.go b/pkg/simple/client/kubeedge/options.go index a7ecb3307..414c96e09 100644 --- a/pkg/simple/client/kubeedge/options.go +++ b/pkg/simple/client/kubeedge/options.go @@ -18,6 +18,7 @@ package kubeedge import ( "github.com/spf13/pflag" + "kubesphere.io/kubesphere/pkg/utils/reflectutils" ) diff --git a/pkg/simple/client/ldap/ldap.go b/pkg/simple/client/ldap/ldap.go index d2272789c..46356dca3 100644 --- a/pkg/simple/client/ldap/ldap.go +++ b/pkg/simple/client/ldap/ldap.go @@ -18,17 +18,19 @@ package ldap import ( "fmt" - "github.com/go-ldap/ldap" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - "kubesphere.io/kubesphere/pkg/apiserver/query" - "kubesphere.io/kubesphere/pkg/server/errors" "sort" "strings" "sync" "time" + + "github.com/go-ldap/ldap" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/klog" + + "kubesphere.io/kubesphere/pkg/api" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/apiserver/query" + "kubesphere.io/kubesphere/pkg/server/errors" ) const ( diff --git a/pkg/simple/client/ldap/options.go b/pkg/simple/client/ldap/options.go index 12cc74729..b10e56308 100644 --- a/pkg/simple/client/ldap/options.go +++ b/pkg/simple/client/ldap/options.go @@ -18,6 +18,7 @@ package ldap import ( "github.com/spf13/pflag" + "kubesphere.io/kubesphere/pkg/utils/reflectutils" ) diff --git a/pkg/simple/client/ldap/simple_ldap.go b/pkg/simple/client/ldap/simple_ldap.go index 2fe3df104..c80908c40 100644 --- a/pkg/simple/client/ldap/simple_ldap.go +++ b/pkg/simple/client/ldap/simple_ldap.go @@ -18,6 +18,7 @@ package ldap import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/api" iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" diff --git a/pkg/simple/client/ldap/simple_ldap_test.go b/pkg/simple/client/ldap/simple_ldap_test.go index 213a0d8a7..76a203e63 100644 --- a/pkg/simple/client/ldap/simple_ldap_test.go +++ b/pkg/simple/client/ldap/simple_ldap_test.go @@ -17,10 +17,12 @@ limitations under the License. package ldap import ( + "testing" + "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - "testing" ) func TestSimpleLdap(t *testing.T) { diff --git a/pkg/simple/client/logging/elasticsearch/elasticsearch.go b/pkg/simple/client/logging/elasticsearch/elasticsearch.go index 874f9e681..793e7036b 100644 --- a/pkg/simple/client/logging/elasticsearch/elasticsearch.go +++ b/pkg/simple/client/logging/elasticsearch/elasticsearch.go @@ -21,10 +21,11 @@ import ( "encoding/json" "fmt" "io" + "time" + "kubesphere.io/kubesphere/pkg/simple/client/es" "kubesphere.io/kubesphere/pkg/simple/client/es/query" "kubesphere.io/kubesphere/pkg/simple/client/logging" - "time" "kubesphere.io/kubesphere/pkg/utils/stringutils" ) diff --git a/pkg/simple/client/logging/elasticsearch/elasticsearch_test.go b/pkg/simple/client/logging/elasticsearch/elasticsearch_test.go index 34a53ada8..dbc716c1e 100644 --- a/pkg/simple/client/logging/elasticsearch/elasticsearch_test.go +++ b/pkg/simple/client/logging/elasticsearch/elasticsearch_test.go @@ -18,16 +18,18 @@ package elasticsearch import ( "fmt" - "github.com/google/go-cmp/cmp" - "github.com/json-iterator/go" "io/ioutil" - "kubesphere.io/kubesphere/pkg/simple/client/es" - "kubesphere.io/kubesphere/pkg/simple/client/es/query" - "kubesphere.io/kubesphere/pkg/simple/client/logging" "net/http" "net/http/httptest" "testing" "time" + + "github.com/google/go-cmp/cmp" + jsoniter "github.com/json-iterator/go" + + "kubesphere.io/kubesphere/pkg/simple/client/es" + "kubesphere.io/kubesphere/pkg/simple/client/es/query" + "kubesphere.io/kubesphere/pkg/simple/client/logging" ) func TestGetCurrentStats(t *testing.T) { diff --git a/pkg/simple/client/logging/options.go b/pkg/simple/client/logging/options.go index 115bef294..62c78c96c 100644 --- a/pkg/simple/client/logging/options.go +++ b/pkg/simple/client/logging/options.go @@ -18,6 +18,7 @@ package logging import ( "github.com/spf13/pflag" + "kubesphere.io/kubesphere/pkg/utils/reflectutils" ) diff --git a/pkg/simple/client/monitoring/metricsserver/metricsserver.go b/pkg/simple/client/monitoring/metricsserver/metricsserver.go index 7096a235d..27e807072 100644 --- a/pkg/simple/client/monitoring/metricsserver/metricsserver.go +++ b/pkg/simple/client/monitoring/metricsserver/metricsserver.go @@ -21,7 +21,7 @@ import ( "errors" "time" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" diff --git a/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go b/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go index 0f62a9a85..1b011da66 100644 --- a/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go +++ b/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/google/go-cmp/cmp" - "github.com/json-iterator/go" "io/ioutil" - "k8s.io/api/core/v1" - corev1 "k8s.io/api/core/v1" + "github.com/google/go-cmp/cmp" + jsoniter "github.com/json-iterator/go" + + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -25,8 +25,8 @@ import ( // mergeResourceLists will merge resoure lists. When two lists have the same resourece, the value from // the last list will be present in the result -func mergeResourceLists(resourceLists ...corev1.ResourceList) corev1.ResourceList { - result := corev1.ResourceList{} +func mergeResourceLists(resourceLists ...v1.ResourceList) v1.ResourceList { + result := v1.ResourceList{} for _, rl := range resourceLists { for resource, quantity := range rl { result[resource] = quantity @@ -35,38 +35,38 @@ func mergeResourceLists(resourceLists ...corev1.ResourceList) corev1.ResourceLis return result } -func getResourceList(cpu, memory string) corev1.ResourceList { - res := corev1.ResourceList{} +func getResourceList(cpu, memory string) v1.ResourceList { + res := v1.ResourceList{} if cpu != "" { - res[corev1.ResourceCPU] = resource.MustParse(cpu) + res[v1.ResourceCPU] = resource.MustParse(cpu) } if memory != "" { - res[corev1.ResourceMemory] = resource.MustParse(memory) + res[v1.ResourceMemory] = resource.MustParse(memory) } return res } var nodeCapacity = mergeResourceLists(getResourceList("8", "8Gi")) -var node1 = &corev1.Node{ +var node1 = &v1.Node{ ObjectMeta: metav1.ObjectMeta{ Name: "edgenode-1", Labels: map[string]string{ "node-role.kubernetes.io/edge": "", }, }, - Status: corev1.NodeStatus{ + Status: v1.NodeStatus{ Capacity: nodeCapacity, }, } -var node2 = &corev1.Node{ +var node2 = &v1.Node{ ObjectMeta: metav1.ObjectMeta{ Name: "edgenode-2", Labels: map[string]string{ "node-role.kubernetes.io/edge": "", }, }, - Status: corev1.NodeStatus{ + Status: v1.NodeStatus{ Capacity: nodeCapacity, }, } diff --git a/pkg/simple/client/monitoring/prometheus/prometheus.go b/pkg/simple/client/monitoring/prometheus/prometheus.go index d02ba509b..22f36d769 100644 --- a/pkg/simple/client/monitoring/prometheus/prometheus.go +++ b/pkg/simple/client/monitoring/prometheus/prometheus.go @@ -27,6 +27,7 @@ import ( apiv1 "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/common/model" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/simple/client/monitoring" ) diff --git a/pkg/simple/client/monitoring/prometheus/prometheus_test.go b/pkg/simple/client/monitoring/prometheus/prometheus_test.go index 29d4ee3fd..2d84a6c30 100644 --- a/pkg/simple/client/monitoring/prometheus/prometheus_test.go +++ b/pkg/simple/client/monitoring/prometheus/prometheus_test.go @@ -18,14 +18,16 @@ package prometheus import ( "fmt" - "github.com/google/go-cmp/cmp" - "github.com/json-iterator/go" "io/ioutil" - "kubesphere.io/kubesphere/pkg/simple/client/monitoring" "net/http" "net/http/httptest" "testing" "time" + + "github.com/google/go-cmp/cmp" + jsoniter "github.com/json-iterator/go" + + "kubesphere.io/kubesphere/pkg/simple/client/monitoring" ) func TestGetNamedMetrics(t *testing.T) { diff --git a/pkg/simple/client/monitoring/prometheus/promql_meter.go b/pkg/simple/client/monitoring/prometheus/promql_meter.go index 8eab0453f..ecac9108a 100644 --- a/pkg/simple/client/monitoring/prometheus/promql_meter.go +++ b/pkg/simple/client/monitoring/prometheus/promql_meter.go @@ -19,6 +19,7 @@ import ( "strings" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/simple/client/monitoring" ) diff --git a/pkg/simple/client/monitoring/prometheus/promql_test.go b/pkg/simple/client/monitoring/prometheus/promql_test.go index 263516c24..1a3f1a658 100644 --- a/pkg/simple/client/monitoring/prometheus/promql_test.go +++ b/pkg/simple/client/monitoring/prometheus/promql_test.go @@ -17,10 +17,12 @@ limitations under the License. package prometheus import ( + "testing" + "github.com/google/go-cmp/cmp" + "kubesphere.io/kubesphere/pkg/simple/client/monitoring" "kubesphere.io/kubesphere/pkg/simple/client/monitoring/prometheus/testdata" - "testing" ) func TestMakeExpr(t *testing.T) { diff --git a/pkg/simple/client/monitoring/types.go b/pkg/simple/client/monitoring/types.go index f892c42f7..954e6d62d 100644 --- a/pkg/simple/client/monitoring/types.go +++ b/pkg/simple/client/monitoring/types.go @@ -19,11 +19,12 @@ package monitoring import ( "errors" "fmt" - "github.com/json-iterator/go" - "github.com/jszwec/csvutil" "strconv" "strings" "time" + + jsoniter "github.com/json-iterator/go" + "github.com/jszwec/csvutil" ) const ( diff --git a/pkg/simple/client/mysql/mysql.go b/pkg/simple/client/mysql/mysql.go index 1a68d50b7..f9abf94c6 100644 --- a/pkg/simple/client/mysql/mysql.go +++ b/pkg/simple/client/mysql/mysql.go @@ -15,6 +15,7 @@ package mysql import ( "fmt" + "github.com/gocraft/dbr" "k8s.io/klog" ) diff --git a/pkg/simple/client/mysql/options.go b/pkg/simple/client/mysql/options.go index 57448353c..a555b43b0 100644 --- a/pkg/simple/client/mysql/options.go +++ b/pkg/simple/client/mysql/options.go @@ -17,9 +17,11 @@ limitations under the License. package mysql import ( - "github.com/spf13/pflag" - "kubesphere.io/kubesphere/pkg/utils/reflectutils" "time" + + "github.com/spf13/pflag" + + "kubesphere.io/kubesphere/pkg/utils/reflectutils" ) type Options struct { diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/clientset.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/clientset.go index 539dec120..6fa6ea90b 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/clientset.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/clientset.go @@ -24,6 +24,7 @@ import ( discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" + crdcalicov3 "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/clientset_generated.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/clientset_generated.go index 79b94cf7f..7a076366c 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/clientset_generated.go @@ -24,6 +24,7 @@ import ( "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" + clientset "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned" crdcalicov3 "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3" fakecrdcalicov3 "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake" diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/register.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/register.go index 81f055ff0..13af2667f 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/register.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/register.go @@ -24,6 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + crdcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme/register.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme/register.go index 66a4007fd..d7fb09d8a 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme/register.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme/register.go @@ -24,6 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + crdcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/blockaffinity.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/blockaffinity.go index 8ccc52644..35aeeab66 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/blockaffinity.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/blockaffinity.go @@ -26,6 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" scheme "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_blockaffinity.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_blockaffinity.go index 4672878a1..ccb50de14 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_blockaffinity.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_blockaffinity.go @@ -27,6 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ipamblock.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ipamblock.go index 149b983f9..a85a856d0 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ipamblock.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ipamblock.go @@ -27,6 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ippool.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ippool.go index a00d6d150..e948a4b25 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ippool.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ippool.go @@ -27,6 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_network_client.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_network_client.go index bbcf79e90..ae28b72cc 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_network_client.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_network_client.go @@ -21,6 +21,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + calicov3 "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ipamblock.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ipamblock.go index a35447eec..d46873461 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ipamblock.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ipamblock.go @@ -26,6 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" scheme "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ippool.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ippool.go index 46e307c49..8139643b6 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ippool.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ippool.go @@ -26,6 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" scheme "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/network_client.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/network_client.go index d9c1dfbaa..6583f1843 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/network_client.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/network_client.go @@ -20,6 +20,7 @@ package calicov3 import ( rest "k8s.io/client-go/rest" + calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme" ) diff --git a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/factory.go b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/factory.go index 03bcb6f00..97c66dcc3 100644 --- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/factory.go +++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/factory.go @@ -27,6 +27,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces" network "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network" diff --git a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/generic.go b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/generic.go index 7844ec52f..a8600e176 100644 --- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/generic.go +++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/generic.go @@ -23,6 +23,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" ) diff --git a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces/factory_interfaces.go index d781a4567..42945593a 100644 --- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -24,6 +24,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" + versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned" ) diff --git a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/blockaffinity.go b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/blockaffinity.go index c08bb4c7b..2b4b49aaf 100644 --- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/blockaffinity.go +++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/blockaffinity.go @@ -26,6 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + networkcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces" diff --git a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ipamblock.go b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ipamblock.go index d74d9c966..bb0e404e6 100644 --- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ipamblock.go +++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ipamblock.go @@ -26,6 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + networkcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces" diff --git a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ippool.go b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ippool.go index bf9741d5a..083cf82b5 100644 --- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ippool.go +++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ippool.go @@ -26,6 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + networkcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces" diff --git a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/blockaffinity.go b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/blockaffinity.go index d90977828..72735a5cd 100644 --- a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/blockaffinity.go +++ b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/blockaffinity.go @@ -22,6 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" ) diff --git a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ipamblock.go b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ipamblock.go index 9caccfc91..c519f8d31 100644 --- a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ipamblock.go +++ b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ipamblock.go @@ -22,6 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" ) diff --git a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ippool.go b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ippool.go index 1509f6cad..6b0fa075a 100644 --- a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ippool.go +++ b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ippool.go @@ -22,6 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" ) diff --git a/pkg/simple/client/network/ippool/calico/provider.go b/pkg/simple/client/network/ippool/calico/provider.go index e3081da7c..63591b271 100644 --- a/pkg/simple/client/network/ippool/calico/provider.go +++ b/pkg/simple/client/network/ippool/calico/provider.go @@ -21,10 +21,11 @@ import ( "encoding/json" "errors" "fmt" - k8sinformers "k8s.io/client-go/informers" "net" "time" + k8sinformers "k8s.io/client-go/informers" + v3 "github.com/projectcalico/libcalico-go/lib/apis/v3" "github.com/projectcalico/libcalico-go/lib/backend/model" cnet "github.com/projectcalico/libcalico-go/lib/net" @@ -41,6 +42,8 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/workqueue" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + "kubesphere.io/kubesphere/pkg/apis/network/calicov3" "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" @@ -50,7 +53,6 @@ import ( calicoset "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned" calicoInformer "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions" blockInformer "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) const ( diff --git a/pkg/simple/client/network/ippool/calico/provider_test.go b/pkg/simple/client/network/ippool/calico/provider_test.go index 74983eddb..1f7fee1f0 100644 --- a/pkg/simple/client/network/ippool/calico/provider_test.go +++ b/pkg/simple/client/network/ippool/calico/provider_test.go @@ -18,13 +18,15 @@ package calico import ( "flag" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "testing" + tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/simple/client/network/ippool/ipam/interface.go b/pkg/simple/client/network/ippool/ipam/interface.go index b584998c8..1de2d6247 100644 --- a/pkg/simple/client/network/ippool/ipam/interface.go +++ b/pkg/simple/client/network/ippool/ipam/interface.go @@ -18,6 +18,7 @@ package ipam import ( "github.com/containernetworking/cni/pkg/types/current" + "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" ) diff --git a/pkg/simple/client/network/ippool/ipam/ipam.go b/pkg/simple/client/network/ippool/ipam/ipam.go index 646d03e5a..4bdb64907 100644 --- a/pkg/simple/client/network/ippool/ipam/ipam.go +++ b/pkg/simple/client/network/ippool/ipam/ipam.go @@ -33,11 +33,12 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" "kubesphere.io/kubesphere/pkg/simple/client/network/utils" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) const ( diff --git a/pkg/simple/client/network/ippool/ipam/ipam_test.go b/pkg/simple/client/network/ippool/ipam/ipam_test.go index 95623101e..9df13d838 100644 --- a/pkg/simple/client/network/ippool/ipam/ipam_test.go +++ b/pkg/simple/client/network/ippool/ipam/ipam_test.go @@ -20,13 +20,15 @@ import ( "context" "flag" "fmt" + "testing" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" - "testing" ) func TestIPAM_blockGenerator(t *testing.T) { diff --git a/pkg/simple/client/network/ippool/provider.go b/pkg/simple/client/network/ippool/provider.go index 43eae33fe..a1b088154 100644 --- a/pkg/simple/client/network/ippool/provider.go +++ b/pkg/simple/client/network/ippool/provider.go @@ -22,6 +22,7 @@ import ( k8sinformers "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/util/workqueue" + networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/simple/client/k8s" diff --git a/pkg/simple/client/network/ippool/provider_test.go b/pkg/simple/client/network/ippool/provider_test.go index 82bc5431a..72b6c8042 100644 --- a/pkg/simple/client/network/ippool/provider_test.go +++ b/pkg/simple/client/network/ippool/provider_test.go @@ -21,6 +21,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/ipam" diff --git a/pkg/simple/client/openpitrix/helmrepoindex/load_chart.go b/pkg/simple/client/openpitrix/helmrepoindex/load_chart.go index 229db9fc3..0a2d5e810 100644 --- a/pkg/simple/client/openpitrix/helmrepoindex/load_chart.go +++ b/pkg/simple/client/openpitrix/helmrepoindex/load_chart.go @@ -20,12 +20,14 @@ import ( "bytes" "context" "fmt" - "helm.sh/helm/v3/pkg/getter" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - "kubesphere.io/kubesphere/pkg/simple/client/s3" "net/url" "strings" "time" + + "helm.sh/helm/v3/pkg/getter" + + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/simple/client/s3" ) func parseS3Url(parse *url.URL) (region, endpoint, bucket, path string) { diff --git a/pkg/simple/client/openpitrix/helmrepoindex/load_package.go b/pkg/simple/client/openpitrix/helmrepoindex/load_package.go index 6df3f8606..e8a82a250 100644 --- a/pkg/simple/client/openpitrix/helmrepoindex/load_package.go +++ b/pkg/simple/client/openpitrix/helmrepoindex/load_package.go @@ -20,11 +20,12 @@ import ( "bytes" "encoding/json" "fmt" - "helm.sh/helm/v3/pkg/repo" - "k8s.io/klog" "strings" "time" + "helm.sh/helm/v3/pkg/repo" + "k8s.io/klog" + "helm.sh/helm/v3/pkg/chart/loader" ) diff --git a/pkg/simple/client/openpitrix/helmrepoindex/repo_index.go b/pkg/simple/client/openpitrix/helmrepoindex/repo_index.go index 81163f2d1..96e773988 100644 --- a/pkg/simple/client/openpitrix/helmrepoindex/repo_index.go +++ b/pkg/simple/client/openpitrix/helmrepoindex/repo_index.go @@ -23,16 +23,18 @@ import ( "encoding/base64" "encoding/json" "fmt" - helmrepo "helm.sh/helm/v3/pkg/repo" "io" "io/ioutil" + "strings" + "time" + + helmrepo "helm.sh/helm/v3/pkg/repo" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/yaml" + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/utils/idutils" - "sigs.k8s.io/yaml" - "strings" - "time" ) const IndexYaml = "index.yaml" diff --git a/pkg/simple/client/openpitrix/helmrepoindex/repo_index_test.go b/pkg/simple/client/openpitrix/helmrepoindex/repo_index_test.go index 6ea52af19..71c805c69 100644 --- a/pkg/simple/client/openpitrix/helmrepoindex/repo_index_test.go +++ b/pkg/simple/client/openpitrix/helmrepoindex/repo_index_test.go @@ -19,9 +19,10 @@ package helmrepoindex import ( "context" "fmt" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "strings" "testing" + + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" ) func TestLoadRepo(t *testing.T) { diff --git a/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper.go b/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper.go index 66571d86b..75c9a4ab1 100644 --- a/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper.go +++ b/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper.go @@ -20,18 +20,20 @@ import ( "bytes" "encoding/json" "fmt" + "os" + "os/exec" + "path/filepath" + "strings" + "time" + "gopkg.in/yaml.v3" helmrelease "helm.sh/helm/v3/pkg/release" "k8s.io/klog" kpath "k8s.io/utils/path" + "sigs.k8s.io/kustomize/pkg/types" + "kubesphere.io/kubesphere/pkg/server/errors" "kubesphere.io/kubesphere/pkg/utils/idutils" - "os" - "os/exec" - "path/filepath" - "sigs.k8s.io/kustomize/pkg/types" - "strings" - "time" ) const ( diff --git a/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper_test.go b/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper_test.go index 60d734891..1fa7e58ae 100644 --- a/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper_test.go +++ b/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper_test.go @@ -18,9 +18,10 @@ package helmwrapper import ( "fmt" - "kubesphere.io/kubesphere/pkg/constants" "os" "testing" + + "kubesphere.io/kubesphere/pkg/constants" ) func TestHelmInstall(t *testing.T) { diff --git a/pkg/simple/client/openpitrix/options.go b/pkg/simple/client/openpitrix/options.go index 132fc33d8..048578749 100644 --- a/pkg/simple/client/openpitrix/options.go +++ b/pkg/simple/client/openpitrix/options.go @@ -18,6 +18,7 @@ package openpitrix import ( "github.com/spf13/pflag" + "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/utils/reflectutils" ) diff --git a/pkg/simple/client/s3/fake/fakes3.go b/pkg/simple/client/s3/fake/fakes3.go index 4d404de0c..84f0b088b 100644 --- a/pkg/simple/client/s3/fake/fakes3.go +++ b/pkg/simple/client/s3/fake/fakes3.go @@ -18,10 +18,11 @@ package fake import ( "fmt" - "github.com/aws/aws-sdk-go/aws/awserr" - "github.com/aws/aws-sdk-go/service/s3" "io" "io/ioutil" + + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/s3" ) type FakeS3 struct { diff --git a/pkg/simple/client/s3/options.go b/pkg/simple/client/s3/options.go index f8d321ac0..42488f222 100644 --- a/pkg/simple/client/s3/options.go +++ b/pkg/simple/client/s3/options.go @@ -18,6 +18,7 @@ package s3 import ( "github.com/spf13/pflag" + "kubesphere.io/kubesphere/pkg/utils/reflectutils" ) diff --git a/pkg/simple/client/s3/s3.go b/pkg/simple/client/s3/s3.go index 8d4f7a822..0d418acf8 100644 --- a/pkg/simple/client/s3/s3.go +++ b/pkg/simple/client/s3/s3.go @@ -17,16 +17,17 @@ limitations under the License. package s3 import ( - "code.cloudfoundry.org/bytefmt" "fmt" + "io" + "time" + + "code.cloudfoundry.org/bytefmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3/s3manager" - "io" "k8s.io/klog" - "time" ) type Client struct { diff --git a/pkg/simple/client/sonarqube/interface.go b/pkg/simple/client/sonarqube/interface.go index adf74b685..4fbc0cf8a 100644 --- a/pkg/simple/client/sonarqube/interface.go +++ b/pkg/simple/client/sonarqube/interface.go @@ -19,6 +19,7 @@ package sonarqube import ( sonargo "github.com/kubesphere/sonargo/sonar" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) diff --git a/pkg/simple/client/sonarqube/sonarqube.go b/pkg/simple/client/sonarqube/sonarqube.go index 6359aed5c..c0c8adbad 100644 --- a/pkg/simple/client/sonarqube/sonarqube.go +++ b/pkg/simple/client/sonarqube/sonarqube.go @@ -18,9 +18,10 @@ package sonarqube import ( "fmt" - "github.com/kubesphere/sonargo/sonar" - "k8s.io/klog" "strings" + + sonargo "github.com/kubesphere/sonargo/sonar" + "k8s.io/klog" ) type Client struct { diff --git a/pkg/utils/clusterclient/clusterclient.go b/pkg/utils/clusterclient/clusterclient.go index 8c3508c9d..224ce99d9 100644 --- a/pkg/utils/clusterclient/clusterclient.go +++ b/pkg/utils/clusterclient/clusterclient.go @@ -18,16 +18,18 @@ package clusterclient import ( "fmt" + "net/http" + "net/url" + "sync" + corev1 "k8s.io/api/core/v1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/clientcmd" "k8s.io/klog" + clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" clusterinformer "kubesphere.io/kubesphere/pkg/client/informers/externalversions/cluster/v1alpha1" - "net/http" - "net/url" - "sync" ) var ( diff --git a/pkg/utils/esutil/esutil_test.go b/pkg/utils/esutil/esutil_test.go index e9bece152..5b22fd9ec 100644 --- a/pkg/utils/esutil/esutil_test.go +++ b/pkg/utils/esutil/esutil_test.go @@ -18,9 +18,10 @@ package esutil import ( "fmt" - "github.com/google/go-cmp/cmp" "testing" "time" + + "github.com/google/go-cmp/cmp" ) func TestResolveIndexNames(t *testing.T) { diff --git a/pkg/utils/hashutil/MD5.go b/pkg/utils/hashutil/MD5.go index 1aefaca35..7df817bdf 100644 --- a/pkg/utils/hashutil/MD5.go +++ b/pkg/utils/hashutil/MD5.go @@ -17,9 +17,10 @@ limitations under the License. package hashutil import ( - "code.cloudfoundry.org/bytefmt" "encoding/hex" "io" + + "code.cloudfoundry.org/bytefmt" "k8s.io/klog" "kubesphere.io/kubesphere/pkg/utils/readerutils" diff --git a/pkg/utils/idutils/id_utils.go b/pkg/utils/idutils/id_utils.go index 7c42984a5..42c4a9967 100644 --- a/pkg/utils/idutils/id_utils.go +++ b/pkg/utils/idutils/id_utils.go @@ -18,10 +18,11 @@ package idutils import ( "errors" + "net" + "github.com/golang/example/stringutil" "github.com/sony/sonyflake" "github.com/speps/go-hashids" - "net" "kubesphere.io/kubesphere/pkg/utils/stringutils" ) diff --git a/pkg/utils/jsonutil/jsonutils.go b/pkg/utils/jsonutil/jsonutils.go index 0a545579b..46ee9fe96 100644 --- a/pkg/utils/jsonutil/jsonutils.go +++ b/pkg/utils/jsonutil/jsonutils.go @@ -18,8 +18,9 @@ package jsonutil import ( "encoding/json" - "k8s.io/klog" "strings" + + "k8s.io/klog" ) type JsonRawMessage []byte diff --git a/pkg/utils/k8sutil/k8sutil.go b/pkg/utils/k8sutil/k8sutil.go index 67cee0747..785e142e3 100644 --- a/pkg/utils/k8sutil/k8sutil.go +++ b/pkg/utils/k8sutil/k8sutil.go @@ -18,6 +18,7 @@ package k8sutil import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" ) diff --git a/pkg/utils/k8sutil/k8sutil_test.go b/pkg/utils/k8sutil/k8sutil_test.go index 7c14d1c69..30472f07c 100644 --- a/pkg/utils/k8sutil/k8sutil_test.go +++ b/pkg/utils/k8sutil/k8sutil_test.go @@ -19,11 +19,13 @@ package k8sutil import ( - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "reflect" "testing" + + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" ) func TestIsControlledBy(t *testing.T) { diff --git a/pkg/utils/metrics/metrics.go b/pkg/utils/metrics/metrics.go index fbfea1621..016398e44 100644 --- a/pkg/utils/metrics/metrics.go +++ b/pkg/utils/metrics/metrics.go @@ -18,13 +18,15 @@ package metrics import ( + "net/http" + "github.com/emicklei/go-restful" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" apimachineryversion "k8s.io/apimachinery/pkg/version" compbasemetrics "k8s.io/component-base/metrics" + ksVersion "kubesphere.io/kubesphere/pkg/version" - "net/http" ) var ( diff --git a/pkg/utils/pkiutil/pkiutil.go b/pkg/utils/pkiutil/pkiutil.go index 8a2d60a53..d2b528b6c 100644 --- a/pkg/utils/pkiutil/pkiutil.go +++ b/pkg/utils/pkiutil/pkiutil.go @@ -22,6 +22,7 @@ import ( "crypto/rsa" "crypto/x509" "crypto/x509/pkix" + "github.com/pkg/errors" certutil "k8s.io/client-go/util/cert" ) diff --git a/pkg/utils/reposcache/repo_cahes.go b/pkg/utils/reposcache/repo_cahes.go index 99aecd31a..ccdb1b4d4 100644 --- a/pkg/utils/reposcache/repo_cahes.go +++ b/pkg/utils/reposcache/repo_cahes.go @@ -23,15 +23,17 @@ import ( "errors" "fmt" "io/ioutil" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - "kubesphere.io/kubesphere/pkg/constants" - "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" "os" "path" "strings" "sync" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/klog" + + "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" + "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" ) var WorkDir string diff --git a/pkg/utils/resourceparse/resource_parse.go b/pkg/utils/resourceparse/resource_parse.go index d99572b95..9b2772016 100644 --- a/pkg/utils/resourceparse/resource_parse.go +++ b/pkg/utils/resourceparse/resource_parse.go @@ -19,11 +19,12 @@ package resourceparse import ( "io" + "time" + "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/klog" cmdutil "k8s.io/kubectl/pkg/cmd/util" - "time" ) func Parse(reader io.Reader, namespace, rlsName string, local bool) ([]*resource.Info, error) { diff --git a/pkg/utils/term/term.go b/pkg/utils/term/term.go index f999275b7..0658d12ae 100644 --- a/pkg/utils/term/term.go +++ b/pkg/utils/term/term.go @@ -18,8 +18,9 @@ package term import ( "fmt" - "github.com/docker/docker/pkg/term" "io" + + "github.com/docker/docker/pkg/term" ) // TerminalSize returns the current width and height of the user's terminal. If it isn't a terminal, diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index e2ca98049..49a36030b 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -23,6 +23,7 @@ import ( "github.com/onsi/ginkgo/config" "github.com/onsi/gomega" "k8s.io/klog" + "kubesphere.io/kubesphere/test/e2e/framework/ginkgowrapper" ) diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index cfcf75bbe..5beac6034 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -31,6 +31,7 @@ import ( "kubesphere.io/client-go/client" "kubesphere.io/client-go/client/generic" "kubesphere.io/client-go/restclient" + "kubesphere.io/kubesphere/pkg/apis" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/test/e2e/framework/workspace" diff --git a/test/e2e/framework/iam/fixtures.go b/test/e2e/framework/iam/fixtures.go index 9e5d34fe9..66738663e 100644 --- a/test/e2e/framework/iam/fixtures.go +++ b/test/e2e/framework/iam/fixtures.go @@ -21,6 +21,7 @@ import ( "fmt" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/client-go/client" diff --git a/test/e2e/framework/iam/utils.go b/test/e2e/framework/iam/utils.go index a1940b550..cf965b961 100644 --- a/test/e2e/framework/iam/utils.go +++ b/test/e2e/framework/iam/utils.go @@ -26,6 +26,7 @@ import ( "kubesphere.io/client-go/client" "kubesphere.io/client-go/client/generic" "kubesphere.io/client-go/restclient" + "kubesphere.io/kubesphere/test/e2e/framework" ) diff --git a/test/e2e/framework/workspace/fixtures.go b/test/e2e/framework/workspace/fixtures.go index b763a92b5..347a16e65 100644 --- a/test/e2e/framework/workspace/fixtures.go +++ b/test/e2e/framework/workspace/fixtures.go @@ -18,6 +18,7 @@ package workspace import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" fedb1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" diff --git a/test/e2e/groups.go b/test/e2e/groups.go index 6c8839808..f4a69c5f4 100644 --- a/test/e2e/groups.go +++ b/test/e2e/groups.go @@ -24,6 +24,7 @@ import ( . "github.com/onsi/gomega" //nolint:stylecheck "k8s.io/apimachinery/pkg/util/wait" "kubesphere.io/client-go/client" + "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/test/e2e/constant" "kubesphere.io/kubesphere/test/e2e/framework" diff --git a/test/e2e/quick.go b/test/e2e/quick.go index 5b4d89a4c..8a7fd6277 100644 --- a/test/e2e/quick.go +++ b/test/e2e/quick.go @@ -8,6 +8,7 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "kubesphere.io/client-go/client" + "kubesphere.io/kubesphere/test/e2e/framework" "kubesphere.io/kubesphere/test/e2e/framework/workspace" ) diff --git a/test/e2e/workspaces.go b/test/e2e/workspaces.go index 681cb3fe9..0c7a128e5 100644 --- a/test/e2e/workspaces.go +++ b/test/e2e/workspaces.go @@ -23,6 +23,7 @@ import ( . "github.com/onsi/ginkgo" //nolint:stylecheck . "github.com/onsi/gomega" "kubesphere.io/client-go/client" + iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/test/e2e/framework" "kubesphere.io/kubesphere/test/e2e/framework/iam" diff --git a/tools/cmd/crd-doc-gen/main.go b/tools/cmd/crd-doc-gen/main.go index a7a52f876..3d8aa55ab 100644 --- a/tools/cmd/crd-doc-gen/main.go +++ b/tools/cmd/crd-doc-gen/main.go @@ -19,22 +19,25 @@ package main import ( "flag" "io/ioutil" + "log" + "os" + "path/filepath" + "k8s.io/apimachinery/pkg/api/meta" urlruntime "k8s.io/apimachinery/pkg/util/runtime" + applicationv1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/version" "kubesphere.io/kubesphere/tools/lib" - "log" - "os" - "path/filepath" "github.com/go-openapi/spec" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/kube-openapi/pkg/common" + applicationinstall "kubesphere.io/kubesphere/pkg/apis/application/crdinstall" devopsinstall "kubesphere.io/kubesphere/pkg/apis/devops/crdinstall" devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" diff --git a/tools/cmd/doc-gen/main.go b/tools/cmd/doc-gen/main.go index 7ca40481e..6429ba928 100644 --- a/tools/cmd/doc-gen/main.go +++ b/tools/cmd/doc-gen/main.go @@ -22,9 +22,10 @@ import ( "flag" "fmt" "io/ioutil" + "log" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/version" - "log" "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" @@ -36,6 +37,7 @@ import ( promfake "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/fake" urlruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/klog" + "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/informers" diff --git a/tools/lib/render.go b/tools/lib/render.go index 273d4ed9a..0369c784b 100644 --- a/tools/lib/render.go +++ b/tools/lib/render.go @@ -19,11 +19,12 @@ package lib import ( "encoding/json" "fmt" - "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apiserver/pkg/registry/rest" "log" "net" + "k8s.io/apimachinery/pkg/api/meta" + "k8s.io/apiserver/pkg/registry/rest" + "github.com/go-openapi/spec" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/tools/lib/storage.go b/tools/lib/storage.go index c9a17bc93..2475d3a70 100644 --- a/tools/lib/storage.go +++ b/tools/lib/storage.go @@ -18,6 +18,7 @@ package lib import ( "context" + metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime"