Skip to content

Commit 704fdf1

Browse files
lrouquettelrouquette
committed
built from CA v1.31.3
1 parent 0f59059 commit 704fdf1

File tree

3 files changed

+132
-1
lines changed

3 files changed

+132
-1
lines changed

‎ADOBE_CHANGELOG.md‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# About
2+
3+
We maintain a set of patches on top of upstream K8s autoscaler. They need to be
4+
semantically versioned as well so we understand, for example, that we're
5+
upgrading a fix version of autoscaler vs. a fix version of our patches.
6+
7+
The scheme is quite simple. The product is first, followed by the upstream
8+
version, followed by our version:
9+
10+
```
11+
Product is cluster-autoscaler or vertical-pod-autoscaler or addon-resizer
12+
K stands for K8s upstream version
13+
A stands for Adobe's changes
14+
15+
{Product}-{K major}.{K minor}.{K fix}-{A major}.{A minor}.{A fix}-adobe
16+
```
17+
18+
# Log
19+
20+
## cluster-autoscaler-1.31.3-1.8.0-adobe
21+
- built from CA v1.31.3
22+
23+
## cluster-autoscaler-1.30.4-1.8.0-adobe
24+
- built from CA v1.30.4
25+
26+
## cluster-autoscaler-1.29.4-1.8.0-adobe
27+
- backport https://github.com/jackfrancis/autoscaler/commit/7bcdfe872f3fffaebe0650e0a022b860cdcebf66
28+
29+
## cluster-autoscaler-1.29.4-1.7.0-adobe
30+
_not released_
31+
32+
## cluster-autoscaler-1.29.4-1.6.0-adobe
33+
- built from CA v1.29.4
34+
35+
## cluster-autoscaler-1.28.6-1.6.0-adobe
36+
- built from CA v1.28.6
37+
38+
## cluster-autoscaler-1.27.7-1.6.0-adobe
39+
- built from CA v1.27.7
40+
41+
## cluster-autoscaler-1.27.5-1.6.0-adobe
42+
- built from CA v1.27.5
43+
44+
## cluster-autoscaler-1.26.4-1.6.0-adobe
45+
- built from CA v1.26.4
46+
- backport https://github.com/kubernetes/autoscaler/pull/5550
47+
48+
## cluster-autoscaler-1.25.2-1.6.0-adobe
49+
- backport https://github.com/kubernetes/autoscaler/pull/5550
50+
51+
## cluster-autoscaler-1.25.2-1.5.0-adobe
52+
- built from CA v1.25.2
53+
54+
## cluster-autoscaler-1.24.2-1.6.0-adobe
55+
- backport https://github.com/kubernetes/autoscaler/pull/5550
56+
57+
## cluster-autoscaler-1.24.2-1.5.0-adobe
58+
- built from CA v1.24.2
59+
60+
## cluster-autoscaler-1.24.1-1.5.0-adobe
61+
- built from CA v1.24.1
62+
63+
## cluster-autoscaler-1.23.1-1.5.0-adobe
64+
- skip deletion of unregistered nodes if there are more than 50% of discovered nodes
65+
66+
## cluster-autoscaler-1.23.1-1.4.0-adobe
67+
- built from CA v1.23.1
68+
- backport https://github.com/kubernetes/autoscaler/pull/4970
69+
- remove code from 1.0.0-adobe and 1.2.0-adobe
70+
71+
## cluster-autoscaler-1.22.3-1.3.0-adobe
72+
- built from CA v1.22.3
73+
- backport https://github.com/kubernetes/autoscaler/pull/4970
74+
75+
## cluster-autoscaler-1.22.2-1.2.1-adobe
76+
- built from CA v1.22.2
77+
78+
## cluster-autoscaler-1.21.2-1.2.1-adobe
79+
- built from CA v1.21.2
80+
81+
## cluster-autoscaler-1.20.1-1.2.1-adobe
82+
- also use `topology.kubernetes.io/zone` when evaluating topology spread constraints
83+
84+
## cluster-autoscaler-1.20.1-1.2.0-adobe
85+
- improve scale out time when using topology spread constraints
86+
87+
## cluster-autoscaler-1.20.1-1.1.0-adobe
88+
- upgraded ca
89+
90+
## cluster-autoscaler-1.20.0-1.1.0-adobe
91+
- fix uneven scaling with topology contraints
92+
- backport https://github.com/kubernetes/autoscaler/pull/3883
93+
94+
## cluster-autoscaler-1.20.0-1.0.0-adobe
95+
- on scale-down, evict DaemonSet pods after all the other pods
96+
97+
# Procedure
98+
99+
```bash
100+
# Assuming cluster-autoscaler-1.21-adobe is the latest "Adobe" release, built
101+
# "on top" of of 1.21.0, and we want to upgrade to 1.21.2
102+
git checkout cluster-autoscaler-1.21-adobe
103+
# Reset to the upstream version we originally built on
104+
git reset cluster-autoscaler-1.21.0
105+
# Stash "Adobe" changes
106+
git stash
107+
# Get the latest stuff from upstream
108+
git fetch upstream
109+
# Update the branch to upstream 1.21.2
110+
git merge -s recursive -X theirs cluster-autoscaler-1.21.2
111+
# Apply "Adobe" changes, on top of 1.21.2
112+
git stash pop
113+
# Resolve conflicts if needed, then git add/git commit all the files (including this one)
114+
```

‎cluster-autoscaler/clusterstate/clusterstate_adobe.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package clusterstate
2+
3+
// ClearUnregisteredNodes clears the unregistered node cache
4+
func (csr *ClusterStateRegistry) ClearUnregisteredNodes() {
5+
csr.Lock()
6+
defer csr.Unlock()
7+
csr.unregisteredNodes = make(map[string]UnregisteredNode)
8+
}

‎cluster-autoscaler/core/static_autoscaler.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,14 @@ func (a *StaticAutoscaler) RunOnce(currentTime time.Time) caerrors.AutoscalerErr
435435
// Check if there are any nodes that failed to register in Kubernetes
436436
// master.
437437
unregisteredNodes := a.clusterStateRegistry.GetUnregisteredNodes()
438-
if len(unregisteredNodes) > 0 {
438+
if float64(len(unregisteredNodes)) > float64(len(allNodes))*50.0/100.0 {
439+
klog.Warningf("%d unregistered nodes present - skipping deletion (only %d nodes discovered)", len(unregisteredNodes), len(allNodes))
440+
// clear the state so that the UnregisteredSince timestamp is reset
441+
a.clusterStateRegistry.ClearUnregisteredNodes()
442+
for _, n := range unregisteredNodes {
443+
klog.V(0).Infof("--> %v", n.Node.GetObjectMeta().GetName())
444+
}
445+
} else if len(unregisteredNodes) > 0 {
439446
klog.V(1).Infof("%d unregistered nodes present", len(unregisteredNodes))
440447
removedAny, err := a.removeOldUnregisteredNodes(unregisteredNodes, autoscalingContext,
441448
a.clusterStateRegistry, currentTime, autoscalingContext.LogRecorder)
@@ -446,6 +453,8 @@ func (a *StaticAutoscaler) RunOnce(currentTime time.Time) caerrors.AutoscalerErr
446453
if removedAny {
447454
klog.V(0).Infof("Some unregistered nodes were removed")
448455
}
456+
} else {
457+
klog.V(0).Infof("noop")
449458
}
450459

451460
if !a.clusterStateRegistry.IsClusterHealthy() {

0 commit comments

Comments
 (0)