feat: add spec port

apis/apps/v1alpha1/nebulacluster_common.go

@@ -470,6 +470,12 @@ func generateContainers(c NebulaClusterComponent, cm *corev1.ConfigMap) []corev1
  if c.ComponentType() == GraphdComponentType && nc.IsIntraZoneReadingEnabled() {
  flags += " --assigned_zone=$NODE_ZONE"
  }
+ if !c.IsDefaultThriftPort() {
+ flags += " --port=" + strconv.Itoa(int(c.GetThriftPort()))
+ }
+ if !c.IsDefaultHTTPPort() {
+ flags += " --ws_http_port=" + strconv.Itoa(int(c.GetHTTPPort()))
+ }
 
  cmd := []string{"/bin/sh", "-ecx"}
  if c.ComponentType() == GraphdComponentType && nc.IsIntraZoneReadingEnabled() {

apis/apps/v1alpha1/nebulacluster_component.go

@@ -206,6 +206,11 @@ type NebulaClusterComponent interface {
  IsReady() bool
  GetUpdateRevision() string
  UpdateComponentStatus(status *ComponentStatus)
+
+ IsDefaultThriftPort() bool
+ GetThriftPort() int32
+ IsDefaultHTTPPort() bool
+ GetHTTPPort() int32
 }
 
 // +k8s:deepcopy-gen=false

apis/apps/v1alpha1/nebulacluster_graphd.go

@@ -33,8 +33,6 @@ const (
  defaultGraphdPortThrift = 9669
  GraphdPortNameHTTP = "http"
  defaultGraphdPortHTTP = 19669
- GraphdPortNameHTTP2 = "http2"
- defaultGraphdPortHTTP2 = 19670
  defaultGraphdImage = "vesoft/nebula-graphd"
 )
 
@@ -141,15 +139,11 @@ func (c *graphdComponent) GenerateContainerPorts() []corev1.ContainerPort {
  return []corev1.ContainerPort{
  {
  Name: GraphdPortNameThrift,
- ContainerPort: defaultGraphdPortThrift,
+ ContainerPort: c.nc.Spec.Graphd.Port,
  },
  {
  Name: GraphdPortNameHTTP,
- ContainerPort: defaultGraphdPortHTTP,
- },
- {
- Name: GraphdPortNameHTTP2,
- ContainerPort: defaultGraphdPortHTTP2,
+ ContainerPort: c.nc.Spec.Graphd.HTTPPort,
  },
  }
 }
@@ -308,3 +302,19 @@ func (c *graphdComponent) GenerateConfigMap() *corev1.ConfigMap {
 func (c *graphdComponent) UpdateComponentStatus(status *ComponentStatus) {
  c.nc.Status.Graphd = *status
 }
+
+func (c *graphdComponent) IsDefaultThriftPort() bool {
+ return c.nc.Spec.Graphd.Port == defaultGraphdPortThrift
+}
+
+func (c *graphdComponent) GetThriftPort() int32 {
+ return c.nc.Spec.Graphd.Port
+}
+
+func (c *graphdComponent) IsDefaultHTTPPort() bool {
+ return c.nc.Spec.Graphd.HTTPPort == defaultGraphdPortHTTP
+}
+
+func (c *graphdComponent) GetHTTPPort() int32 {
+ return c.nc.Spec.Graphd.HTTPPort
+}

apis/apps/v1alpha1/nebulacluster_metad.go

@@ -33,8 +33,6 @@ const (
  defaultMetadPortThrift = 9559
  MetadPortNameHTTP = "http"
  defaultMetadPortHTTP = 19559
- MetadPortNameHTTP2 = "http2"
- defaultMetadPortHTTP2 = 19560
  defaultMetadImage = "vesoft/nebula-metad"
 )
 
@@ -158,15 +156,11 @@ func (c *metadComponent) GenerateContainerPorts() []corev1.ContainerPort {
  return []corev1.ContainerPort{
  {
  Name: MetadPortNameThrift,
- ContainerPort: defaultMetadPortThrift,
+ ContainerPort: c.nc.Spec.Metad.Port,
  },
  {
  Name: MetadPortNameHTTP,
- ContainerPort: defaultMetadPortHTTP,
- },
- {
- Name: MetadPortNameHTTP2,
- ContainerPort: defaultMetadPortHTTP2,
+ ContainerPort: c.nc.Spec.Metad.HTTPPort,
  },
  }
 }
@@ -386,3 +380,19 @@ func (c *metadComponent) GenerateConfigMap() *corev1.ConfigMap {
 func (c *metadComponent) UpdateComponentStatus(status *ComponentStatus) {
  c.nc.Status.Metad = *status
 }
+
+func (c *metadComponent) IsDefaultThriftPort() bool {
+ return c.nc.Spec.Metad.Port == defaultMetadPortThrift
+}
+
+func (c *metadComponent) GetThriftPort() int32 {
+ return c.nc.Spec.Metad.Port
+}
+
+func (c *metadComponent) IsDefaultHTTPPort() bool {
+ return c.nc.Spec.Metad.HTTPPort == defaultMetadPortHTTP
+}
+
+func (c *metadComponent) GetHTTPPort() int32 {
+ return c.nc.Spec.Metad.HTTPPort
+}

apis/apps/v1alpha1/nebulacluster_storaged.go

@@ -33,8 +33,6 @@ const (
  defaultStoragedPortThrift = 9779
  StoragedPortNameHTTP = "http"
  defaultStoragedPortHTTP = 19779
- StoragedPortNameHTTP2 = "http2"
- defaultStoragedPortHTTP2 = 19780
  StoragedPortNameAdmin = "admin"
  defaultStoragedPortAdmin = 9778
  defaultStoragedImage = "vesoft/nebula-storaged"
@@ -159,19 +157,15 @@ func (c *storagedComponent) GenerateContainerPorts() []corev1.ContainerPort {
  return []corev1.ContainerPort{
  {
  Name: StoragedPortNameThrift,
- ContainerPort: defaultStoragedPortThrift,
+ ContainerPort: c.nc.Spec.Storaged.Port,
  },
  {
  Name: StoragedPortNameHTTP,
- ContainerPort: defaultStoragedPortHTTP,
- },
- {
- Name: StoragedPortNameHTTP2,
- ContainerPort: defaultStoragedPortHTTP2,
+ ContainerPort: c.nc.Spec.Storaged.HTTPPort,
  },
  {
  Name: StoragedPortNameAdmin,
- ContainerPort: defaultStoragedPortAdmin,
+ ContainerPort: c.nc.Spec.Storaged.Port - 1,
  },
  }
 }
@@ -388,3 +382,19 @@ func storageDataVolumeClaims(storageClaims []StorageClaim, componentType string)
  }
  return pvcs, nil
 }
+
+func (c *storagedComponent) IsDefaultThriftPort() bool {
+ return c.nc.Spec.Storaged.Port == defaultStoragedPortThrift
+}
+
+func (c *storagedComponent) GetThriftPort() int32 {
+ return c.nc.Spec.Storaged.Port
+}
+
+func (c *storagedComponent) IsDefaultHTTPPort() bool {
+ return c.nc.Spec.Storaged.HTTPPort == defaultStoragedPortHTTP
+}
+
+func (c *storagedComponent) GetHTTPPort() int32 {
+ return c.nc.Spec.Storaged.HTTPPort
+}

apis/apps/v1alpha1/nebulacluster_types.go

@@ -237,6 +237,10 @@ type ExporterSpec struct {
  // IgnoreRegex means the regex to ignore metrics
  // +optional
  IgnoreRegex string `json:"ignoreRegex,omitempty"`
+
+ // +optional
+ // +kubebuilder:default=9100
+ HTTPPort int32 `json:"httpPort,omitempty"`
 }
 
 type ConsoleSpec struct {
@@ -358,6 +362,14 @@ type GraphdSpec struct {
  // K8S persistent volume claim for Graphd log volume.
  // +optional
  LogVolumeClaim *StorageClaim `json:"logVolumeClaim,omitempty"`
+
+ // +optional
+ // +kubebuilder:default=9669
+ Port int32 `json:"port,omitempty"`
+
+ // +optional
+ // +kubebuilder:default=19669
+ HTTPPort int32 `json:"httpPort,omitempty"`
 }
 
 // MetadSpec defines the desired state of Metad
@@ -384,6 +396,14 @@ type MetadSpec struct {
 
  // LicenseManagerURL defines a nebula license manager url
  LicenseManagerURL *string `json:"licenseManagerURL,omitempty"`
+
+ // +optional
+ // +kubebuilder:default=9559
+ Port int32 `json:"port,omitempty"`
+
+ // +optional
+ // +kubebuilder:default=19559
+ HTTPPort int32 `json:"httpPort,omitempty"`
 }
 
 // StoragedSpec defines the desired state of Storaged
@@ -417,6 +437,14 @@ type StoragedSpec struct {
  // Note: This feature is in alpha state.
  // +optional
  ConcurrentTransfer *bool `json:"concurrentTransfer,omitempty"`
+
+ // +optional
+ // +kubebuilder:default=9779
+ Port int32 `json:"port,omitempty"`
+
+ // +optional
+ // +kubebuilder:default=19779
+ HTTPPort int32 `json:"httpPort,omitempty"`
 }
 
 // ComponentSpec is a common set of k8s resource configs for nebula components.

config/crd/bases/apps.nebula-graph.io_nebulaclusters.yaml

@@ -920,6 +920,10 @@ spec:
  - name
  type: object
  type: array
+ httpPort:
+ default: 9100
+ format: int32
+ type: integer
  ignoreRegex:
  type: string
  image:
@@ -3590,6 +3594,10 @@ spec:
  - name
  type: object
  type: array
+ httpPort:
+ default: 19669
+ format: int32
+ type: integer
  image:
  type: string
  initContainers:
@@ -4319,6 +4327,10 @@ spec:
  additionalProperties:
  type: string
  type: object
+ port:
+ default: 9669
+ format: int32
+ type: integer
  readinessProbe:
  properties:
  exec:
@@ -6368,6 +6380,10 @@ spec:
  - name
  type: object
  type: array
+ httpPort:
+ default: 19559
+ format: int32
+ type: integer
  image:
  type: string
  initContainers:
@@ -7106,6 +7122,10 @@ spec:
  additionalProperties:
  type: string
  type: object
+ port:
+ default: 9559
+ format: int32
+ type: integer
  readinessProbe:
  properties:
  exec:
@@ -9187,6 +9207,10 @@ spec:
  - name
  type: object
  type: array
+ httpPort:
+ default: 19779
+ format: int32
+ type: integer
  image:
  type: string
  initContainers:
@@ -9916,6 +9940,10 @@ spec:
  additionalProperties:
  type: string
  type: object
+ port:
+ default: 9779
+ format: int32
+ type: integer
  readinessProbe:
  properties:
  exec:

pkg/controller/component/exporter.go

@@ -32,8 +32,6 @@ import (
  "github.com/vesoft-inc/nebula-operator/pkg/util/maputil"
 )
 
-const defaultMetricsPort = 9100
-
 type nebulaExporter struct {
  clientSet kube.ClientSet
 }
@@ -97,8 +95,8 @@ func (e *nebulaExporter) generateService(nc *v1alpha1.NebulaCluster) *corev1.Ser
  {
  Name: "metrics",
  Protocol: corev1.ProtocolTCP,
- Port: defaultMetricsPort,
- TargetPort: intstr.FromInt(defaultMetricsPort),
+ Port: nc.Spec.Exporter.HTTPPort,
+ TargetPort: intstr.FromInt(int(nc.Spec.Exporter.HTTPPort)),
  },
  },
  },
@@ -137,7 +135,7 @@ func (e *nebulaExporter) generateDeployment(nc *v1alpha1.NebulaCluster) *appsv1.
  {
  Name: "metrics",
  Protocol: corev1.ProtocolTCP,
- ContainerPort: defaultMetricsPort,
+ ContainerPort: nc.Spec.Exporter.HTTPPort,
  },
  },
  VolumeMounts: nc.ExporterComponent().ComponentSpec().VolumeMounts(),
@@ -149,7 +147,7 @@ func (e *nebulaExporter) generateDeployment(nc *v1alpha1.NebulaCluster) *appsv1.
  container.LivenessProbe = &corev1.Probe{
  ProbeHandler: corev1.ProbeHandler{
  HTTPGet: &corev1.HTTPGetAction{
- Port: intstr.FromInt(defaultMetricsPort),
+ Port: intstr.FromInt(int(nc.Spec.Exporter.HTTPPort)),
  Path: "/health",
  Scheme: corev1.URISchemeHTTP,
  },