feat: support config license_manager_url

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 (

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 {

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)
 }
 

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)
 }
 

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)
 }
 

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

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

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 }}

charts/nebula-cluster/values.yaml

@@ -49,6 +49,7 @@ nebula:
         memory: "1Gi"
     logStorage: "500Mi"
     dataStorage: "2Gi"
+    licenseManagerURL: ""
     license: {}
     podLabels: {}
     podAnnotations: {}

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:

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

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

hack/tools.go

@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 /*

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
+}

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
 	}

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
 	}

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,

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
 	}

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)
 	}

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,

pkg/controller/nebulacluster/nebula_cluster_control_test.go

@@ -130,19 +130,22 @@ 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(
 		fakeNebulaClient,
 		graphdCluster,
 		metadCluster,
 		storagedCluster,
+		exporter,
 		metaReconciler,
 		pvcReclaimer,
 		&nebulaClusterConditionUpdater{})

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() {