From a464648b46f63329a7cf706545195dfc581c9a8f Mon Sep 17 00:00:00 2001 From: Ganeshrockz Date: Thu, 29 Feb 2024 11:21:04 +0530 Subject: [PATCH 1/3] Update CHANGELOG for 0.8.0 release --- CHANGELOG.md | 2 +- version/version.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5098111..6e36cab4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Unreleased +## 0.8.0 (Feb 29, 2024) BREAKING CHANGES * Following are the changes made to the `control-plane` container diff --git a/version/version.go b/version/version.go index 46302884..665cd543 100644 --- a/version/version.go +++ b/version/version.go @@ -21,7 +21,7 @@ var ( // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release // such as "dev" (in development), "beta", "rc1", etc. - VersionPrerelease = "dev" + VersionPrerelease = "" ) // GetHumanVersion composes the parts of the version in a way that's suitable From ad8fda501ec65eb1995117a94335f33ff4ecb207 Mon Sep 17 00:00:00 2001 From: Ganeshrockz Date: Thu, 29 Feb 2024 11:25:00 +0530 Subject: [PATCH 2/3] Update CI --- .github/workflows/bin-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bin-ci.yml b/.github/workflows/bin-ci.yml index 14ce7000..5efec99e 100644 --- a/.github/workflows/bin-ci.yml +++ b/.github/workflows/bin-ci.yml @@ -53,8 +53,8 @@ jobs: strategy: matrix: consul-version: - - 1.17.2 - - 1.17.2+ent + - 1.18.0 + - 1.18.0+ent env: TEST_RESULTS_DIR: /tmp/test-results GOTESTSUM_VERSION: 1.8.2 From ee5e66dacfc664aaf4702b124093b72ec4fd3917 Mon Sep 17 00:00:00 2001 From: Ganeshrockz Date: Thu, 29 Feb 2024 11:55:47 +0530 Subject: [PATCH 3/3] Fix SDK version --- go.mod | 4 +--- go.sum | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ad19fc75..c2c59da7 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/hashicorp/consul-awsauth v0.0.0-20220713200329-83146e702996 github.com/hashicorp/consul-server-connection-manager v0.1.2 github.com/hashicorp/consul/api v1.26.1-rc1 - github.com/hashicorp/consul/sdk v0.14.3-rc1 + github.com/hashicorp/consul/sdk v0.16.0 github.com/hashicorp/go-hclog v1.5.0 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-rootcerts v1.0.2 @@ -23,8 +23,6 @@ require ( github.com/xeipuuv/gojsonschema v1.2.0 ) -replace github.com/hashicorp/consul/sdk => github.com/hashicorp/consul/sdk v0.4.1-0.20240205231440-850137de4959 - require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.1.1 // indirect diff --git a/go.sum b/go.sum index d0623a4e..c37e8a2f 100644 --- a/go.sum +++ b/go.sum @@ -93,6 +93,8 @@ github.com/hashicorp/consul/proto-public v0.1.0 h1:O0LSmCqydZi363hsqc6n2v5sMz3us github.com/hashicorp/consul/proto-public v0.1.0/go.mod h1:vs2KkuWwtjkIgA5ezp4YKPzQp4GitV+q/+PvksrA92k= github.com/hashicorp/consul/sdk v0.4.1-0.20240205231440-850137de4959 h1:a/GXrtpCvJQMacL+P0wZsJJtAmwXgh7vwMWooqDnpgo= github.com/hashicorp/consul/sdk v0.4.1-0.20240205231440-850137de4959/go.mod h1:7pxqqhqoaPqnBnzXD1StKed62LqJeClzVsUEy85Zr0A= +github.com/hashicorp/consul/sdk v0.16.0 h1:SE9m0W6DEfgIVCJX7xU+iv/hUl4m/nxqMTnCdMxDpJ8= +github.com/hashicorp/consul/sdk v0.16.0/go.mod h1:7pxqqhqoaPqnBnzXD1StKed62LqJeClzVsUEy85Zr0A= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=