Skip to content

Commit 50bb87d

Browse files
gianlucam76gianlucam76
authored
Merge pull request #1210 from gianlucam76/prep
(chore) prepare for release v0.55.0
2 parents e50fb4b + 513c292 commit 50bb87d

10 files changed

Lines changed: 26 additions & 27 deletions

‎api/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controllers/clusterprofile_controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ var _ = Describe("Profile: Reconciler", func() {
228228
result, err := reconciler.Reconcile(context.TODO(), ctrl.Request{
229229
NamespacedName: clusterProfileName,
230230
})
231-
// Because there was one ClusterSummary and reconciliation deleted it and returned an error
231+
// Because there was one ClusterSummary and reconciliation deleted it and requested a new reconciliation
232232
Expect(err).To(BeNil())
233-
Expect(result.Requeue).To(BeTrue())
233+
Expect(result.RequeueAfter).ToNot(BeZero())
234234

235235
currentClusterProfile := &configv1beta1.ClusterProfile{}
236236
err = c.Get(context.TODO(), clusterProfileName, currentClusterProfile)

‎controllers/clustersummary_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ var _ = Describe("ClustersummaryController", func() {
927927
result, err = controllers.ReconcileDelete(clusterSummaryReconciler, context.TODO(), clusterSummaryScope,
928928
textlogger.NewLogger(textlogger.NewConfig()))
929929
Expect(err).To(BeNil())
930-
Expect(result.Requeue).To(BeFalse())
930+
Expect(result.RequeueAfter).To(BeZero())
931931
})
932932

933933
It("areDependenciesDeployed returns true when all dependencies are deployed", func() {

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/projectsveltos/addon-controller
33
go 1.24.1
44

55
require (
6-
dario.cat/mergo v1.0.1
6+
dario.cat/mergo v1.0.2
77
github.com/Masterminds/semver/v3 v3.3.1
88
github.com/TwiN/go-color v1.4.1
99
github.com/dariubs/percent v1.0.0
@@ -17,7 +17,7 @@ require (
1717
github.com/onsi/ginkgo/v2 v2.23.4
1818
github.com/onsi/gomega v1.37.0
1919
github.com/pkg/errors v0.9.1
20-
github.com/projectsveltos/libsveltos v0.54.0
20+
github.com/projectsveltos/libsveltos v0.55.0
2121
github.com/prometheus/client_golang v1.22.0
2222
github.com/spf13/pflag v1.0.6
2323
github.com/yuin/gopher-lua v1.1.1
@@ -27,13 +27,13 @@ require (
2727
k8s.io/api v0.33.1
2828
k8s.io/apiextensions-apiserver v0.33.1
2929
k8s.io/apimachinery v0.33.1
30-
k8s.io/cli-runtime v0.33.0
30+
k8s.io/cli-runtime v0.33.1
3131
k8s.io/client-go v0.33.1
3232
k8s.io/component-base v0.33.1
3333
k8s.io/klog/v2 v2.130.1
3434
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
3535
sigs.k8s.io/cluster-api v1.10.2
36-
sigs.k8s.io/controller-runtime v0.20.4
36+
sigs.k8s.io/controller-runtime v0.21.0
3737
sigs.k8s.io/kustomize/api v0.19.0
3838
sigs.k8s.io/kustomize/kyaml v0.19.0
3939
)
@@ -182,7 +182,7 @@ require (
182182
k8s.io/apiserver v0.33.1 // indirect
183183
k8s.io/cluster-bootstrap v0.32.3 // indirect
184184
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
185-
k8s.io/kubectl v0.33.0 // indirect
185+
k8s.io/kubectl v0.33.1 // indirect
186186
oras.land/oras-go v1.2.5 // indirect
187187
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
188188
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

‎go.sum‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4=
22
cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
33
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
44
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
5+
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
6+
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
57
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
68
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
79
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
@@ -329,8 +331,8 @@ github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
329331
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
330332
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
331333
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
332-
github.com/projectsveltos/libsveltos v0.54.0 h1:TTRNf0tODQ0516kJgUIh+XuwJPsmxJ2SKi/HpKnqCNk=
333-
github.com/projectsveltos/libsveltos v0.54.0/go.mod h1:Y4qyewEFHPxwASli2wTWAAokhzOpMPsdGHeOQtW3qpI=
334+
github.com/projectsveltos/libsveltos v0.55.0 h1:v7n6UUB1YKTuuwqEmX1xVf2uDaE1DCk05kuT0uivkK0=
335+
github.com/projectsveltos/libsveltos v0.55.0/go.mod h1:y70qX2+qA7lydvFp8iEWRyhNs/dJ0KMRjO0kTQiZsgc=
334336
github.com/projectsveltos/lua-utils/glua-json v0.0.0-20250301182851-e4fbb9fd7ff7 h1:KdDtBEJPgavOHlut1gq2i6bFm5dgoNHNsOUC8oe2hK4=
335337
github.com/projectsveltos/lua-utils/glua-json v0.0.0-20250301182851-e4fbb9fd7ff7/go.mod h1:AIzg+JWbfrFWazyM5Ka2fX69r9aFr3+o2Mvn9SfKDYU=
336338
github.com/projectsveltos/lua-utils/glua-runes v0.0.0-20250301182851-e4fbb9fd7ff7 h1:kZzOx+XTEfCRjxw1yACuGhFSyS7ybP/NNJFAZYNARCk=
@@ -548,8 +550,8 @@ k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
548550
k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
549551
k8s.io/apiserver v0.33.1 h1:yLgLUPDVC6tHbNcw5uE9mo1T6ELhJj7B0geifra3Qdo=
550552
k8s.io/apiserver v0.33.1/go.mod h1:VMbE4ArWYLO01omz+k8hFjAdYfc3GVAYPrhP2tTKccs=
551-
k8s.io/cli-runtime v0.33.0 h1:Lbl/pq/1o8BaIuyn+aVLdEPHVN665tBAXUePs8wjX7c=
552-
k8s.io/cli-runtime v0.33.0/go.mod h1:QcA+r43HeUM9jXFJx7A+yiTPfCooau/iCcP1wQh4NFw=
553+
k8s.io/cli-runtime v0.33.1 h1:TvpjEtF71ViFmPeYMj1baZMJR4iWUEplklsUQ7D3quA=
554+
k8s.io/cli-runtime v0.33.1/go.mod h1:9dz5Q4Uh8io4OWCLiEf/217DXwqNgiTS/IOuza99VZE=
553555
k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
554556
k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA=
555557
k8s.io/cluster-bootstrap v0.32.3 h1:AqIpsUhB6MUeaAsl1WvaUw54AHRd2hfZrESlKChtd8s=
@@ -560,8 +562,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
560562
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
561563
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
562564
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
563-
k8s.io/kubectl v0.33.0 h1:HiRb1yqibBSCqic4pRZP+viiOBAnIdwYDpzUFejs07g=
564-
k8s.io/kubectl v0.33.0/go.mod h1:gAlGBuS1Jq1fYZ9AjGWbI/5Vk3M/VW2DK4g10Fpyn/0=
565+
k8s.io/kubectl v0.33.1 h1:OJUXa6FV5bap6iRy345ezEjU9dTLxqv1zFTVqmeHb6A=
566+
k8s.io/kubectl v0.33.1/go.mod h1:Z07pGqXoP4NgITlPRrnmiM3qnoo1QrK1zjw85Aiz8J0=
565567
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 h1:jgJW5IePPXLGB8e/1wvd0Ich9QE97RvvF3a8J3fP/Lg=
566568
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
567569
oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=
@@ -570,8 +572,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUo
570572
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
571573
sigs.k8s.io/cluster-api v1.10.2 h1:xfvtNu4Fy/41grL0ryH5xSKQjpJEWdO8HiV2lPCCozQ=
572574
sigs.k8s.io/cluster-api v1.10.2/go.mod h1:/b9Un5Imprib6S7ZOcJitC2ep/5wN72b0pXpMQFfbTw=
573-
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
574-
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
575+
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
576+
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
575577
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
576578
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
577579
sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=

‎pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
- --version=main
4848
command:
4949
- /manager
50-
image: docker.io/projectsveltos/drift-detection-manager@sha256:34aebc52b3aeb98d31a14393ca11ae07eee0b2836e15d53c4a559186ee45957f
50+
image: docker.io/projectsveltos/drift-detection-manager@sha256:ab195f77685b9662921fa0fa3c7e51f003ba303169fcb3d80854a7bb449c108a
5151
livenessProbe:
5252
failureThreshold: 3
5353
httpGet:

‎pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
- --version=main
3030
command:
3131
- /manager
32-
image: docker.io/projectsveltos/drift-detection-manager@sha256:34aebc52b3aeb98d31a14393ca11ae07eee0b2836e15d53c4a559186ee45957f
32+
image: docker.io/projectsveltos/drift-detection-manager@sha256:ab195f77685b9662921fa0fa3c7e51f003ba303169fcb3d80854a7bb449c108a
3333
livenessProbe:
3434
failureThreshold: 3
3535
httpGet:

‎pkg/drift-detection/drift-detection-manager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ spec:
141141
- --version=main
142142
command:
143143
- /manager
144-
image: docker.io/projectsveltos/drift-detection-manager@sha256:34aebc52b3aeb98d31a14393ca11ae07eee0b2836e15d53c4a559186ee45957f
144+
image: docker.io/projectsveltos/drift-detection-manager@sha256:ab195f77685b9662921fa0fa3c7e51f003ba303169fcb3d80854a7bb449c108a
145145
livenessProbe:
146146
failureThreshold: 3
147147
httpGet:

‎pkg/drift-detection/drift-detection-manager.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ spec:
123123
- --version=main
124124
command:
125125
- /manager
126-
image: docker.io/projectsveltos/drift-detection-manager@sha256:34aebc52b3aeb98d31a14393ca11ae07eee0b2836e15d53c4a559186ee45957f
126+
image: docker.io/projectsveltos/drift-detection-manager@sha256:ab195f77685b9662921fa0fa3c7e51f003ba303169fcb3d80854a7bb449c108a
127127
livenessProbe:
128128
failureThreshold: 3
129129
httpGet:

‎test/clusterapi-workload.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,9 @@ spec:
355355
enabled: true
356356
enforce: baseline
357357
warn: restricted
358-
version: v1.32.0
358+
version: v1.33.0
359359
workers:
360360
machineDeployments:
361361
- class: default-worker
362362
name: md-0
363363
replicas: 2
364-
machinePools:
365-
- class: default-worker
366-
name: mp-0
367-
replicas: 2

0 commit comments

Comments
 (0)