Skip to content

Commit 5502bd6

Browse files
DespireCI/CD pipeline
andauthored
fix: deletion of zero sized nodepools (#2049)
If a nodepool was scheduled that had 0 nodes, the actual deletion of the nodepool from the current state would be skipped resulting in an infinite loop of scheduling its deletion. This PR adds an explicit deletion from the current state even if the nodepool is zero-sized if a deletion for it has been scheduled. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Ensure nodepool entries are removed from cluster configuration and the updated Kubernetes state is persisted when removing nodes and no masters/workers remain. * **Chores** * Bumped container image tags for several components (including testing framework and core services) to a new release. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: CI/CD pipeline <CI/CD-pipeline@users.noreply.github.com>
1 parent da3b348 commit 5502bd6

3 files changed

Lines changed: 20 additions & 8 deletions

File tree

manifests/claudie/kustomization.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ apiVersion: kustomize.config.k8s.io/v1beta1
5656
kind: Kustomization
5757
images:
5858
- name: ghcr.io/berops/claudie/ansibler
59-
newTag: fe5a65d-4071
59+
newTag: c71fbb0-4077
6060
- name: ghcr.io/berops/claudie/autoscaler-adapter
61-
newTag: fe5a65d-4071
61+
newTag: c71fbb0-4077
6262
- name: ghcr.io/berops/claudie/claudie-operator
63-
newTag: fe5a65d-4071
63+
newTag: c71fbb0-4077
6464
- name: ghcr.io/berops/claudie/kube-eleven
65-
newTag: fe5a65d-4071
65+
newTag: c71fbb0-4077
6666
- name: ghcr.io/berops/claudie/kuber
67-
newTag: fe5a65d-4071
67+
newTag: c71fbb0-4077
6868
- name: ghcr.io/berops/claudie/manager
69-
newTag: fe5a65d-4071
69+
newTag: c71fbb0-4077
7070
- name: ghcr.io/berops/claudie/terraformer
71-
newTag: fe5a65d-4071
71+
newTag: c71fbb0-4077

manifests/testing-framework/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ secretGenerator:
8989

9090
images:
9191
- name: ghcr.io/berops/claudie/testing-framework
92-
newTag: fe5a65d-4071
92+
newTag: c71fbb0-4077

services/kuber/internal/worker/service/task_delete_nodes.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,18 @@ func DeleteNodes(logger zerolog.Logger, tracker Tracker) {
8282
}
8383

8484
if len(master) == 0 && len(worker) == 0 {
85+
if d.KDeleteNodes.WithNodePool {
86+
logger.
87+
Info().
88+
Msgf("Removing nodepool %q with 0 nodes", d.KDeleteNodes.Nodepool)
89+
90+
k8s.ClusterInfo.NodePools = nodepools.DeleteByName(k8s.ClusterInfo.NodePools, d.KDeleteNodes.Nodepool)
91+
92+
update := tracker.Result.Update()
93+
update.Kubernetes(k8s)
94+
update.Commit()
95+
}
96+
8597
return
8698
}
8799

0 commit comments

Comments
 (0)