Skip to content

Commit 27588ee

Browse files
leon-apeleon-ape
authored
fix: resolve component pod vars from desired instanceset (#10561)
1 parent fa7ed3b commit 27588ee

3 files changed

Lines changed: 180 additions & 14 deletions

File tree

‎pkg/controller/component/vars.go‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,17 +1247,24 @@ func componentVarPodsGetter(ctx context.Context, cli client.Reader,
12471247
Namespace: namespace,
12481248
Name: constant.GenerateWorkloadNamePattern(clusterName, compName),
12491249
}
1250-
err := cli.Get(ctx, itsKey, its)
1251-
if err != nil && !apierrors.IsNotFound(err) {
1252-
return "", err
1253-
}
1254-
1255-
var names []string
1256-
if err == nil {
1257-
names, err = GetCurrentPodNamesByITS(its)
1258-
} else {
1259-
names, err = generatePodNamesByComp(comp)
1260-
}
1250+
getErr := cli.Get(ctx, itsKey, its)
1251+
if getErr != nil && !apierrors.IsNotFound(getErr) {
1252+
return "", getErr
1253+
}
1254+
1255+
// Resolve pod vars from the desired component spec, not only from the
1256+
// running InstanceSet. During hscale, the Component may already carry the new
1257+
// desired replicas while the workload object has not caught up yet; the
1258+
// target can be either this component or a referenced component. A minimal
1259+
// proto ITS from the target Component is enough for pod naming, while
1260+
// passing the running ITS still lets GetDesiredPodNamesByITS preserve
1261+
// assigned ordinals.
1262+
protoITS := buildMinimalInstanceSetForPodNames(comp)
1263+
var runningITS *workloadsv1.InstanceSet
1264+
if getErr == nil {
1265+
runningITS = its
1266+
}
1267+
names, err := GetDesiredPodNamesByITS(runningITS, protoITS)
12611268
if err != nil {
12621269
return "", err
12631270
}

‎pkg/controller/component/vars_test.go‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,6 +1938,162 @@ var _ = Describe("vars", func() {
19381938
intctrlutil.PodFQDN(synthesizedComp.Namespace, synthesizedComp.FullCompName, podName("leader")))
19391939
checkEnvVarWithValue(envVars, "serviceVersion", "v3.6.5")
19401940
})
1941+
1942+
It("uses desired pods for current component when the running InstanceSet is stale", func() {
1943+
synthesizedComp.Replicas = 5
1944+
vars := []appsv1.EnvVar{
1945+
{
1946+
Name: "podFQDNs",
1947+
ValueFrom: &appsv1.VarSource{
1948+
ComponentVarRef: &appsv1.ComponentVarSelector{
1949+
ClusterObjectReference: appsv1.ClusterObjectReference{
1950+
CompDef: synthesizedComp.CompDefName,
1951+
Optional: required(),
1952+
},
1953+
ComponentVars: appsv1.ComponentVars{
1954+
PodFQDNs: &appsv1.VarRequired,
1955+
},
1956+
},
1957+
},
1958+
},
1959+
}
1960+
reader := &mockReader{
1961+
cli: testCtx.Cli,
1962+
objs: []client.Object{
1963+
&appsv1.Component{
1964+
ObjectMeta: metav1.ObjectMeta{
1965+
Namespace: testCtx.DefaultNamespace,
1966+
Name: constant.GenerateClusterComponentName(synthesizedComp.ClusterName, synthesizedComp.Name),
1967+
},
1968+
Spec: appsv1.ComponentSpec{
1969+
CompDef: synthesizedComp.CompDefName,
1970+
Replicas: 5,
1971+
},
1972+
},
1973+
&workloads.InstanceSet{
1974+
ObjectMeta: metav1.ObjectMeta{
1975+
Namespace: testCtx.DefaultNamespace,
1976+
Name: constant.GenerateWorkloadNamePattern(synthesizedComp.ClusterName, synthesizedComp.Name),
1977+
},
1978+
Spec: workloads.InstanceSetSpec{
1979+
Replicas: ptr.To(int32(3)),
1980+
},
1981+
},
1982+
},
1983+
}
1984+
1985+
_, envVars, err := ResolveTemplateNEnvVars(testCtx.Ctx, reader, synthesizedComp, vars)
1986+
1987+
Expect(err).Should(Succeed())
1988+
expected := make([]string, 0, 5)
1989+
for i := 0; i < 5; i++ {
1990+
podName := fmt.Sprintf("%s-%s-%d", synthesizedComp.ClusterName, synthesizedComp.Name, i)
1991+
expected = append(expected, intctrlutil.PodFQDN(synthesizedComp.Namespace, synthesizedComp.FullCompName, podName))
1992+
}
1993+
checkEnvVarWithValue(envVars, "podFQDNs", strings.Join(expected, ","))
1994+
})
1995+
1996+
It("uses desired pods for current component before the InstanceSet exists", func() {
1997+
synthesizedComp.Replicas = 5
1998+
vars := []appsv1.EnvVar{
1999+
{
2000+
Name: "podNames",
2001+
ValueFrom: &appsv1.VarSource{
2002+
ComponentVarRef: &appsv1.ComponentVarSelector{
2003+
ClusterObjectReference: appsv1.ClusterObjectReference{
2004+
CompDef: synthesizedComp.CompDefName,
2005+
Optional: required(),
2006+
},
2007+
ComponentVars: appsv1.ComponentVars{
2008+
PodNames: &appsv1.VarRequired,
2009+
},
2010+
},
2011+
},
2012+
},
2013+
}
2014+
reader := &mockReader{
2015+
cli: testCtx.Cli,
2016+
objs: []client.Object{
2017+
&appsv1.Component{
2018+
ObjectMeta: metav1.ObjectMeta{
2019+
Namespace: testCtx.DefaultNamespace,
2020+
Name: constant.GenerateClusterComponentName(synthesizedComp.ClusterName, synthesizedComp.Name),
2021+
},
2022+
Spec: appsv1.ComponentSpec{
2023+
CompDef: synthesizedComp.CompDefName,
2024+
Replicas: 5,
2025+
},
2026+
},
2027+
},
2028+
}
2029+
2030+
_, envVars, err := ResolveTemplateNEnvVars(testCtx.Ctx, reader, synthesizedComp, vars)
2031+
2032+
Expect(err).Should(Succeed())
2033+
expected := make([]string, 0, 5)
2034+
for i := 0; i < 5; i++ {
2035+
expected = append(expected, fmt.Sprintf("%s-%s-%d", synthesizedComp.ClusterName, synthesizedComp.Name, i))
2036+
}
2037+
checkEnvVarWithValue(envVars, "podNames", strings.Join(expected, ","))
2038+
})
2039+
2040+
It("uses desired pods for another component when the running InstanceSet is stale", func() {
2041+
synthesizedComp.Replicas = 5
2042+
const anotherCompName = "another"
2043+
const anotherCompDefName = "anotherDef"
2044+
synthesizedComp.Comp2CompDefs = map[string]string{
2045+
anotherCompName: anotherCompDefName,
2046+
}
2047+
vars := []appsv1.EnvVar{
2048+
{
2049+
Name: "podNames",
2050+
ValueFrom: &appsv1.VarSource{
2051+
ComponentVarRef: &appsv1.ComponentVarSelector{
2052+
ClusterObjectReference: appsv1.ClusterObjectReference{
2053+
CompDef: anotherCompDefName,
2054+
Optional: required(),
2055+
},
2056+
ComponentVars: appsv1.ComponentVars{
2057+
PodNames: &appsv1.VarRequired,
2058+
},
2059+
},
2060+
},
2061+
},
2062+
}
2063+
reader := &mockReader{
2064+
cli: testCtx.Cli,
2065+
objs: []client.Object{
2066+
&appsv1.Component{
2067+
ObjectMeta: metav1.ObjectMeta{
2068+
Namespace: testCtx.DefaultNamespace,
2069+
Name: constant.GenerateClusterComponentName(synthesizedComp.ClusterName, anotherCompName),
2070+
},
2071+
Spec: appsv1.ComponentSpec{
2072+
CompDef: anotherCompDefName,
2073+
Replicas: 5,
2074+
},
2075+
},
2076+
&workloads.InstanceSet{
2077+
ObjectMeta: metav1.ObjectMeta{
2078+
Namespace: testCtx.DefaultNamespace,
2079+
Name: constant.GenerateWorkloadNamePattern(synthesizedComp.ClusterName, anotherCompName),
2080+
},
2081+
Spec: workloads.InstanceSetSpec{
2082+
Replicas: ptr.To(int32(3)),
2083+
},
2084+
},
2085+
},
2086+
}
2087+
2088+
_, envVars, err := ResolveTemplateNEnvVars(testCtx.Ctx, reader, synthesizedComp, vars)
2089+
2090+
Expect(err).Should(Succeed())
2091+
expected := make([]string, 0, 5)
2092+
for i := 0; i < 5; i++ {
2093+
expected = append(expected, fmt.Sprintf("%s-%s-%d", synthesizedComp.ClusterName, anotherCompName, i))
2094+
}
2095+
checkEnvVarWithValue(envVars, "podNames", strings.Join(expected, ","))
2096+
})
19412097
})
19422098

19432099
Context("cluster vars", func() {

‎pkg/controller/component/workload.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,11 @@ func GetDesiredPodNamesByITS(runningITS, protoITS *workloads.InstanceSet) ([]str
403403
return GetCurrentPodNamesByITS(protoITS)
404404
}
405405

406-
func generatePodNamesByComp(comp *kbappsv1.Component) ([]string, error) {
406+
// buildMinimalInstanceSetForPodNames copies only the Component fields consumed
407+
// by the pod name builder. The target may be any referenced Component, so keep
408+
// this path independent from ComponentDefinition synthesis and the full
409+
// workload builder.
410+
func buildMinimalInstanceSetForPodNames(comp *kbappsv1.Component) *workloads.InstanceSet {
407411
instanceTemplates := func() []workloads.InstanceTemplate {
408412
if len(comp.Spec.Instances) == 0 {
409413
return nil
@@ -418,7 +422,7 @@ func generatePodNamesByComp(comp *kbappsv1.Component) ([]string, error) {
418422
}
419423
return templates
420424
}
421-
its := &workloads.InstanceSet{
425+
return &workloads.InstanceSet{
422426
ObjectMeta: metav1.ObjectMeta{
423427
Namespace: comp.Namespace,
424428
Name: comp.Name,
@@ -432,5 +436,4 @@ func generatePodNamesByComp(comp *kbappsv1.Component) ([]string, error) {
432436
OfflineInstances: comp.Spec.OfflineInstances,
433437
},
434438
}
435-
return GetCurrentPodNamesByITS(its)
436439
}

0 commit comments

Comments
 (0)