kubernetes
/
kubeadm
mirror of https://github.com/kubernetes/kubeadm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

operator: organize imports

This commit is contained in:
Igor Zibarev 2019-10-31 23:47:19 +03:00
parent fe0d2ce5a6
commit 27b8305d23
13 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
operator/api/v1alpha1/operation_types.go
View File

@ -18,8 +18,9 @@ package v1alpha1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
operatorerrors "k8s.io/kubeadm/operator/errors"
"k8s.io/utils/pointer"
operatorerrors "k8s.io/kubeadm/operator/errors"
)
// OperationSpec defines the spec of an Operation to be performed by the kubeadm-operator.

3
operator/api/v1alpha1/runtimetask_types.go
View File

@ -20,8 +20,9 @@ import (
"fmt"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
operatorerrors "k8s.io/kubeadm/operator/errors"
"k8s.io/utils/pointer"
operatorerrors "k8s.io/kubeadm/operator/errors"
)
// RuntimeTaskSpec defines the desired state of RuntimeTask

3
operator/api/v1alpha1/runtimetaskgroup_types.go
View File

@ -18,8 +18,9 @@ package v1alpha1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
operatorerrors "k8s.io/kubeadm/operator/errors"
"k8s.io/utils/pointer"
operatorerrors "k8s.io/kubeadm/operator/errors"
)
// RuntimeTaskGroupSpec defines the RuntimeTask template that applies to a group of nodes that should

7
operator/controllers/operation_controller.go
View File

@ -24,13 +24,14 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/client-go/tools/record"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
operatorerrors "k8s.io/kubeadm/operator/errors"
"k8s.io/kubeadm/operator/operations"
capierrors "sigs.k8s.io/cluster-api/errors"
"sigs.k8s.io/cluster-api/util/patch"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
operatorerrors "k8s.io/kubeadm/operator/errors"
"k8s.io/kubeadm/operator/operations"
)
// OperationReconciler reconciles a Operation object

1
operator/controllers/runtimetask_reconcile.go
View File

@ -20,6 +20,7 @@ import (
"sort"
corev1 "k8s.io/api/core/v1"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
)

5
operator/controllers/runtimetaskgroup_controller.go
View File

@ -25,8 +25,6 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/record"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
operatorerrors "k8s.io/kubeadm/operator/errors"
capierrors "sigs.k8s.io/cluster-api/errors"
"sigs.k8s.io/cluster-api/util/patch"
ctrl "sigs.k8s.io/controller-runtime"
@ -34,6 +32,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
operatorerrors "k8s.io/kubeadm/operator/errors"
)
// RuntimeTaskGroupReconciler reconciles a RuntimeTaskGroup object

3
operator/controllers/suite_test.go
View File

@ -25,11 +25,12 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
// +kubebuilder:scaffold:imports
)

5
operator/controllers/util.go
View File

@ -31,12 +31,13 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
"k8s.io/kubeadm/operator/operations"
"k8s.io/utils/pointer"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/handler"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
"k8s.io/kubeadm/operator/operations"
)
func getImage(c client.Client, namespace, name string) (string, error) {

4
operator/hack/update-goimports.sh
View File

@ -23,5 +23,5 @@ source "$(dirname "$0")/utils.sh"
# cd to the root path
cd_root_path
# update go imports
goimports -w ./
# update go imports, skipping generated files
git ls-files | grep "\.go$" | grep -v -e "zz_generated" | xargs goimports -local k8s.io/kubeadm/operator -w

2
operator/hack/verify-goimports.sh
View File

@ -47,7 +47,7 @@ go build > /dev/null
popd > /dev/null
# check for goimports diffs
diff=$(git ls-files | grep "\.go$" | xargs "${BIN_PATH}/goimports" -d 2>&1)
diff=$(git ls-files | grep "\.go$" | grep -v -e "zz_generated" | xargs "${BIN_PATH}/goimports" -local k8s.io/kubeadm/operator -d 2>&1)
if [[ -n "${diff}" ]]; then
echo "${diff}"
echo

3
operator/main.go
View File

@ -25,9 +25,10 @@ import (
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
"k8s.io/klog"
"k8s.io/klog/klogr"
ctrl "sigs.k8s.io/controller-runtime"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
"k8s.io/kubeadm/operator/controllers"
ctrl "sigs.k8s.io/controller-runtime"
// +kubebuilder:scaffold:imports
)

1
operator/operations/factory.go
View File

@ -18,6 +18,7 @@ package operations
import (
"github.com/pkg/errors"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
)

1
operator/operations/util.go
View File

@ -20,6 +20,7 @@ import (
"fmt"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
operatorv1 "k8s.io/kubeadm/operator/api/v1alpha1"
)