Skip to content

Commit 37d3547

Browse files
authored
Merge pull request #1161 from gianlucam76/release-0.52
Prepare for release v0.52.3
2 parents 758daf7 + a6c7063 commit 37d3547

20 files changed

Lines changed: 95 additions & 107 deletions

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ OS ?= $(shell uname -s)
2727
OS := $(shell echo $(OS) | tr '[:upper:]' '[:lower:]')
2828
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
2929
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
30-
TAG ?= v0.52.2
30+
TAG ?= v0.52.3
3131

3232
.PHONY: all
3333
all: build
@@ -73,7 +73,7 @@ KUBECTL := $(TOOLS_BIN_DIR)/kubectl
7373

7474
GOVULNCHECK_VERSION := "v1.1.3"
7575
GOLANGCI_LINT_VERSION := "v1.64.7"
76-
CLUSTERCTL_VERSION := "v1.9.6"
76+
CLUSTERCTL_VERSION := "v1.10.0"
7777

7878
KUSTOMIZE_VER := v5.3.0
7979
KUSTOMIZE_BIN := kustomize

config/default/manager_auth_proxy_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
- --shard-key=
1717
- --capi-onboard-annotation=
1818
- "--v=5"
19-
- "--version=v0.52.2"
19+
- "--version=v0.52.3"
2020
- "--agent-in-mgmt-cluster=false"
2121
env:
2222
- name: GOMEMLIMIT

config/default/manager_image_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ spec:
88
spec:
99
containers:
1010
# Change the value of image field below to your controller image URL
11-
- image: docker.io/projectsveltos/addon-controller:v0.52.2
11+
- image: docker.io/projectsveltos/addon-controller:v0.52.3
1212
name: controller

config/samples/config_v1alpha1_clusterprofile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
- repositoryURL: https://helm.nginx.com/stable
2222
repositoryName: nginx-stable
2323
chartName: nginx-stable/nginx-ingress
24-
chartVersion: 2.0.1
24+
chartVersion: 2.1.0
2525
releaseName: nginx-latest
2626
releaseNamespace: nginx
2727
helmChartAction: Install

controllers/handlers_resources.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,14 @@ func resourcesHash(ctx context.Context, c client.Client, clusterSummaryScope *sc
393393
} else {
394394
var source client.Object
395395
source, err = getSource(ctx, c, reference.Namespace, reference.Name, reference.Kind)
396-
if err == nil && source == nil {
396+
if err == nil && source != nil {
397397
s := source.(sourcev1.Source)
398398
if s.GetArtifact() != nil {
399399
config += s.GetArtifact().Revision
400400
}
401-
}
402-
if source.GetAnnotations() != nil {
403-
config += getDataSectionHash(source.GetAnnotations())
401+
if source.GetAnnotations() != nil {
402+
config += getDataSectionHash(source.GetAnnotations())
403+
}
404404
}
405405
}
406406
if err != nil {

controllers/resourcesummary_collection.go

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,16 @@ func collectAndProcessResourceSummaries(ctx context.Context, c client.Client, sh
5757
continue
5858
}
5959

60-
var clustersWithDD map[corev1.ObjectReference]bool
61-
if getAgentInMgmtCluster() {
62-
clustersWithDD, err = getListOfClusterWithDriftDetectionDeployed(ctx, c)
63-
if err != nil {
64-
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to collect clusters with drift detection: %v", err))
65-
continue
66-
}
60+
clustersWithDD, err := getListOfClusterWithDriftDetectionDeployed(ctx, c)
61+
if err != nil {
62+
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to collect clusters with drift detection: %v", err))
63+
continue
6764
}
6865

6966
for i := range clusterList {
7067
cluster := &clusterList[i]
71-
// In agentless mode, Sveltos optimizes resource collection.
72-
// It skips ResourceSummary checks for managed clusters without drift detection.
73-
// This is because, agentlessly, ResourceSummary instances reside in the management cluster so the
74-
// check on whether ResourceSummary is deployed, will always pass.
75-
// The 'clustersWithDD' list explicitly tracks clusters where drift detection is active,
76-
// ensuring Sveltos only attempts ResourceSummary collection from these relevant clusters.
77-
if getAgentInMgmtCluster() {
78-
if _, ok := clustersWithDD[*cluster]; !ok {
79-
continue
80-
}
68+
if _, ok := clustersWithDD[*cluster]; !ok {
69+
continue
8170
}
8271

8372
err = collectResourceSummariesFromCluster(ctx, c, cluster, version, logger)

examples/harbor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
- repositoryURL: https://helm.goharbor.io
1414
repositoryName: harbor
1515
chartName: harbor/harbor
16-
chartVersion: 1.16.2
16+
chartVersion: 1.17.0
1717
releaseName: harbor
1818
releaseNamespace: harbor
1919
helmChartAction: Install

examples/multiple_helm_charts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
- repositoryURL: https://helm.nginx.com/stable/
1414
repositoryName: nginx-stable
1515
chartName: nginx-stable/nginx-ingress
16-
chartVersion: 2.0.1
16+
chartVersion: 2.1.0
1717
releaseName: ngix-latest
1818
releaseNamespace: nginx
1919
helmChartAction: Install

examples/prometheus-grafana.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
- repositoryURL: https://grafana.github.io/helm-charts
1919
repositoryName: grafana
2020
chartName: grafana/grafana
21-
chartVersion: 8.12.1
21+
chartVersion: 8.13.0
2222
releaseName: grafana
2323
releaseNamespace: grafana
2424
helmChartAction: Install

go.mod

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ require (
1616
github.com/onsi/ginkgo/v2 v2.23.4
1717
github.com/onsi/gomega v1.37.0
1818
github.com/pkg/errors v0.9.1
19-
github.com/projectsveltos/libsveltos v0.52.2
19+
github.com/projectsveltos/libsveltos v0.52.3
2020
github.com/prometheus/client_golang v1.22.0
2121
github.com/spf13/pflag v1.0.6
2222
github.com/yuin/gopher-lua v1.1.1
2323
golang.org/x/text v0.24.0
2424
gopkg.in/yaml.v3 v3.0.1
2525
helm.sh/helm/v3 v3.17.3
26-
k8s.io/api v0.32.3
27-
k8s.io/apiextensions-apiserver v0.32.3
28-
k8s.io/apimachinery v0.32.3
29-
k8s.io/cli-runtime v0.32.3
30-
k8s.io/client-go v0.32.3
31-
k8s.io/component-base v0.32.3
26+
k8s.io/api v0.32.4
27+
k8s.io/apiextensions-apiserver v0.32.4
28+
k8s.io/apimachinery v0.32.4
29+
k8s.io/cli-runtime v0.32.4
30+
k8s.io/client-go v0.32.4
31+
k8s.io/component-base v0.32.4
3232
k8s.io/klog/v2 v2.130.1
3333
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
34-
sigs.k8s.io/cluster-api v1.9.6
34+
sigs.k8s.io/cluster-api v1.10.0
3535
sigs.k8s.io/controller-runtime v0.20.4
3636
sigs.k8s.io/kustomize/api v0.19.0
3737
sigs.k8s.io/kustomize/kyaml v0.19.0
@@ -66,7 +66,7 @@ require (
6666
github.com/docker/docker-credential-helpers v0.8.2 // indirect
6767
github.com/docker/go-connections v0.5.0 // indirect
6868
github.com/docker/go-metrics v0.0.1 // indirect
69-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
69+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
7070
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
7171
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
7272
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
@@ -147,15 +147,15 @@ require (
147147
github.com/shopspring/decimal v1.4.0 // indirect
148148
github.com/sirupsen/logrus v1.9.3 // indirect
149149
github.com/spf13/cast v1.7.1 // indirect
150-
github.com/spf13/cobra v1.8.1 // indirect
150+
github.com/spf13/cobra v1.9.1 // indirect
151151
github.com/stoewer/go-strcase v1.3.0 // indirect
152152
github.com/x448/float16 v0.8.4 // indirect
153153
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
154154
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
155155
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
156156
github.com/xlab/treeprint v1.2.0 // indirect
157157
github.com/zeebo/blake3 v0.2.4 // indirect
158-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
158+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
159159
go.opentelemetry.io/otel v1.31.0 // indirect
160160
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
161161
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
@@ -167,23 +167,23 @@ require (
167167
golang.org/x/crypto v0.37.0 // indirect
168168
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
169169
golang.org/x/net v0.39.0 // indirect
170-
golang.org/x/oauth2 v0.24.0 // indirect
170+
golang.org/x/oauth2 v0.28.0 // indirect
171171
golang.org/x/sync v0.13.0 // indirect
172172
golang.org/x/sys v0.32.0 // indirect
173173
golang.org/x/term v0.31.0 // indirect
174174
golang.org/x/time v0.8.0 // indirect
175175
golang.org/x/tools v0.31.0 // indirect
176-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
176+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
177177
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb // indirect
178-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect
178+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
179179
google.golang.org/grpc v1.69.2 // indirect
180180
google.golang.org/protobuf v1.36.5 // indirect
181181
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
182182
gopkg.in/inf.v0 v0.9.1 // indirect
183-
k8s.io/apiserver v0.32.3 // indirect
184-
k8s.io/cluster-bootstrap v0.32.0 // indirect
183+
k8s.io/apiserver v0.32.4 // indirect
184+
k8s.io/cluster-bootstrap v0.32.3 // indirect
185185
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
186-
k8s.io/kubectl v0.32.3 // indirect
186+
k8s.io/kubectl v0.32.4 // indirect
187187
oras.land/oras-go v1.2.5 // indirect
188188
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
189189
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

0 commit comments

Comments
 (0)