From 7c0784e4fb0c41929d27b4425c58c0ea89cd381a Mon Sep 17 00:00:00 2001 From: gianlucm76 Date: Tue, 14 Mar 2023 13:40:57 -0700 Subject: [PATCH 1/2] Prepare dev to main merge --- Makefile | 4 ++-- config/default/manager_image_patch.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- manifest/manifest.yaml | 2 +- pkg/drift-detection/drift-detection-manager.go | 2 +- pkg/drift-detection/drift-detection-manager.yaml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 61bf21f3..9d56dd1b 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 ?= v0.7.0 +TAG ?= main # Get cluster-api version and build ldflags clusterapi := $(shell go list -m sigs.k8s.io/cluster-api) @@ -192,7 +192,7 @@ create-cluster: $(KIND) $(CLUSTERCTL) $(KUBECTL) $(ENVSUBST) ## Create a new kin @echo "Create a workload cluster" $(KUBECTL) apply -f $(KIND_CLUSTER_YAML) - + @echo "Start projectsveltos" $(MAKE) deploy-projectsveltos diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index afa9c015..8c209a3a 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/sveltos-manager-amd64:v0.7.0 + - image: projectsveltos/sveltos-manager-amd64:main name: manager diff --git a/go.mod b/go.mod index 36992fa0..5dce2c98 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/ginkgo/v2 v2.6.0 github.com/onsi/gomega v1.24.1 github.com/pkg/errors v0.9.1 - github.com/projectsveltos/libsveltos v0.7.0 + github.com/projectsveltos/libsveltos v0.7.1-0.20230314175637-cecbf1f2a756 github.com/prometheus/client_golang v1.13.0 github.com/spf13/pflag v1.0.5 golang.org/x/text v0.7.0 diff --git a/go.sum b/go.sum index 95924664..1f6239d6 100644 --- a/go.sum +++ b/go.sum @@ -790,8 +790,8 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1 h1:oL4IBbcqwhhNWh31bjOX8C/OCy0zs9906d/VUru+bqg= github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU= -github.com/projectsveltos/libsveltos v0.7.0 h1:xObnyRPVJEYvwnlSc+T6NMfE+oYLb1fVM1tLxVIVvTM= -github.com/projectsveltos/libsveltos v0.7.0/go.mod h1:K2IJCkj2dz6qgZyv0F7tkZkzJ+7il1qjDyIBaBS2NpQ= +github.com/projectsveltos/libsveltos v0.7.1-0.20230314175637-cecbf1f2a756 h1:ejOkhS20o5EZ1j+PmzU2dvATbgKayTp2MUaTffBZ8sg= +github.com/projectsveltos/libsveltos v0.7.1-0.20230314175637-cecbf1f2a756/go.mod h1:K2IJCkj2dz6qgZyv0F7tkZkzJ+7il1qjDyIBaBS2NpQ= 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= diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 6d8f7edf..66b1707f 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -1487,7 +1487,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/sveltos-manager-amd64:v0.7.0 + image: projectsveltos/sveltos-manager-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/drift-detection/drift-detection-manager.go b/pkg/drift-detection/drift-detection-manager.go index e5e160c0..ab4267d8 100644 --- a/pkg/drift-detection/drift-detection-manager.go +++ b/pkg/drift-detection/drift-detection-manager.go @@ -260,7 +260,7 @@ spec: - --run-mode=do-not-send-updates command: - /manager - image: projectsveltos/drift-detection-manager-amd64:v0.7.0 + image: projectsveltos/drift-detection-manager-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/drift-detection/drift-detection-manager.yaml b/pkg/drift-detection/drift-detection-manager.yaml index 317eec21..73998a62 100644 --- a/pkg/drift-detection/drift-detection-manager.yaml +++ b/pkg/drift-detection/drift-detection-manager.yaml @@ -242,7 +242,7 @@ spec: - --run-mode=do-not-send-updates command: - /manager - image: projectsveltos/drift-detection-manager-amd64:v0.7.0 + image: projectsveltos/drift-detection-manager-amd64:main livenessProbe: httpGet: path: /healthz From f98b9544199bdcb8afa6888f39d2af5ee0fa3e25 Mon Sep 17 00:00:00 2001 From: gianlucm76 Date: Thu, 16 Mar 2023 11:03:32 -0700 Subject: [PATCH 2/2] Prepare for release v0.7.1 --- .golangci.yaml | 2 +- Makefile | 2 +- config/default/manager_image_patch.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- manifest/manifest.yaml | 2 +- pkg/drift-detection/drift-detection-manager.go | 2 +- pkg/drift-detection/drift-detection-manager.yaml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index fff77be9..62542dac 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -54,7 +54,7 @@ linters-settings: gocyclo: min-complexity: 20 goimports: - local-prefixes: golang.cisco.com/cloudstack + local-prefixes: github.com/projectsveltos gomnd: settings: mnd: diff --git a/Makefile b/Makefile index 9d56dd1b..b0af7e98 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.7.1 # Get cluster-api version and build ldflags clusterapi := $(shell go list -m sigs.k8s.io/cluster-api) diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index 8c209a3a..209c6635 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/sveltos-manager-amd64:main + - image: projectsveltos/sveltos-manager-amd64:v0.7.1 name: manager diff --git a/go.mod b/go.mod index 5dce2c98..56cd17b0 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/ginkgo/v2 v2.6.0 github.com/onsi/gomega v1.24.1 github.com/pkg/errors v0.9.1 - github.com/projectsveltos/libsveltos v0.7.1-0.20230314175637-cecbf1f2a756 + github.com/projectsveltos/libsveltos v0.7.1 github.com/prometheus/client_golang v1.13.0 github.com/spf13/pflag v1.0.5 golang.org/x/text v0.7.0 diff --git a/go.sum b/go.sum index 1f6239d6..5174c5db 100644 --- a/go.sum +++ b/go.sum @@ -790,8 +790,8 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1 h1:oL4IBbcqwhhNWh31bjOX8C/OCy0zs9906d/VUru+bqg= github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU= -github.com/projectsveltos/libsveltos v0.7.1-0.20230314175637-cecbf1f2a756 h1:ejOkhS20o5EZ1j+PmzU2dvATbgKayTp2MUaTffBZ8sg= -github.com/projectsveltos/libsveltos v0.7.1-0.20230314175637-cecbf1f2a756/go.mod h1:K2IJCkj2dz6qgZyv0F7tkZkzJ+7il1qjDyIBaBS2NpQ= +github.com/projectsveltos/libsveltos v0.7.1 h1:h3or+AAEgP0ywW9a+c4n1bR5RNVWKAzAFw+qbf21LZw= +github.com/projectsveltos/libsveltos v0.7.1/go.mod h1:K2IJCkj2dz6qgZyv0F7tkZkzJ+7il1qjDyIBaBS2NpQ= 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= diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 66b1707f..098f405a 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -1487,7 +1487,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/sveltos-manager-amd64:main + image: projectsveltos/sveltos-manager-amd64:v0.7.1 livenessProbe: httpGet: path: /healthz diff --git a/pkg/drift-detection/drift-detection-manager.go b/pkg/drift-detection/drift-detection-manager.go index ab4267d8..6056c5b5 100644 --- a/pkg/drift-detection/drift-detection-manager.go +++ b/pkg/drift-detection/drift-detection-manager.go @@ -260,7 +260,7 @@ spec: - --run-mode=do-not-send-updates command: - /manager - image: projectsveltos/drift-detection-manager-amd64:main + image: projectsveltos/drift-detection-manager-amd64:v0.7.1 livenessProbe: httpGet: path: /healthz diff --git a/pkg/drift-detection/drift-detection-manager.yaml b/pkg/drift-detection/drift-detection-manager.yaml index 73998a62..e439a340 100644 --- a/pkg/drift-detection/drift-detection-manager.yaml +++ b/pkg/drift-detection/drift-detection-manager.yaml @@ -242,7 +242,7 @@ spec: - --run-mode=do-not-send-updates command: - /manager - image: projectsveltos/drift-detection-manager-amd64:main + image: projectsveltos/drift-detection-manager-amd64:v0.7.1 livenessProbe: httpGet: path: /healthz