From cbd4845e7ba679f316dcb49ccde9b04d8282ed09 Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Mon, 14 Nov 2022 14:05:05 -0800 Subject: [PATCH 1/5] release:bump consul image to 1.13.3 --- charts/consul/Chart.yaml | 4 ++-- charts/consul/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index 8b7e2da587..2353751f69 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: consul version: 0.49.0 -appVersion: 1.13.2 +appVersion: 1.13.3 kubeVersion: ">=1.21.0-0" description: Official HashiCorp Consul Chart home: https://www.consul.io @@ -13,7 +13,7 @@ annotations: artifacthub.io/prerelease: false artifacthub.io/images: | - name: consul - image: hashicorp/consul:1.13.2 + image: hashicorp/consul:1.13.3 - name: consul-k8s-control-plane image: hashicorp/consul-k8s-control-plane:0.49.0 - name: envoy diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index 564de43780..c21e3f8b80 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -109,7 +109,7 @@ global: # image: "hashicorp/consul-enterprise:1.10.0-ent" # ``` # @default: hashicorp/consul: - image: "hashicorp/consul:1.13.2" + image: "hashicorp/consul:1.13.3" # Array of objects containing image pull secret names that will be applied to each service account. # This can be used to reference image pull secrets if using a custom consul or consul-k8s-control-plane Docker image. From 020bb173d5b10e8a4fb53b2fdb5c1b738ea35711 Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Mon, 14 Nov 2022 14:09:35 -0800 Subject: [PATCH 2/5] bump k8s version --- charts/consul/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index 2353751f69..da79e235f1 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: consul -version: 0.49.0 +version: 0.49.1 appVersion: 1.13.3 kubeVersion: ">=1.21.0-0" description: Official HashiCorp Consul Chart From 9ed2eee66ebae96f1ce90ef7bd8c22c018a296a7 Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Mon, 14 Nov 2022 14:27:47 -0800 Subject: [PATCH 3/5] run make prepare-release --- CHANGELOG.md | 2 +- charts/consul/Chart.yaml | 2 +- charts/consul/values.yaml | 2 +- cli/version/version.go | 2 +- control-plane/version/version.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 504d7162b9..33a8d51fd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## UNRELEASED +## 0.49.1 (November 14, 2022) BREAKING CHANGES: * Peering: * Rename `PeerName` to `Peer` in ExportedServices CRD. [[GH-1596](https://github.com/hashicorp/consul-k8s/pull/1596)] diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index da79e235f1..a85b87ccfd 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -15,7 +15,7 @@ annotations: - name: consul image: hashicorp/consul:1.13.3 - name: consul-k8s-control-plane - image: hashicorp/consul-k8s-control-plane:0.49.0 + image: hashicorp/consul-k8s-control-plane:0.49.1 - name: envoy image: envoyproxy/envoy:v1.23.1 artifacthub.io/license: MPL-2.0 diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index c21e3f8b80..7bf0c772c7 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -129,7 +129,7 @@ global: # image that is used for functionality such as catalog sync. # This can be overridden per component. # @default: hashicorp/consul-k8s-control-plane: - imageK8S: hashicorp/consul-k8s-control-plane:0.49.0 + imageK8S: hashicorp/consul-k8s-control-plane:0.49.1 # The name of the datacenter that the agents should # register as. This can't be changed once the Consul cluster is up and running diff --git a/cli/version/version.go b/cli/version/version.go index 082ffeb1f3..4f0607732d 100644 --- a/cli/version/version.go +++ b/cli/version/version.go @@ -14,7 +14,7 @@ var ( // // Version must conform to the format expected by // github.com/hashicorp/go-version for tests to work. - Version = "0.49.0" + Version = "0.49.1" // 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 diff --git a/control-plane/version/version.go b/control-plane/version/version.go index 082ffeb1f3..4f0607732d 100644 --- a/control-plane/version/version.go +++ b/control-plane/version/version.go @@ -14,7 +14,7 @@ var ( // // Version must conform to the format expected by // github.com/hashicorp/go-version for tests to work. - Version = "0.49.0" + Version = "0.49.1" // 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 From 45ceb5f46b9beb51e37ad4a268d4027f0b04f16b Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Mon, 14 Nov 2022 14:50:38 -0800 Subject: [PATCH 4/5] unit test with 1.13.3 also --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ce1033a540..2196868c94 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,8 +4,8 @@ on: env: TEST_RESULTS: /tmp/test-results # path to where test results are saved - CONSUL_VERSION: 1.13.1 # Consul's OSS version to use in tests - CONSUL_ENT_VERSION: 1.13.1+ent # Consul's enterprise version to use in tests + CONSUL_VERSION: 1.13.3 # Consul's OSS version to use in tests + CONSUL_ENT_VERSION: 1.13.3+ent # Consul's enterprise version to use in tests GOTESTSUM_VERSION: 1.8.1 # You cannot use environment variables with workflows. The gotestsum version is hardcoded in the reusable workflows too. jobs: From f98bb5a0b68c7d7b87e89fb84a06cd4db5235664 Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Tue, 15 Nov 2022 11:58:05 -0800 Subject: [PATCH 5/5] fix unit tests with consul 1.13.3 (#1720) --- .../connect-inject/endpoints_controller_test.go | 12 ++++++------ .../connect-inject/peering_dialer_controller_test.go | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/control-plane/connect-inject/endpoints_controller_test.go b/control-plane/connect-inject/endpoints_controller_test.go index abbad4b2a6..49ee67a91d 100644 --- a/control-plane/connect-inject/endpoints_controller_test.go +++ b/control-plane/connect-inject/endpoints_controller_test.go @@ -435,7 +435,7 @@ func TestProcessUpstreams(t *testing.T) { }, expErr: "upstream \"upstream1:1234:dc1\" is invalid: ProxyDefaults mesh gateway mode is neither \"local\" nor \"remote\"", configEntry: func() api.ConfigEntry { - ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "pd") + ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "global") pd := ce.(*api.ProxyConfigEntry) pd.MeshGateway.Mode = "bad-mode" return pd @@ -492,7 +492,7 @@ func TestProcessUpstreams(t *testing.T) { }, }, configEntry: func() api.ConfigEntry { - ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "pd") + ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "global") pd := ce.(*api.ProxyConfigEntry) pd.MeshGateway.Mode = api.MeshGatewayModeLocal return pd @@ -516,7 +516,7 @@ func TestProcessUpstreams(t *testing.T) { }, }, configEntry: func() api.ConfigEntry { - ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "pd") + ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "global") pd := ce.(*api.ProxyConfigEntry) pd.MeshGateway.Mode = api.MeshGatewayModeRemote return pd @@ -533,7 +533,7 @@ func TestProcessUpstreams(t *testing.T) { }, expErr: "", configEntry: func() api.ConfigEntry { - ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "pd") + ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "global") pd := ce.(*api.ProxyConfigEntry) pd.MeshGateway.Mode = "remote" return pd @@ -634,7 +634,7 @@ func TestProcessUpstreams(t *testing.T) { return pod1 }, configEntry: func() api.ConfigEntry { - ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "pd") + ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "global") pd := ce.(*api.ProxyConfigEntry) pd.MeshGateway.Mode = "remote" return pd @@ -670,7 +670,7 @@ func TestProcessUpstreams(t *testing.T) { return pod1 }, configEntry: func() api.ConfigEntry { - ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "pd") + ce, _ := api.MakeConfigEntry(api.ProxyDefaults, "global") pd := ce.(*api.ProxyConfigEntry) pd.MeshGateway.Mode = "remote" return pd diff --git a/control-plane/connect-inject/peering_dialer_controller_test.go b/control-plane/connect-inject/peering_dialer_controller_test.go index 70076c75ec..62cb618d90 100644 --- a/control-plane/connect-inject/peering_dialer_controller_test.go +++ b/control-plane/connect-inject/peering_dialer_controller_test.go @@ -255,6 +255,7 @@ func TestReconcile_CreateUpdatePeeringDialer(t *testing.T) { // must be unique on the acceptor and dialer peers. Otherwise the following consul error will be thrown: // https://github.com/hashicorp/consul/blob/74b87d49d33069a048aead7a86d85d4b4b6461b5/agent/rpc/peering/service.go#L491. c.Datacenter = "acceptor-dc" + c.Ports.HTTPS = 0 }) require.NoError(t, err) defer acceptorPeerServer.Stop() @@ -438,6 +439,7 @@ func TestReconcile_VersionAnnotationPeeringDialer(t *testing.T) { // We set the datacenter because the server name, typically formatted as "server.." // must be unique on the acceptor and dialer peers. c.Datacenter = "acceptor-dc" + c.Ports.HTTPS = 0 }) require.NoError(t, err) defer acceptorPeerServer.Stop()