Skip to content

release: bump consul image to 1.13.3 #1715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndhanushkodi merged 5 commits into from
Nov 15, 2022
Merged

release: bump consul image to 1.13.3 #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cbd4845
release:bump consul image to 1.13.3
ndhanushkodi Nov 14, 2022
020bb17
bump k8s version
ndhanushkodi Nov 14, 2022
9ed2eee
run make prepare-release
ndhanushkodi Nov 14, 2022
45ceb5f
unit test with 1.13.3 also
ndhanushkodi Nov 14, 2022
f98bb5a
fix unit tests with consul 1.13.3 (#1720)
ndhanushkodi Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## UNRELEASED
## 0.49.1 (November 14, 2022)
Copy link
Copy Markdown
Contributor

@wilkermichael wilkermichael Nov 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, do we need to bump the version here:

consul-k8s/.github/workflows/test.yml

Lines 7 to 8 in 9ed2eee

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

Copy link
Copy Markdown
Contributor Author

@ndhanushkodi ndhanushkodi Nov 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call!!!

Copy link
Copy Markdown
Contributor Author

@ndhanushkodi ndhanushkodi Nov 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

after bumping this, ran into some test failures which i've fixed here #1720

BREAKING CHANGES:
* Peering:
* Rename `PeerName` to `Peer` in ExportedServices CRD. [[GH-1596](https://github.com/hashicorp/consul-k8s/pull/1596)]
Expand Down
8 changes: 4 additions & 4 deletions charts/consul/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: consul
version: 0.49.0
appVersion: 1.13.2
version: 0.49.1
appVersion: 1.13.3
kubeVersion: ">=1.21.0-0"
description: Official HashiCorp Consul Chart
home: https://www.consul.io
Expand All @@ -13,9 +13,9 @@ 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
image: hashicorp/consul-k8s-control-plane:0.49.1
- name: envoy
image: envoyproxy/envoy:v1.23.1
artifacthub.io/license: MPL-2.0
Expand Down
4 changes: 2 additions & 2 deletions charts/consul/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ global:
# image: "hashicorp/consul-enterprise:1.10.0-ent"
# ```
# @default: hashicorp/consul:<latest version>
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.
Comment thread
ndhanushkodi marked this conversation as resolved.
Expand All @@ -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:<latest version>
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
Expand Down
2 changes: 1 addition & 1 deletion cli/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions control-plane/connect-inject/endpoints_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions control-plane/connect-inject/peering_dialer_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -438,6 +439,7 @@ func TestReconcile_VersionAnnotationPeeringDialer(t *testing.T) {
// We set the datacenter because the server name, typically formatted as "server.<datacenter>.<domain>"
// must be unique on the acceptor and dialer peers.
c.Datacenter = "acceptor-dc"
c.Ports.HTTPS = 0
})
require.NoError(t, err)
defer acceptorPeerServer.Stop()
Expand Down
2 changes: 1 addition & 1 deletion control-plane/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down