feat: support user-defined annotation, env and volumes

apecloud · Jun 17, 2024 · 0de4d14 · 0de4d14
1 parent 0ca2de5
commit 0de4d14
Show file tree

Hide file tree

Showing 17 changed files with 15,112 additions and 4,077 deletions.
diff --git a/apis/apps/v1alpha1/cluster_types.go b/apis/apps/v1alpha1/cluster_types.go
@@ -652,6 +652,16 @@ type ClusterComponentSpec struct {
  // +optional
  EnabledLogs []string `json:"enabledLogs,omitempty"`
 
+ // Specifies Annotations to override or add for underlying Pods.
+ //
+ // +optional
+ Annotations map[string]string `json:"annotations,omitempty"`
+
+ // List of environment variables to add.
+ //
+ // +optional
+ Env []corev1.EnvVar `json:"env,omitempty"`
+
  // Specifies the desired number of replicas in the Component for enhancing availability and durability, or load balancing.
  //
  // +kubebuilder:validation:Required
@@ -706,6 +716,11 @@ type ClusterComponentSpec struct {
  // +optional
  VolumeClaimTemplates []ClusterComponentVolumeClaimTemplate `json:"volumeClaimTemplates,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name"`
 
+ // List of volumes to override.
+ //
+ // +optional
+ Volumes []corev1.Volume `json:"volumes,omitempty"`
+
  // Overrides services defined in referenced ComponentDefinition and expose endpoints that can be accessed by clients.
  //
  // +optional
@@ -716,6 +731,8 @@ type ClusterComponentSpec struct {
  // +optional
  SystemAccounts []ComponentSystemAccount `json:"systemAccounts,omitempty"`
 
+ // Specifies the configuration content of a config template.
+ //
  // +optional
  Configs []ClusterComponentConfig `json:"configs,omitempty"`
 

diff --git a/apis/apps/v1alpha1/component_types.go b/apis/apps/v1alpha1/component_types.go
@@ -65,6 +65,16 @@ type ComponentSpec struct {
  // +optional
  ServiceRefs []ServiceRef `json:"serviceRefs,omitempty"`
 
+ // Specifies Annotations to override or add for underlying Pods.
+ //
+ // +optional
+ Annotations map[string]string `json:"annotations,omitempty"`
+
+ // List of environment variables to add.
+ //
+ // +optional
+ Env []corev1.EnvVar `json:"env,omitempty"`
+
  // Specifies the resources required by the Component.
  // It allows defining the CPU, memory requirements and limits for the Component's containers.
  //
@@ -82,6 +92,11 @@ type ComponentSpec struct {
  // +patchStrategy=merge,retainKeys
  VolumeClaimTemplates []ClusterComponentVolumeClaimTemplate `json:"volumeClaimTemplates,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name"`
 
+ // List of volumes to override.
+ //
+ // +optional
+ Volumes []corev1.Volume `json:"volumes,omitempty"`
+
  // Overrides Services defined in referenced ComponentDefinition and exposes endpoints that can be accessed
  // by clients.
  //
@@ -100,6 +115,8 @@ type ComponentSpec struct {
  // +kubebuilder:default=1
  Replicas int32 `json:"replicas"`
 
+ // Specifies the configuration content of a config template.
+ //
  // +optional
  Configs []ClusterComponentConfig `json:"configs,omitempty"`
 

diff --git a/apis/apps/v1alpha1/zz_generated.deepcopy.go b/apis/apps/v1alpha1/zz_generated.deepcopy.go