Merge branch 'main' into support/hscale-in-its

Author: leon-inf

apis/apps/v1/componentdefinition_types.go

@@ -867,6 +867,11 @@ type ComponentVars struct {
 	//
 	// +optional
 	PodFQDNsForRole *RoledVar `json:"podFQDNsForRole,omitempty"`
+
+	// Reference to the service version of the component.
+	//
+	// +optional
+	ServiceVersion *VarOption `json:"serviceVersion,omitempty"`
 }
 
 // ClusterVarSelector selects a var from a Cluster.

apis/apps/v1/zz_generated.deepcopy.go

@@ -19105,6 +19105,13 @@ spec:
                               - Required
                               - Optional
                               type: string
+                            serviceVersion:
+                              description: Reference to the service version of the
+                                component.
+                              enum:
+                              - Required
+                              - Optional
+                              type: string
                             shortName:
                               description: Reference to the short name of the Component
                                 object.

config/crd/bases/apps.kubeblocks.io_componentdefinitions.yaml

@@ -1762,6 +1762,13 @@ spec:
                               - Required
                               - Optional
                               type: string
+                            serviceVersion:
+                              description: Reference to the service version of the
+                                component.
+                              enum:
+                              - Required
+                              - Optional
+                              type: string
                             shortName:
                               description: Reference to the short name of the Component
                                 object.

config/crd/bases/apps.kubeblocks.io_sidecardefinitions.yaml

@@ -434,7 +434,7 @@ func (r *OpsRequestReconciler) parseRunningOpsRequests(ctx context.Context, obje
 	if cluster.IsDeleting() {
 		// if the cluster is deleting, we should enqueue all the opsRequests in this cluster.
 		opsList := &opsv1alpha1.OpsRequestList{}
-		_ = r.Client.List(ctx, opsList, client.InNamespace(cluster.Namespace), client.MatchingFields{
+		_ = r.Client.List(ctx, opsList, client.InNamespace(cluster.Namespace), client.MatchingLabels{
 			constant.AppInstanceLabelKey: cluster.Name,
 		})
 		var requests []reconcile.Request

controllers/operations/opsrequest_controller.go

@@ -19105,6 +19105,13 @@ spec:
                               - Required
                               - Optional
                               type: string
+                            serviceVersion:
+                              description: Reference to the service version of the
+                                component.
+                              enum:
+                              - Required
+                              - Optional
+                              type: string
                             shortName:
                               description: Reference to the short name of the Component
                                 object.

deploy/helm/crds/apps.kubeblocks.io_componentdefinitions.yaml

@@ -1762,6 +1762,13 @@ spec:
                               - Required
                               - Optional
                               type: string
+                            serviceVersion:
+                              description: Reference to the service version of the
+                                component.
+                              enum:
+                              - Required
+                              - Optional
+                              type: string
                             shortName:
                               description: Reference to the short name of the Component
                                 object.

deploy/helm/crds/apps.kubeblocks.io_sidecardefinitions.yaml

@@ -7165,6 +7165,20 @@ RoledVar
 The value will be presented in the following format: FQDN1,FQDN2,&hellip;</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>serviceVersion</code><br/>
+<em>
+<a href="#apps.kubeblocks.io/v1.VarOption">
+VarOption
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Reference to the service version of the component.</p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="apps.kubeblocks.io/v1.ComponentVersionCompatibilityRule">ComponentVersionCompatibilityRule

docs/developer_docs/api-reference/cluster.md

@@ -1145,6 +1145,8 @@ func resolveComponentVarRef(ctx context.Context, cli client.Reader, synthesizedC
 		resolveFunc = resolveComponentPodsRef
 	case selector.PodNamesForRole != nil || selector.PodFQDNsForRole != nil:
 		resolveFunc = resolveComponentPodsForRoleRef
+	case selector.ServiceVersion != nil:
+		resolveFunc = resolveComponentServiceVersionRef
 	default:
 		return nil, nil, nil
 	}
@@ -1296,6 +1298,15 @@ func componentVarPodsWithRoleGetter(ctx context.Context, cli client.Reader,
 	return strings.Join(names, ","), nil
 }
 
+func resolveComponentServiceVersionRef(ctx context.Context, cli client.Reader, synthesizedComp *SynthesizedComponent,
+	defineKey string, selector appsv1.ComponentVarSelector) ([]*corev1.EnvVar, []*corev1.EnvVar, error) {
+	resolveServiceVersion := func(obj any) (*corev1.EnvVar, *corev1.EnvVar, error) {
+		comp := obj.(*appsv1.Component)
+		return &corev1.EnvVar{Name: defineKey, Value: comp.Spec.ServiceVersion}, nil, nil
+	}
+	return resolveComponentVarRefLow(ctx, cli, synthesizedComp, selector.ClusterObjectReference, selector.ServiceVersion, resolveServiceVersion)
+}
+
 func resolveComponentVarRefLow(ctx context.Context, cli client.Reader, synthesizedComp *SynthesizedComponent,
 	objRef appsv1.ClusterObjectReference, option *appsv1.VarOption, resolveVar func(any) (*corev1.EnvVar, *corev1.EnvVar, error)) ([]*corev1.EnvVar, []*corev1.EnvVar, error) {
 	resolveObjs := func() (map[string]any, error) {

pkg/controller/component/vars.go

@@ -1855,6 +1855,20 @@ var _ = Describe("vars", func() {
 							},
 						},
 					},
+					{
+						Name: "serviceVersion",
+						ValueFrom: &appsv1.VarSource{
+							ComponentVarRef: &appsv1.ComponentVarSelector{
+								ClusterObjectReference: appsv1.ClusterObjectReference{
+									CompDef:  synthesizedComp.CompDefName,
+									Optional: required(),
+								},
+								ComponentVars: appsv1.ComponentVars{
+									ServiceVersion: &appsv1.VarRequired,
+								},
+							},
+						},
+					},
 				}
 				podName := func(suffix string) string {
 					return fmt.Sprintf("%s-%s", constant.GenerateClusterComponentName(synthesizedComp.ClusterName, synthesizedComp.Name), suffix)
@@ -1868,8 +1882,9 @@ var _ = Describe("vars", func() {
 								Name:      constant.GenerateClusterComponentName(synthesizedComp.ClusterName, synthesizedComp.Name),
 							},
 							Spec: appsv1.ComponentSpec{
-								CompDef:  synthesizedComp.CompDefName,
-								Replicas: 3,
+								CompDef:        synthesizedComp.CompDefName,
+								Replicas:       3,
+								ServiceVersion: "v3.6.5",
 							},
 						},
 						&corev1.Pod{
@@ -1936,6 +1951,7 @@ var _ = Describe("vars", func() {
 				checkEnvVarWithValue(envVars, "podFQDNs", strings.Join(fqdnList(), ","))
 				checkEnvVarWithValue(envVars, "podFQDNs4Leader",
 					intctrlutil.PodFQDN(synthesizedComp.Namespace, synthesizedComp.FullCompName, podName("leader")))
+				checkEnvVarWithValue(envVars, "serviceVersion", "v3.6.5")
 			})
 		})