Skip to content

Commit adab813

Browse files
authored
Merge pull request #351 from gianlucam76/prep
(chore) prepare for release v1.3.0
2 parents de4d25e + 7d4c72f commit adab813

File tree

13 files changed

+120
-107
lines changed

13 files changed

+120
-107
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARCH ?= amd64
2525
OS ?= $(shell uname -s | tr A-Z a-z)
2626
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
2727
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
28-
TAG ?= main
28+
TAG ?= v1.3.0
2929

3030
.PHONY: all
3131
all: build
@@ -68,7 +68,7 @@ KIND := $(TOOLS_BIN_DIR)/kind
6868
KUBECTL := $(TOOLS_BIN_DIR)/kubectl
6969

7070
GOLANGCI_LINT_VERSION := "v2.5.0"
71-
CLUSTERCTL_VERSION := "v1.11.3"
71+
CLUSTERCTL_VERSION := v1.12.0
7272

7373

7474
KUSTOMIZE_VER := v5.7.0

config/default/manager_auth_proxy_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ spec:
1515
- "--shard-key="
1616
- "--capi-onboard-annotation="
1717
- "--v=5"
18-
- "--version=main"
18+
- "--version=v1.3.0"
1919
- "--agent-in-mgmt-cluster=false"

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/healthcheck-manager:main
11+
- image: docker.io/projectsveltos/healthcheck-manager:v1.3.0
1212
name: manager

controllers/clusterhealthcheck_deployer.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3434
"k8s.io/apimachinery/pkg/runtime"
35+
"k8s.io/apimachinery/pkg/runtime/schema"
3536
"k8s.io/apimachinery/pkg/types"
3637
"k8s.io/client-go/util/retry"
3738
"sigs.k8s.io/cluster-api/util"
@@ -1049,7 +1050,12 @@ func proceedRemovingStaleHealthChecks(ctx context.Context, c client.Client,
10491050
continue
10501051
}
10511052

1052-
if !util.IsOwnedByObject(hc, chc) {
1053+
targetGK := schema.GroupKind{
1054+
Group: libsveltosv1beta1.GroupVersion.Group,
1055+
Kind: libsveltosv1beta1.ClusterHealthCheckKind,
1056+
}
1057+
1058+
if !util.IsOwnedByObject(hc, chc, targetGK) {
10531059
continue
10541060
}
10551061

controllers/clusterhealthcheck_deployer_test.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
corev1 "k8s.io/api/core/v1"
3030
apierrors "k8s.io/apimachinery/pkg/api/errors"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
32+
"k8s.io/apimachinery/pkg/runtime/schema"
3233
"k8s.io/apimachinery/pkg/types"
3334
"k8s.io/klog/v2/textlogger"
3435
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
@@ -468,7 +469,13 @@ var _ = Describe("ClusterHealthCheck deployer", func() {
468469
if err != nil {
469470
return false
470471
}
471-
if !util.IsOwnedByObject(currentHealthCheck, chc) {
472+
473+
targetGK := schema.GroupKind{
474+
Group: libsveltosv1beta1.GroupVersion.Group,
475+
Kind: libsveltosv1beta1.ClusterHealthCheckKind,
476+
}
477+
478+
if !util.IsOwnedByObject(currentHealthCheck, chc, targetGK) {
472479
return false
473480
}
474481
if currentHealthCheck.Annotations == nil {

go.mod

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,36 @@ require (
1010
github.com/go-logr/logr v1.4.3
1111
github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
1212
github.com/jbogarin/go-cisco-webex-teams v0.4.3
13-
github.com/onsi/ginkgo/v2 v2.27.2
14-
github.com/onsi/gomega v1.38.2
13+
github.com/onsi/ginkgo/v2 v2.27.3
14+
github.com/onsi/gomega v1.38.3
1515
github.com/pkg/errors v0.9.1
16-
github.com/projectsveltos/addon-controller v1.1.1-0.20251203094149-5ab010fd58ba
17-
github.com/projectsveltos/libsveltos v1.1.1-0.20251203082530-326accb8509d
16+
github.com/projectsveltos/addon-controller v1.3.0
17+
github.com/projectsveltos/libsveltos v1.3.0
1818
github.com/prometheus/client_golang v1.23.2
1919
github.com/slack-go/slack v0.17.3
2020
github.com/spf13/pflag v1.0.10
21-
golang.org/x/text v0.31.0
22-
k8s.io/api v0.34.2
23-
k8s.io/apiextensions-apiserver v0.34.2
24-
k8s.io/apimachinery v0.34.2
25-
k8s.io/client-go v0.34.2
26-
k8s.io/component-base v0.34.2
21+
golang.org/x/text v0.32.0
22+
k8s.io/api v0.34.3
23+
k8s.io/apiextensions-apiserver v0.34.3
24+
k8s.io/apimachinery v0.34.3
25+
k8s.io/client-go v0.34.3
26+
k8s.io/component-base v0.34.3
2727
k8s.io/klog/v2 v2.130.1
2828
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
29-
sigs.k8s.io/cluster-api v1.11.3
29+
sigs.k8s.io/cluster-api v1.12.0
3030
sigs.k8s.io/controller-runtime v0.22.4
3131
)
3232

3333
require (
34-
cel.dev/expr v0.24.0 // indirect
34+
cel.dev/expr v0.25.1 // indirect
3535
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3636
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
3737
github.com/beorn7/perks v1.0.1 // indirect
3838
github.com/blang/semver/v4 v4.0.0 // indirect
3939
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4040
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4141
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
42-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
42+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
4343
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4444
github.com/felixge/httpsnoop v1.0.4 // indirect
4545
github.com/fsnotify/fsnotify v1.9.0 // indirect
@@ -89,28 +89,28 @@ require (
8989
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
9090
go.opentelemetry.io/otel/trace v1.35.0 // indirect
9191
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
92-
go.yaml.in/yaml/v2 v2.4.2 // indirect
92+
go.yaml.in/yaml/v2 v2.4.3 // indirect
9393
go.yaml.in/yaml/v3 v3.0.4 // indirect
94-
golang.org/x/crypto v0.45.0 // indirect
94+
golang.org/x/crypto v0.46.0 // indirect
9595
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
96-
golang.org/x/mod v0.29.0 // indirect
96+
golang.org/x/mod v0.30.0 // indirect
9797
golang.org/x/net v0.47.0 // indirect
98-
golang.org/x/oauth2 v0.30.0 // indirect
99-
golang.org/x/sync v0.18.0 // indirect
100-
golang.org/x/sys v0.38.0 // indirect
101-
golang.org/x/term v0.37.0 // indirect
98+
golang.org/x/oauth2 v0.33.0 // indirect
99+
golang.org/x/sync v0.19.0 // indirect
100+
golang.org/x/sys v0.39.0 // indirect
101+
golang.org/x/term v0.38.0 // indirect
102102
golang.org/x/time v0.12.0 // indirect
103-
golang.org/x/tools v0.38.0 // indirect
103+
golang.org/x/tools v0.39.0 // indirect
104104
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
105105
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
106106
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
107-
google.golang.org/grpc v1.72.1 // indirect
108-
google.golang.org/protobuf v1.36.8 // indirect
107+
google.golang.org/grpc v1.72.3 // indirect
108+
google.golang.org/protobuf v1.36.10 // indirect
109109
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
110110
gopkg.in/inf.v0 v0.9.1 // indirect
111111
gopkg.in/yaml.v3 v3.0.1 // indirect
112-
k8s.io/apiserver v0.34.2 // indirect
113-
k8s.io/cluster-bootstrap v0.33.3 // indirect
112+
k8s.io/apiserver v0.34.3 // indirect
113+
k8s.io/cluster-bootstrap v0.34.2 // indirect
114114
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
115115
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
116116
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

0 commit comments

Comments
 (0)