diff --git a/Makefile b/Makefile index d7db160..9b3227f 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ ARCH ?= amd64 OS ?= $(shell uname -s | tr A-Z a-z) K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt) export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME) -TAG ?= main +TAG ?= v0.24.0 .PHONY: all all: build diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index f867f12..49048c0 100644 --- a/config/default/manager_image_patch.yaml +++ b/config/default/manager_image_patch.yaml @@ -8,5 +8,5 @@ spec: spec: containers: # Change the value of image field below to your controller image URL - - image: projectsveltos/healthcheck-manager-amd64:main + - image: projectsveltos/healthcheck-manager-amd64:v0.24.0 name: manager diff --git a/controllers/healthcheckreport_collection.go b/controllers/healthcheckreport_collection.go index 82915e4..c69d415 100644 --- a/controllers/healthcheckreport_collection.go +++ b/controllers/healthcheckreport_collection.go @@ -98,11 +98,11 @@ func removeHealthCheckReportsFromCluster(ctx context.Context, c client.Client, c // Periodically collects HealthCheckReports from each managed cluster. func collectHealthCheckReports(c client.Client, shardKey string, logger logr.Logger) { - interval := 20 * time.Second + interval := 10 * time.Second if shardKey != "" { // This controller will only fetch ClassifierReport instances // so it can be more aggressive - interval = 10 * time.Second + interval = 5 * time.Second } ctx := context.TODO() diff --git a/go.mod b/go.mod index 2e08a36..84f555b 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( github.com/onsi/ginkgo/v2 v2.15.0 github.com/onsi/gomega v1.31.1 github.com/pkg/errors v0.9.1 - github.com/projectsveltos/addon-controller v0.23.1-0.20240209105927-d84ba6a5da08 - github.com/projectsveltos/libsveltos v0.23.1-0.20240209084455-7b121751c3e7 + github.com/projectsveltos/addon-controller v0.24.0 + github.com/projectsveltos/libsveltos v0.24.0 github.com/prometheus/client_golang v1.18.0 github.com/slack-go/slack v0.12.3 github.com/spf13/pflag v1.0.5 @@ -170,7 +170,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - helm.sh/helm/v3 v3.14.0 // indirect + helm.sh/helm/v3 v3.14.1 // indirect k8s.io/apiserver v0.29.1 // indirect k8s.io/cli-runtime v0.29.1 // indirect k8s.io/kube-openapi v0.0.0-20240103195357-a9f8850cb432 // indirect diff --git a/go.sum b/go.sum index 4161fe0..916d76e 100644 --- a/go.sum +++ b/go.sum @@ -343,10 +343,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY= github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg= -github.com/projectsveltos/addon-controller v0.23.1-0.20240209105927-d84ba6a5da08 h1:1/J/ib8SoUfs8LEQWJUJRlrgSzy4omHhChFCVtbLv44= -github.com/projectsveltos/addon-controller v0.23.1-0.20240209105927-d84ba6a5da08/go.mod h1:G3t6tae8GPJOGBuPp+mXqkeDoNOKrNtqamyM/jlxnCU= -github.com/projectsveltos/libsveltos v0.23.1-0.20240209084455-7b121751c3e7 h1:Uot2pLDyybJSjl8yAXB2qGDCri7qLnoM8t+NYRw0TGA= -github.com/projectsveltos/libsveltos v0.23.1-0.20240209084455-7b121751c3e7/go.mod h1:h2NUzyHkIc9u6T4NOQzpPnJmX8Rrumpmszo8wM8BUkA= +github.com/projectsveltos/addon-controller v0.24.0 h1:Cj1Nj46DOM58UVpRiJlvsxpQVZd5KP/0u8QGN251Yp4= +github.com/projectsveltos/addon-controller v0.24.0/go.mod h1:undt3E66BCg13mnAYUouLXCJlNwNgG5V1xbljjV2BZs= +github.com/projectsveltos/libsveltos v0.24.0 h1:2wxUqLhIEJMRye9rHypc+uT0M++CunByuOA5Pu6TGH8= +github.com/projectsveltos/libsveltos v0.24.0/go.mod h1:h2NUzyHkIc9u6T4NOQzpPnJmX8Rrumpmszo8wM8BUkA= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= @@ -571,8 +571,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= -helm.sh/helm/v3 v3.14.0 h1:TaZIH6uOchn7L27ptwnnuHJiFrT/BsD4dFdp/HLT2nM= -helm.sh/helm/v3 v3.14.0/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424= +helm.sh/helm/v3 v3.14.1 h1:4AwRLx+wfzlPtvrsbDmWP5PUokGmf9/nAmEdk21vae8= +helm.sh/helm/v3 v3.14.1/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424= k8s.io/api v0.29.1 h1:DAjwWX/9YT7NQD4INu49ROJuZAAAP/Ijki48GUPzxqw= k8s.io/api v0.29.1/go.mod h1:7Kl10vBRUXhnQQI8YR/R327zXC8eJ7887/+Ybta+RoQ= k8s.io/apiextensions-apiserver v0.29.1 h1:S9xOtyk9M3Sk1tIpQMu9wXHm5O2MX6Y1kIpPMimZBZw= diff --git a/manifest/deployment-shard.yaml b/manifest/deployment-shard.yaml index dafc2c1..ac24099 100644 --- a/manifest/deployment-shard.yaml +++ b/manifest/deployment-shard.yaml @@ -25,7 +25,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/healthcheck-manager-amd64:main + image: projectsveltos/healthcheck-manager-amd64:v0.24.0 livenessProbe: httpGet: path: /healthz diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 5f6b275..12eddd9 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -269,7 +269,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/healthcheck-manager-amd64:main + image: projectsveltos/healthcheck-manager-amd64:v0.24.0 livenessProbe: httpGet: path: /healthz