diff --git a/apis/apps/v1alpha1/groupversion_info.go b/apis/apps/v1alpha1/groupversion_info.go index 038cac69..ddd00633 100644 --- a/apis/apps/v1alpha1/groupversion_info.go +++ b/apis/apps/v1alpha1/groupversion_info.go @@ -15,8 +15,8 @@ limitations under the License. */ // Package v1alpha1 contains API Schema definitions for the apps v1alpha1 API group -//+kubebuilder:object:generate=true -//+groupName=apps.nebula-graph.io +// +kubebuilder:object:generate=true +// +groupName=apps.nebula-graph.io package v1alpha1 import ( diff --git a/apis/apps/v1alpha1/nebulacluster_common.go b/apis/apps/v1alpha1/nebulacluster_common.go index 4ce67775..82bae8d2 100644 --- a/apis/apps/v1alpha1/nebulacluster_common.go +++ b/apis/apps/v1alpha1/nebulacluster_common.go @@ -281,12 +281,16 @@ func generateContainers(c NebulaClusterComponentter, cm *corev1.ConfigMap) []cor } metadAddress := strings.Join(nc.GetMetadEndpoints(MetadPortNameThrift), ",") + flags := " --meta_server_addrs=" + metadAddress + + " --local_ip=$(hostname)." + c.GetServiceFQDN() + + " --ws_ip=$(hostname)." + c.GetServiceFQDN() + + " --daemonize=false" + dataPath + if c.Type() == MetadComponentType && nc.Spec.Metad.LicenseManagerURL != nil { + flags += " --license_manager_url=" + *nc.Spec.Metad.LicenseManagerURL + } + cmd = append(cmd, fmt.Sprintf("exec /usr/local/nebula/bin/nebula-%s", componentType)+ - fmt.Sprintf(" --flagfile=/usr/local/nebula/etc/nebula-%s.conf", componentType)+ - " --meta_server_addrs="+metadAddress+ - " --local_ip=$(hostname)."+c.GetServiceFQDN()+ - " --ws_ip=$(hostname)."+c.GetServiceFQDN()+ - " --daemonize=false"+dataPath) + fmt.Sprintf(" --flagfile=/usr/local/nebula/etc/nebula-%s.conf", componentType)+flags) mounts := c.GenerateVolumeMounts() if cm != nil { diff --git a/apis/apps/v1alpha1/nebulacluster_graphd.go b/apis/apps/v1alpha1/nebulacluster_graphd.go index c09afa17..46618fc9 100644 --- a/apis/apps/v1alpha1/nebulacluster_graphd.go +++ b/apis/apps/v1alpha1/nebulacluster_graphd.go @@ -364,7 +364,8 @@ func (c *graphdComponent) GenerateVolumeClaim() ([]corev1.PersistentVolumeClaim, func (c *graphdComponent) GenerateWorkload( gvk schema.GroupVersionKind, cm *corev1.ConfigMap, - enableEvenPodsSpread bool) (*unstructured.Unstructured, error) { + enableEvenPodsSpread bool, +) (*unstructured.Unstructured, error) { return generateWorkload(c, gvk, cm, enableEvenPodsSpread) } diff --git a/apis/apps/v1alpha1/nebulacluster_metad.go b/apis/apps/v1alpha1/nebulacluster_metad.go index dab20b25..7bc3bfe0 100644 --- a/apis/apps/v1alpha1/nebulacluster_metad.go +++ b/apis/apps/v1alpha1/nebulacluster_metad.go @@ -434,7 +434,8 @@ func (c *metadComponent) GenerateVolumeClaim() ([]corev1.PersistentVolumeClaim, func (c *metadComponent) GenerateWorkload( gvk schema.GroupVersionKind, cm *corev1.ConfigMap, - enableEvenPodsSpread bool) (*unstructured.Unstructured, error) { + enableEvenPodsSpread bool, +) (*unstructured.Unstructured, error) { return generateWorkload(c, gvk, cm, enableEvenPodsSpread) } diff --git a/apis/apps/v1alpha1/nebulacluster_storaged.go b/apis/apps/v1alpha1/nebulacluster_storaged.go index 66813a26..dc0e6c81 100644 --- a/apis/apps/v1alpha1/nebulacluster_storaged.go +++ b/apis/apps/v1alpha1/nebulacluster_storaged.go @@ -418,7 +418,8 @@ func (c *storagedComponent) GenerateVolumeClaim() ([]corev1.PersistentVolumeClai func (c *storagedComponent) GenerateWorkload( gvk schema.GroupVersionKind, cm *corev1.ConfigMap, - enableEvenPodsSpread bool) (*unstructured.Unstructured, error) { + enableEvenPodsSpread bool, +) (*unstructured.Unstructured, error) { return generateWorkload(c, gvk, cm, enableEvenPodsSpread) } diff --git a/apis/apps/v1alpha1/nebulacluster_types.go b/apis/apps/v1alpha1/nebulacluster_types.go index 6fa5cad8..dca1495c 100644 --- a/apis/apps/v1alpha1/nebulacluster_types.go +++ b/apis/apps/v1alpha1/nebulacluster_types.go @@ -299,6 +299,9 @@ type MetadSpec struct { // License defines a nebula license load into Secret License *LicenseSpec `json:"license,omitempty"` + + // LicenseManagerURL defines a nebula license manager url + LicenseManagerURL *string `json:"licenseManagerURL,omitempty"` } // StoragedSpec defines the desired state of Storaged diff --git a/apis/apps/v1alpha1/nebularestore_types.go b/apis/apps/v1alpha1/nebularestore_types.go index 5df71d4e..a39ece01 100644 --- a/apis/apps/v1alpha1/nebularestore_types.go +++ b/apis/apps/v1alpha1/nebularestore_types.go @@ -1,9 +1,10 @@ package v1alpha1 import ( - "github.com/vesoft-inc/nebula-go/v3/nebula" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/vesoft-inc/nebula-go/v3/nebula" ) // +genclient diff --git a/apis/apps/v1alpha1/zz_generated.deepcopy.go b/apis/apps/v1alpha1/zz_generated.deepcopy.go index 133f39c4..2d014913 100644 --- a/apis/apps/v1alpha1/zz_generated.deepcopy.go +++ b/apis/apps/v1alpha1/zz_generated.deepcopy.go @@ -215,6 +215,11 @@ func (in *MetadSpec) DeepCopyInto(out *MetadSpec) { *out = new(LicenseSpec) **out = **in } + if in.LicenseManagerURL != nil { + in, out := &in.LicenseManagerURL, &out.LicenseManagerURL + *out = new(string) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MetadSpec. diff --git a/charts/nebula-cluster/templates/nebula-cluster.yaml b/charts/nebula-cluster/templates/nebula-cluster.yaml index 0ff9ce4c..e7f959db 100644 --- a/charts/nebula-cluster/templates/nebula-cluster.yaml +++ b/charts/nebula-cluster/templates/nebula-cluster.yaml @@ -58,6 +58,7 @@ spec: resources: {{ toYaml .Values.nebula.metad.resources | nindent 6 }} image: {{ .Values.nebula.metad.image }} version: {{ .Values.nebula.version }} + licenseManagerURL: {{ .Values.nebula.metad.licenseManagerURL }} env: {{ toYaml .Values.nebula.metad.env | nindent 6 }} config: {{ toYaml .Values.nebula.metad.config | nindent 6 }} logVolumeClaim: @@ -72,7 +73,7 @@ spec: requests: storage: {{ .Values.nebula.metad.dataStorage }} {{- if .Values.nebula.storageClassName }} - storageClassName: {{ .Values.nebula.storageClassName }} + storageClassName: {{ .Values }} {{- end }} labels: {{ toYaml .Values.nebula.metad.podLabels | nindent 6 }} annotations: {{ toYaml .Values.nebula.metad.podAnnotations | nindent 6 }} diff --git a/charts/nebula-cluster/values.yaml b/charts/nebula-cluster/values.yaml index 459f2f71..9624f6cb 100644 --- a/charts/nebula-cluster/values.yaml +++ b/charts/nebula-cluster/values.yaml @@ -49,6 +49,7 @@ nebula: memory: "1Gi" logStorage: "500Mi" dataStorage: "2Gi" + licenseManagerURL: "" license: {} podLabels: {} podAnnotations: {} diff --git a/config/crd/bases/apps.nebula-graph.io_nebulaclusters.yaml b/config/crd/bases/apps.nebula-graph.io_nebulaclusters.yaml index e8aba428..b1185a53 100644 --- a/config/crd/bases/apps.nebula-graph.io_nebulaclusters.yaml +++ b/config/crd/bases/apps.nebula-graph.io_nebulaclusters.yaml @@ -6435,6 +6435,8 @@ spec: secretName: type: string type: object + licenseManagerURL: + type: string livenessProbe: properties: exec: diff --git a/config/crd/bases/apps.nebula-graph.io_nebularestores.yaml b/config/crd/bases/apps.nebula-graph.io_nebularestores.yaml index 5ab741b5..da0465ce 100644 --- a/config/crd/bases/apps.nebula-graph.io_nebularestores.yaml +++ b/config/crd/bases/apps.nebula-graph.io_nebularestores.yaml @@ -83,6 +83,7 @@ spec: additionalProperties: type: string type: object + nullable: true type: object clusterName: type: string @@ -107,6 +108,7 @@ spec: - status - type type: object + nullable: true type: array partitions: additionalProperties: @@ -122,14 +124,17 @@ spec: - port type: object type: array + nullable: true type: object phase: type: string timeCompleted: format: date-time + nullable: true type: string timeStarted: format: date-time + nullable: true type: string type: object type: object diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 20e21a92..f17d95dd 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -1,4 +1,3 @@ - --- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration @@ -26,7 +25,6 @@ webhooks: resources: - statefulsets sideEffects: None - --- apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration diff --git a/hack/tools.go b/hack/tools.go index df0f10d9..ce5cef39 100644 --- a/hack/tools.go +++ b/hack/tools.go @@ -1,3 +1,4 @@ +//go:build tools // +build tools /* diff --git a/pkg/controller/component/exporter.go b/pkg/controller/component/exporter.go index bdd8bb7b..3a978667 100644 --- a/pkg/controller/component/exporter.go +++ b/pkg/controller/component/exporter.go @@ -99,8 +99,10 @@ func (e *nebulaExporter) generateDeployment(nc *v1alpha1.NebulaCluster) *appsv1. container := corev1.Container{ Name: "ng-exporter", Image: nc.GetExporterImage(), - Args: []string{"--listen-address=0.0.0.0:9100", fmt.Sprintf("--namespace=%s", namespace), - fmt.Sprintf("--cluster=%s", ncName), fmt.Sprintf("--max-request=%d", nc.Spec.Exporter.MaxRequests)}, + Args: []string{ + "--listen-address=0.0.0.0:9100", fmt.Sprintf("--namespace=%s", namespace), + fmt.Sprintf("--cluster=%s", ncName), fmt.Sprintf("--max-request=%d", nc.Spec.Exporter.MaxRequests), + }, Env: nc.GetExporterEnvVars(), Ports: []corev1.ContainerPort{ { @@ -175,3 +177,19 @@ func (e *nebulaExporter) generateDeployment(nc *v1alpha1.NebulaCluster) *appsv1. return deployment } + +type FakeNebulaExporter struct { + err error +} + +func NewFakeNebulaExporter() *FakeNebulaExporter { + return &FakeNebulaExporter{} +} + +func (f *FakeNebulaExporter) SetReconcileError(err error) { + f.err = err +} + +func (f *FakeNebulaExporter) Reconcile(_ *v1alpha1.NebulaCluster) error { + return f.err +} diff --git a/pkg/controller/component/graphd_cluster.go b/pkg/controller/component/graphd_cluster.go index a5650fa5..bc00ed5c 100644 --- a/pkg/controller/component/graphd_cluster.go +++ b/pkg/controller/component/graphd_cluster.go @@ -44,7 +44,8 @@ func NewGraphdCluster( clientSet kube.ClientSet, dm discovery.Interface, um UpdateManager, - enableEvenPodsSpread bool) ReconcileManager { + enableEvenPodsSpread bool, +) ReconcileManager { return &graphdCluster{ clientSet: clientSet, dm: dm, @@ -134,7 +135,8 @@ func (c *graphdCluster) syncGraphdWorkload(nc *v1alpha1.NebulaCluster) error { func (c *graphdCluster) syncNebulaClusterStatus( nc *v1alpha1.NebulaCluster, newWorkload, - oldWorkload *unstructured.Unstructured) error { + oldWorkload *unstructured.Unstructured, +) error { if oldWorkload == nil { return nil } diff --git a/pkg/controller/component/helper.go b/pkg/controller/component/helper.go index 2a9da0d7..2d10a195 100644 --- a/pkg/controller/component/helper.go +++ b/pkg/controller/component/helper.go @@ -19,7 +19,6 @@ package component import ( "encoding/json" "fmt" - "k8s.io/klog/v2" "strings" appsv1 "k8s.io/api/apps/v1" @@ -28,6 +27,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "k8s.io/klog/v2" "github.com/vesoft-inc/nebula-operator/apis/apps/v1alpha1" "github.com/vesoft-inc/nebula-operator/pkg/annotation" @@ -49,7 +49,8 @@ const ( func syncComponentStatus( component v1alpha1.NebulaClusterComponentter, status *v1alpha1.ComponentStatus, - workload *unstructured.Unstructured) error { + workload *unstructured.Unstructured, +) error { if workload == nil { return nil } @@ -155,7 +156,8 @@ func syncConfigMap( component v1alpha1.NebulaClusterComponentter, cmClient kube.ConfigMap, template, - cmKey string) (*corev1.ConfigMap, string, bool, error) { + cmKey string, +) (*corev1.ConfigMap, string, bool, error) { cmHash := hash.Hash(template) cm := component.GenerateConfigMap() cfg := component.GetConfig() @@ -219,7 +221,8 @@ func updateDynamicFlags(endpoints []string, newAnnotations, oldAnnotations map[s func getContainerImage( obj *unstructured.Unstructured, - containerName string) string { + containerName string, +) string { if obj == nil { return "" } @@ -235,7 +238,8 @@ func getContainerImage( func isUpdating( component v1alpha1.NebulaClusterComponentter, podClient kube.Pod, - obj *unstructured.Unstructured) (bool, error) { + obj *unstructured.Unstructured, +) (bool, error) { if extender.IsUpdating(obj) { return true, nil } diff --git a/pkg/controller/component/metad_cluster.go b/pkg/controller/component/metad_cluster.go index f69ce3ba..29cb0b23 100644 --- a/pkg/controller/component/metad_cluster.go +++ b/pkg/controller/component/metad_cluster.go @@ -46,7 +46,8 @@ func NewMetadCluster( clientSet kube.ClientSet, dm discovery.Interface, um UpdateManager, - enableEvenPodsSpread bool) ReconcileManager { + enableEvenPodsSpread bool, +) ReconcileManager { return &metadCluster{ clientSet: clientSet, dm: dm, diff --git a/pkg/controller/component/storaged_cluster.go b/pkg/controller/component/storaged_cluster.go index d02f3e92..ee0ec7bb 100644 --- a/pkg/controller/component/storaged_cluster.go +++ b/pkg/controller/component/storaged_cluster.go @@ -48,7 +48,8 @@ func NewStoragedCluster( dm discovery.Interface, sm ScaleManager, um UpdateManager, - enableEvenPodsSpread bool) ReconcileManager { + enableEvenPodsSpread bool, +) ReconcileManager { return &storagedCluster{ clientSet: clientSet, dm: dm, @@ -173,7 +174,8 @@ func (c *storagedCluster) syncStoragedWorkload(nc *v1alpha1.NebulaCluster) error func (c *storagedCluster) syncNebulaClusterStatus( nc *v1alpha1.NebulaCluster, - oldWorkload *unstructured.Unstructured) error { + oldWorkload *unstructured.Unstructured, +) error { if oldWorkload == nil { return nil } diff --git a/pkg/controller/component/storaged_scaler.go b/pkg/controller/component/storaged_scaler.go index 488c39c3..1ac5bfc6 100644 --- a/pkg/controller/component/storaged_scaler.go +++ b/pkg/controller/component/storaged_scaler.go @@ -255,7 +255,8 @@ func (ss *storageScaler) removeHost( mc nebula.MetaInterface, nc *v1alpha1.NebulaCluster, spaceID nebulago.GraphSpaceID, - hosts []*nebulago.HostAddr) error { + hosts []*nebulago.HostAddr, +) error { if nc.Status.Storaged.LastBalanceJob != nil && nc.Status.Storaged.LastBalanceJob.SpaceID == spaceID { return mc.BalanceStatus(nc.Status.Storaged.LastBalanceJob.JobID, nc.Status.Storaged.LastBalanceJob.SpaceID) } diff --git a/pkg/controller/nebulacluster/nebula_cluster_control.go b/pkg/controller/nebulacluster/nebula_cluster_control.go index 132af120..9acaf1c3 100644 --- a/pkg/controller/nebulacluster/nebula_cluster_control.go +++ b/pkg/controller/nebulacluster/nebula_cluster_control.go @@ -43,7 +43,8 @@ func NewDefaultNebulaClusterControl( exporter component.ReconcileManager, metaReconciler component.ReconcileManager, pvcReclaimer reclaimer.PVCReclaimer, - conditionUpdater ClusterConditionUpdater) ControlInterface { + conditionUpdater ClusterConditionUpdater, +) ControlInterface { return &defaultNebulaClusterControl{ nebulaClient: nebulaClient, graphdCluster: graphdCluster, diff --git a/pkg/controller/nebulacluster/nebula_cluster_control_test.go b/pkg/controller/nebulacluster/nebula_cluster_control_test.go index 867f50e6..e369d543 100644 --- a/pkg/controller/nebulacluster/nebula_cluster_control_test.go +++ b/pkg/controller/nebulacluster/nebula_cluster_control_test.go @@ -130,12 +130,14 @@ func newFakeNebulaClusterControl() ( // nolint: gocritic *component.FakeMetadCluster, *component.FakeStoragedCluster, *reclaimer.FakeMetaReconciler, - *reclaimer.FakePVCReclaimer) { + *reclaimer.FakePVCReclaimer, +) { cli := fake.NewClientBuilder().Build() fakeNebulaClient := kube.NewFakeNebulaCluster(cli) graphdCluster := component.NewFakeGraphdCluster() metadCluster := component.NewFakeMetadCluster() storagedCluster := component.NewFakeStoragedCluster() + exporter := component.NewFakeNebulaExporter() metaReconciler := reclaimer.NewFakeMetaReconciler() pvcReclaimer := reclaimer.NewFakePVCReclaimer() control := NewDefaultNebulaClusterControl( @@ -143,6 +145,7 @@ func newFakeNebulaClusterControl() ( // nolint: gocritic graphdCluster, metadCluster, storagedCluster, + exporter, metaReconciler, pvcReclaimer, &nebulaClusterConditionUpdater{}) diff --git a/pkg/controller/nebulacluster/nebula_cluster_controller.go b/pkg/controller/nebulacluster/nebula_cluster_controller.go index c6ae2eee..e7a2e5f8 100644 --- a/pkg/controller/nebulacluster/nebula_cluster_controller.go +++ b/pkg/controller/nebulacluster/nebula_cluster_controller.go @@ -163,6 +163,7 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re return ctrl.Result{}, fmt.Errorf("openkruise scheme not registered") } + // TODO: check lm license key valid if err := r.syncNebulaCluster(nebulaCluster.DeepCopy()); err != nil { isReconcileError := func(err error) (b bool) { defer func() { diff --git a/pkg/controller/nebularestore/nebula_restore_manager.go b/pkg/controller/nebularestore/nebula_restore_manager.go index df6c90e7..b84bb61b 100644 --- a/pkg/controller/nebularestore/nebula_restore_manager.go +++ b/pkg/controller/nebularestore/nebula_restore_manager.go @@ -24,16 +24,16 @@ import ( "strings" "time" - pb "github.com/vesoft-inc/nebula-agent/pkg/proto" - "github.com/vesoft-inc/nebula-agent/pkg/storage" - ng "github.com/vesoft-inc/nebula-go/v3/nebula" - "github.com/vesoft-inc/nebula-go/v3/nebula/meta" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/klog/v2" "k8s.io/utils/pointer" + pb "github.com/vesoft-inc/nebula-agent/pkg/proto" + "github.com/vesoft-inc/nebula-agent/pkg/storage" + ng "github.com/vesoft-inc/nebula-go/v3/nebula" + "github.com/vesoft-inc/nebula-go/v3/nebula/meta" "github.com/vesoft-inc/nebula-operator/apis/apps/v1alpha1" "github.com/vesoft-inc/nebula-operator/pkg/annotation" "github.com/vesoft-inc/nebula-operator/pkg/kube" @@ -138,7 +138,8 @@ func (rm *restoreManager) syncRestoreProcess(rt *v1alpha1.NebulaRestore) error { TimeCompleted: &metav1.Time{Time: time.Now()}, ConditionType: v1alpha1.RestoreComplete, Partitions: nil, - Checkpoints: nil}) + Checkpoints: nil, + }) } original, err := rm.clientSet.NebulaCluster().GetNebulaCluster(ns, originalName) @@ -217,7 +218,8 @@ func (rm *restoreManager) syncRestoreProcess(rt *v1alpha1.NebulaRestore) error { Status: corev1.ConditionTrue, }, &kube.RestoreUpdateStatus{ Partitions: hostPartMap, - ConditionType: v1alpha1.RestoreMetadComplete}); err != nil { + ConditionType: v1alpha1.RestoreMetadComplete, + }); err != nil { return err } } @@ -253,7 +255,8 @@ func (rm *restoreManager) syncRestoreProcess(rt *v1alpha1.NebulaRestore) error { Status: corev1.ConditionTrue, }, &kube.RestoreUpdateStatus{ Checkpoints: checkpoints, - ConditionType: v1alpha1.RestoreStoragedCompleted}); err != nil { + ConditionType: v1alpha1.RestoreStoragedCompleted, + }); err != nil { return err } } @@ -735,7 +738,6 @@ func (rm *restoreManager) updateClusterAnnotations(namespace, ncName string, ann } return nil - } func (rm *restoreManager) endpointsConnected(endpoints []string) bool { diff --git a/pkg/kube/nebularestore.go b/pkg/kube/nebularestore.go index 58db7eba..339e92e7 100644 --- a/pkg/kube/nebularestore.go +++ b/pkg/kube/nebularestore.go @@ -20,7 +20,6 @@ import ( "context" "fmt" - "github.com/vesoft-inc/nebula-go/v3/nebula" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" @@ -28,6 +27,7 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/vesoft-inc/nebula-go/v3/nebula" "github.com/vesoft-inc/nebula-operator/apis/apps/v1alpha1" condutil "github.com/vesoft-inc/nebula-operator/pkg/util/condition" ) diff --git a/pkg/nebula/meta_client.go b/pkg/nebula/meta_client.go index 5bde297b..3b46e387 100644 --- a/pkg/nebula/meta_client.go +++ b/pkg/nebula/meta_client.go @@ -21,11 +21,11 @@ import ( "strconv" "github.com/pkg/errors" - "github.com/vesoft-inc/nebula-go/v3/nebula" - "github.com/vesoft-inc/nebula-go/v3/nebula/meta" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" + "github.com/vesoft-inc/nebula-go/v3/nebula" + "github.com/vesoft-inc/nebula-go/v3/nebula/meta" utilerrors "github.com/vesoft-inc/nebula-operator/pkg/util/errors" ) diff --git a/pkg/nebula/options.go b/pkg/nebula/options.go index 71bdacf3..3a830a7b 100644 --- a/pkg/nebula/options.go +++ b/pkg/nebula/options.go @@ -18,9 +18,10 @@ package nebula import ( "crypto/tls" - "k8s.io/klog/v2" "time" + "k8s.io/klog/v2" + "github.com/vesoft-inc/nebula-operator/apis/apps/v1alpha1" "github.com/vesoft-inc/nebula-operator/pkg/util/cert" ) diff --git a/pkg/nebula/storage_client.go b/pkg/nebula/storage_client.go index 2cb0648b..75d26856 100644 --- a/pkg/nebula/storage_client.go +++ b/pkg/nebula/storage_client.go @@ -18,9 +18,10 @@ package nebula import ( "github.com/pkg/errors" + "k8s.io/klog/v2" + "github.com/vesoft-inc/nebula-go/v3/nebula" "github.com/vesoft-inc/nebula-go/v3/nebula/storage" - "k8s.io/klog/v2" ) var ErrNoAvailableStoragedEndpoints = errors.New("storagedclient: no available endpoints") diff --git a/pkg/util/extender/unstructured.go b/pkg/util/extender/unstructured.go index a15f5e6b..bf3e4316 100644 --- a/pkg/util/extender/unstructured.go +++ b/pkg/util/extender/unstructured.go @@ -198,7 +198,8 @@ func ObjectEqual(newUnstruct, oldUnstruct *unstructured.Unstructured) bool { func UpdateWorkload( workloadClient kube.Workload, newUnstruct, - oldUnstruct *unstructured.Unstructured) error { + oldUnstruct *unstructured.Unstructured, +) error { isOrphan := metav1.GetControllerOf(oldUnstruct) == nil if !ObjectEqual(newUnstruct, oldUnstruct) || isOrphan { w := oldUnstruct @@ -258,7 +259,8 @@ func SetUpdatePartition( obj *unstructured.Unstructured, upgradeOrdinal, gracePeriod int64, - advanced bool) error { + advanced bool, +) error { if err := SetSpecField(obj, "RollingUpdate", "updateStrategy", "type"); err != nil { return err } diff --git a/pkg/util/restore/hosts.go b/pkg/util/restore/hosts.go index 7fa9bda1..c83eeace 100644 --- a/pkg/util/restore/hosts.go +++ b/pkg/util/restore/hosts.go @@ -45,7 +45,6 @@ func (h *NebulaHosts) LoadFrom(resp *meta.ListClusterInfoResp) error { case meta.HostRole_GRAPH, meta.HostRole_META, meta.HostRole_STORAGE, meta.HostRole_AGENT: h.hosts[host] = append(h.hosts[host], s) } - } } diff --git a/pkg/util/restore/restore.go b/pkg/util/restore/restore.go index 7a0348c1..265db2cd 100644 --- a/pkg/util/restore/restore.go +++ b/pkg/util/restore/restore.go @@ -25,6 +25,7 @@ import ( "strings" "github.com/facebook/fbthrift/thrift/lib/go/thrift" + pb "github.com/vesoft-inc/nebula-agent/pkg/proto" "github.com/vesoft-inc/nebula-go/v3/nebula" "github.com/vesoft-inc/nebula-go/v3/nebula/meta" @@ -53,7 +54,7 @@ func ParseAddr(addrStr string) (*nebula.HostAddr, error) { } func ParseMetaFromFile(filename string) (*meta.BackupMeta, error) { - file, err := os.OpenFile(filename, os.O_RDONLY, 0644) + file, err := os.OpenFile(filename, os.O_RDONLY, 0o644) if err != nil { return nil, err }