From a1d55557d01bba4325bbb26a18f34d784d70050b Mon Sep 17 00:00:00 2001 From: mgianluc Date: Thu, 25 Jan 2024 12:52:27 +0100 Subject: [PATCH] Prepare for release v0.22.0 --- Makefile | 7 ++++++- config/default/manager_image_patch.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- manifest/manifest.yaml | 2 +- pkg/sharding/ac.yaml | 3 ++- pkg/sharding/addon-controller.go | 3 ++- pkg/sharding/classifier.go | 4 ++-- pkg/sharding/classifier.yaml | 4 ++-- pkg/sharding/em.yaml | 2 +- pkg/sharding/event-manager.go | 2 +- pkg/sharding/healthcheck-manager.go | 2 +- pkg/sharding/hm.yaml | 2 +- pkg/sharding/sc.yaml | 2 +- pkg/sharding/sveltoscluster-manager.go | 2 +- 15 files changed, 25 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 2ea59e3..8977b3c 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,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 ?= dev +TAG ?= v0.22.0 ## Tool Binaries CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen @@ -178,6 +178,11 @@ create-cluster: $(KIND) $(CLUSTERCTL) $(KUBECTL) $(ENVSUBST) ## Create a new kin @echo wait for capd-system pod $(KUBECTL) wait --for=condition=Available deployment/capd-controller-manager -n capd-system --timeout=$(TIMEOUT) + $(KUBECTL) wait --for=condition=Available deployment/capi-kubeadm-control-plane-controller-manager -n capi-kubeadm-control-plane-system --timeout=$(TIMEOUT) + $(KUBECTL) wait --for=condition=Available deployment/capi-kubeadm-bootstrap-controller-manager -n capi-kubeadm-bootstrap-system --timeout=$(TIMEOUT) + + @echo "sleep allowing webhook to be ready" + sleep 10 @echo "Create a workload cluster" $(KUBECTL) apply -f $(KIND_CLUSTER_YAML) diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index 774d914..11f0c47 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/shard-controller-amd64:dev + - image: projectsveltos/shard-controller-amd64:v0.22.0 name: manager diff --git a/go.mod b/go.mod index a05bd84..20cbcbb 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo/v2 v2.15.0 github.com/onsi/gomega v1.31.0 github.com/pkg/errors v0.9.1 - github.com/projectsveltos/libsveltos v0.21.2-0.20240120111559-a243ee94d3fc + github.com/projectsveltos/libsveltos v0.22.0 github.com/spf13/pflag v1.0.5 golang.org/x/text v0.14.0 k8s.io/api v0.29.1 diff --git a/go.sum b/go.sum index aa93c73..b036a47 100644 --- a/go.sum +++ b/go.sum @@ -100,8 +100,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/projectsveltos/libsveltos v0.21.2-0.20240120111559-a243ee94d3fc h1:SuRmcxnPvD0hmyAm2yVh1Unc0hzA4abEChXHgIqGb+E= -github.com/projectsveltos/libsveltos v0.21.2-0.20240120111559-a243ee94d3fc/go.mod h1:CUdg31JkncVRQY6AIEQGjT2Mj6OCDckdS6OKwG9o8ek= +github.com/projectsveltos/libsveltos v0.22.0 h1:Y1+aHWfs9m8ygt+6KbQgvnBa+G9HHBb1cIgiyBqxj0g= +github.com/projectsveltos/libsveltos v0.22.0/go.mod h1:CUdg31JkncVRQY6AIEQGjT2Mj6OCDckdS6OKwG9o8ek= github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM= diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index ac2e012..5725133 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -224,7 +224,7 @@ spec: - --report-mode=0 command: - /manager - image: projectsveltos/shard-controller-amd64:dev + image: projectsveltos/shard-controller-amd64:v0.22.0 livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/ac.yaml b/pkg/sharding/ac.yaml index 9384353..a704cb6 100644 --- a/pkg/sharding/ac.yaml +++ b/pkg/sharding/ac.yaml @@ -24,9 +24,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 + - --version=v0.22.0 command: - /manager - image: projectsveltos/addon-controller-amd64:dev + image: projectsveltos/addon-controller-amd64:v0.22.0 livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/addon-controller.go b/pkg/sharding/addon-controller.go index f2df1c9..d98e898 100644 --- a/pkg/sharding/addon-controller.go +++ b/pkg/sharding/addon-controller.go @@ -42,9 +42,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 + - --version=v0.22.0 command: - /manager - image: projectsveltos/addon-controller-amd64:dev + image: projectsveltos/addon-controller-amd64:v0.22.0 livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/classifier.go b/pkg/sharding/classifier.go index 9b1aaf2..c7f6971 100644 --- a/pkg/sharding/classifier.go +++ b/pkg/sharding/classifier.go @@ -42,10 +42,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=mainmain + - --version=v0.22.0 command: - /manager - image: projectsveltos/classifier-amd64:dev + image: projectsveltos/classifier-amd64:v0.22.0 livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/classifier.yaml b/pkg/sharding/classifier.yaml index fc5bc01..82cc45a 100644 --- a/pkg/sharding/classifier.yaml +++ b/pkg/sharding/classifier.yaml @@ -24,10 +24,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=mainmain + - --version=v0.22.0 command: - /manager - image: projectsveltos/classifier-amd64:dev + image: projectsveltos/classifier-amd64:v0.22.0 livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/em.yaml b/pkg/sharding/em.yaml index d185f0d..b4f1dab 100644 --- a/pkg/sharding/em.yaml +++ b/pkg/sharding/em.yaml @@ -25,7 +25,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/event-manager-amd64:dev + image: projectsveltos/event-manager-amd64:v0.22.0 livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/event-manager.go b/pkg/sharding/event-manager.go index 614d7a6..566b691 100644 --- a/pkg/sharding/event-manager.go +++ b/pkg/sharding/event-manager.go @@ -43,7 +43,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/event-manager-amd64:dev + image: projectsveltos/event-manager-amd64:v0.22.0 livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/healthcheck-manager.go b/pkg/sharding/healthcheck-manager.go index 197f3e2..fe53b76 100644 --- a/pkg/sharding/healthcheck-manager.go +++ b/pkg/sharding/healthcheck-manager.go @@ -43,7 +43,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/healthcheck-manager-amd64:dev + image: projectsveltos/healthcheck-manager-amd64:v0.22.0 livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/hm.yaml b/pkg/sharding/hm.yaml index 787e05a..893111a 100644 --- a/pkg/sharding/hm.yaml +++ b/pkg/sharding/hm.yaml @@ -25,7 +25,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/healthcheck-manager-amd64:dev + image: projectsveltos/healthcheck-manager-amd64:v0.22.0 livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/sc.yaml b/pkg/sharding/sc.yaml index b090448..9d45d49 100644 --- a/pkg/sharding/sc.yaml +++ b/pkg/sharding/sc.yaml @@ -25,7 +25,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/sveltoscluster-manager-amd64:dev + image: projectsveltos/sveltoscluster-manager-amd64:v0.22.0 livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/sveltoscluster-manager.go b/pkg/sharding/sveltoscluster-manager.go index d9d2ed9..d7f3bc8 100644 --- a/pkg/sharding/sveltoscluster-manager.go +++ b/pkg/sharding/sveltoscluster-manager.go @@ -43,7 +43,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/sveltoscluster-manager-amd64:dev + image: projectsveltos/sveltoscluster-manager-amd64:v0.22.0 livenessProbe: httpGet: path: /healthz