Skip to content
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

1.11.0 rc #913

Merged
merged 23 commits into from
Dec 8, 2021
Merged

1.11.0 rc #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0d321c1
Rename partitionExports to exportedServices
Dec 3, 2021
86b7a26
Update consul API where exportedservices are renamed.
Dec 4, 2021
52a2ea9
Skip controller tests till new consul image is cut
Dec 4, 2021
a829242
Run against latest consul version
Dec 6, 2021
cc105ef
Use latest consul
Dec 7, 2021
b210bcf
fix acceptance
Dec 7, 2021
b4a0b5a
Update changelog
Dec 7, 2021
b45f341
fix tests
Dec 7, 2021
94e6508
Update consul API where exportedservices are renamed.
Dec 4, 2021
236a49b
Use latest consul
Dec 7, 2021
639bc4f
Add support for tproxy for partitions test
Dec 6, 2021
11f289e
Update fixtures for exported services
Dec 6, 2021
57de409
Update go.mod
Dec 6, 2021
f5d5e20
Add service intentions as CRDs
Dec 7, 2021
5e09cc6
Revert "Add service intentions as CRDs"
Dec 7, 2021
2c3ff2a
fix test
Dec 7, 2021
4710a83
add new error message
Dec 7, 2021
296da62
skip t-proxy tests
Dec 8, 2021
f7fa51a
Update consul API where exportedservices are renamed.
Dec 4, 2021
5782d9e
Use latest consul
Dec 7, 2021
cfcd544
Update service resolver/splitter/router with partitions
Dec 7, 2021
f9c6030
support 1.11.0-rc
Dec 8, 2021
ebf3766
Merge branch 'main' into 1.11.0-rc
Dec 8, 2021
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 .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ executors:
- image: docker.mirror.hashicorp.services/circleci/golang:1.17
environment:
TEST_RESULTS: /tmp/test-results # path to where test results are saved
CONSUL_VERSION: 1.11.0-beta3 # Consul's OSS version to use in tests
CONSUL_ENT_VERSION: 1.11.0+ent-beta3 # Consul's enterprise version to use in tests
CONSUL_VERSION: 1.11.0-rc # Consul's OSS version to use in tests
CONSUL_ENT_VERSION: 1.11.0+ent-rc # Consul's enterprise version to use in tests

control-plane-path : &control-plane-path control-plane
cli-path : &cli-path cli
Expand Down
2 changes: 1 addition & 1 deletion acceptance/tests/controller/controller_namespaces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func TestControllerNamespaces(t *testing.T) {
ctx := suite.Environment().DefaultContext(t)

helmValues := map[string]string{
"global.image": "ashwinvenkatesh/consul@sha256:dce7a25b9e15271d8102a0f14fae71af0b9c789bafd8cbe4a7d0f8c34abe0296",
"global.image": "hashicorp/consul-enterprise:1.11.0-ent-rc",

"global.enableConsulNamespaces": "true",
"global.adminPartitions.enabled": "true",
Expand Down
4 changes: 2 additions & 2 deletions acceptance/tests/partitions/partitions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func TestPartitions(t *testing.T) {

serverHelmValues := map[string]string{
"global.datacenter": "dc1",
"global.image": "ashwinvenkatesh/consul@sha256:dce7a25b9e15271d8102a0f14fae71af0b9c789bafd8cbe4a7d0f8c34abe0296",
"global.image": "hashicorp/consul-enterprise:1.11.0-ent-rc",

"global.adminPartitions.enabled": "true",
"global.enableConsulNamespaces": "true",
Expand Down Expand Up @@ -197,7 +197,7 @@ func TestPartitions(t *testing.T) {
// Create client cluster.
clientHelmValues := map[string]string{
"global.datacenter": "dc1",
"global.image": "ashwinvenkatesh/consul@sha256:dce7a25b9e15271d8102a0f14fae71af0b9c789bafd8cbe4a7d0f8c34abe0296",
"global.image": "hashicorp/consul-enterprise:1.11.0-ent-rc",
"global.enabled": "false",

"global.tls.enabled": "true",
Expand Down
3 changes: 0 additions & 3 deletions control-plane/controller/exportedservices_controller_ent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (

func TestExportedServicesController_createsExportedServices(tt *testing.T) {
tt.Parallel()
tt.Skip()

cases := map[string]struct {
Mirror bool
Expand Down Expand Up @@ -151,7 +150,6 @@ func TestExportedServicesController_createsExportedServices(tt *testing.T) {

func TestExportedServicesController_updatesExportedServices(tt *testing.T) {
tt.Parallel()
tt.Skip()

cases := map[string]struct {
Mirror bool
Expand Down Expand Up @@ -294,7 +292,6 @@ func TestExportedServicesController_updatesExportedServices(tt *testing.T) {

func TestExportedServicesController_deletesExportedServices(tt *testing.T) {
tt.Parallel()
tt.Skip()

cases := map[string]struct {
Mirror bool
Expand Down