k8s supported features and nginx-ingress

apis/apps/v1alpha1/nebulacluster_common.go

@@ -209,18 +209,23 @@ func generateContainers(c NebulaClusterComponentter, cm *corev1.ConfigMap) []cor
 		Env:          c.GetPodEnvVars(),
 		Ports:        ports,
 		VolumeMounts: mounts,
-		ReadinessProbe: &corev1.Probe{
+	}
+
+	if c.ReadinessProbe() != nil {
+		container.ReadinessProbe = c.ReadinessProbe()
+	} else {
+		container.ReadinessProbe = &corev1.Probe{
 			Handler: corev1.Handler{
 				HTTPGet: &corev1.HTTPGetAction{
 					Path:   "/status",
 					Port:   intstr.FromInt(int(ports[1].ContainerPort)),
 					Scheme: corev1.URISchemeHTTP,
 				},
 			},
-			InitialDelaySeconds: int32(20),
+			InitialDelaySeconds: int32(10),
 			TimeoutSeconds:      int32(5),
 			PeriodSeconds:       int32(10),
-		},
+		}
 	}
 
 	resources := c.GetResources()
@@ -234,6 +239,7 @@ func generateContainers(c NebulaClusterComponentter, cm *corev1.ConfigMap) []cor
 	}
 
 	containers = append(containers, container)
+	containers = append(containers, c.SidecarContainers()...)
 
 	return containers
 }
@@ -265,13 +271,16 @@ func generateStatefulSet(c NebulaClusterComponentter, cm *corev1.ConfigMap, enab
 			},
 		})
 	}
+	volumes = append(volumes, c.SidecarVolumes()...)
 
 	podSpec := corev1.PodSpec{
 		SchedulerName:    nc.Spec.SchedulerName,
 		NodeSelector:     c.NodeSelector(),
 		Containers:       containers,
 		Volumes:          volumes,
 		ImagePullSecrets: nc.Spec.ImagePullSecrets,
+		Affinity:         c.Affinity(),
+		Tolerations:      c.Tolerations(),
 	}
 
 	if nc.Spec.SchedulerName == corev1.DefaultSchedulerName && enableEvenPodsSpread {

apis/apps/v1alpha1/nebulacluster_componentter.go

@@ -39,7 +39,14 @@ type NebulaClusterComponentter interface {
 	GetPodEnvVars() []corev1.EnvVar
 	GetPodAnnotations() map[string]string
 	GetPodLabels() map[string]string
+	GetLogStorageResources() *corev1.ResourceRequirements
+	GetDataStorageResources() *corev1.ResourceRequirements
 	NodeSelector() map[string]string
+	Affinity() *corev1.Affinity
+	Tolerations() []corev1.Toleration
+	SidecarContainers() []corev1.Container
+	SidecarVolumes() []corev1.Volume
+	ReadinessProbe() *corev1.Probe
 	IsHeadlessService() bool
 	GetServiceSpec() *ServiceSpec
 	GetServiceName() string

apis/apps/v1alpha1/nebulacluster_graphd.go

@@ -90,6 +90,10 @@ func (c *graphdComponent) GetLogStorageResources() *corev1.ResourceRequirements
 	return c.nc.Spec.Graphd.LogVolumeClaim.Resources.DeepCopy()
 }
 
+func (c *graphdComponent) GetDataStorageResources() *corev1.ResourceRequirements {
+	return nil
+}
+
 func (c *graphdComponent) GetPodEnvVars() []corev1.EnvVar {
 	return c.nc.Spec.Graphd.PodSpec.EnvVars
 }
@@ -113,6 +117,34 @@ func (c *graphdComponent) NodeSelector() map[string]string {
 	return selector
 }
 
+func (c *graphdComponent) Affinity() *corev1.Affinity {
+	affinity := c.nc.Spec.Graphd.PodSpec.Affinity
+	if affinity == nil {
+		affinity = c.nc.Spec.Affinity
+	}
+	return affinity
+}
+
+func (c *graphdComponent) Tolerations() []corev1.Toleration {
+	tolerations := c.nc.Spec.Graphd.PodSpec.Tolerations
+	if len(tolerations) == 0 {
+		return c.nc.Spec.Tolerations
+	}
+	return tolerations
+}
+
+func (c *graphdComponent) SidecarContainers() []corev1.Container {
+	return c.nc.Spec.Graphd.PodSpec.SidecarContainers
+}
+
+func (c *graphdComponent) SidecarVolumes() []corev1.Volume {
+	return c.nc.Spec.Graphd.PodSpec.SidecarVolumes
+}
+
+func (c *graphdComponent) ReadinessProbe() *corev1.Probe {
+	return c.nc.Spec.Graphd.PodSpec.ReadinessProbe
+}
+
 func (c *graphdComponent) IsHeadlessService() bool {
 	return false
 }

apis/apps/v1alpha1/nebulacluster_metad.go

@@ -125,6 +125,34 @@ func (c *metadComponent) NodeSelector() map[string]string {
 	return selector
 }
 
+func (c *metadComponent) Affinity() *corev1.Affinity {
+	affinity := c.nc.Spec.Metad.PodSpec.Affinity
+	if affinity == nil {
+		affinity = c.nc.Spec.Affinity
+	}
+	return affinity
+}
+
+func (c *metadComponent) Tolerations() []corev1.Toleration {
+	tolerations := c.nc.Spec.Metad.PodSpec.Tolerations
+	if len(tolerations) == 0 {
+		return c.nc.Spec.Tolerations
+	}
+	return tolerations
+}
+
+func (c *metadComponent) SidecarContainers() []corev1.Container {
+	return c.nc.Spec.Metad.PodSpec.SidecarContainers
+}
+
+func (c *metadComponent) SidecarVolumes() []corev1.Volume {
+	return c.nc.Spec.Metad.PodSpec.SidecarVolumes
+}
+
+func (c *metadComponent) ReadinessProbe() *corev1.Probe {
+	return c.nc.Spec.Metad.PodSpec.ReadinessProbe
+}
+
 func (c *metadComponent) IsHeadlessService() bool {
 	return true
 }
@@ -230,6 +258,7 @@ func (c *metadComponent) GenerateVolumes() []corev1.Volume {
 	}
 }
 
+// nolint: dupl
 func (c *metadComponent) GenerateVolumeClaim() ([]corev1.PersistentVolumeClaim, error) {
 	componentType := c.Type().String()
 	logSC, logRes := c.GetLogStorageClass(), c.GetLogStorageResources()

apis/apps/v1alpha1/nebulacluster_storaged.go

@@ -127,6 +127,34 @@ func (c *storagedComponent) NodeSelector() map[string]string {
 	return selector
 }
 
+func (c *storagedComponent) Affinity() *corev1.Affinity {
+	affinity := c.nc.Spec.Storaged.PodSpec.Affinity
+	if affinity == nil {
+		affinity = c.nc.Spec.Affinity
+	}
+	return affinity
+}
+
+func (c *storagedComponent) Tolerations() []corev1.Toleration {
+	tolerations := c.nc.Spec.Storaged.PodSpec.Tolerations
+	if len(tolerations) == 0 {
+		return c.nc.Spec.Tolerations
+	}
+	return tolerations
+}
+
+func (c *storagedComponent) SidecarContainers() []corev1.Container {
+	return c.nc.Spec.Storaged.PodSpec.SidecarContainers
+}
+
+func (c *storagedComponent) SidecarVolumes() []corev1.Volume {
+	return c.nc.Spec.Storaged.PodSpec.SidecarVolumes
+}
+
+func (c *storagedComponent) ReadinessProbe() *corev1.Probe {
+	return c.nc.Spec.Storaged.PodSpec.ReadinessProbe
+}
+
 func (c *storagedComponent) IsHeadlessService() bool {
 	return true
 }
@@ -236,6 +264,7 @@ func (c *storagedComponent) GenerateVolumes() []corev1.Volume {
 	}
 }
 
+// nolint: dupl
 func (c *storagedComponent) GenerateVolumeClaim() ([]corev1.PersistentVolumeClaim, error) {
 	componentType := c.Type().String()
 	logSC, logRes := c.GetLogStorageClass(), c.GetLogStorageResources()

apis/apps/v1alpha1/nebulacluster_types.go

@@ -79,6 +79,12 @@ type NebulaClusterSpec struct {
 	// +optional
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 
+	// +optional
+	Affinity *corev1.Affinity `json:"affinity,omitempty"`
+
+	// +optional
+	Tolerations []corev1.Toleration `json:"toleration,omitempty"`
+
 	// UpdatePolicy indicates how pods should be updated
 	// +optional
 	UpdatePolicy string `json:"strategy,omitempty"`
@@ -249,6 +255,21 @@ type PodSpec struct {
 	// K8S nodeSelector.
 	// +optional
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+
+	// +optional
+	Affinity *corev1.Affinity `json:"affinity,omitempty"`
+
+	// +optional
+	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
+
+	// +optional
+	SidecarContainers []corev1.Container `json:"sidecarContainers,omitempty"`
+
+	// +optional
+	SidecarVolumes []corev1.Volume `json:"sidecarVolumes,omitempty"`
+
+	// +optional
+	ReadinessProbe *corev1.Probe `json:"readinessProbe,omitempty"`
 }
 
 // StorageClaim contains details of storages

cmd/controller-manager/main.go

@@ -53,7 +53,7 @@ const (
 	defaultPrintVersion                   = false
 	defaultEnableLeaderElection           = false
 	defaultEnableAdmissionWebhook         = false
-  defaultEnableKruise                   = false
+	defaultEnableKruise                   = false
 )
 
 var (