github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

manually import the change (#17239)

pull/17242/head
hc-github-team-consul-core 2023-05-08 17:54:23 -04:00 committed by GitHub
parent 05e9af3fa5
commit 2ab3184c61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/consul-container/libs/cluster/cluster.go
View File

@ -283,7 +283,7 @@ func (c *Cluster) Remove(n Agent) error {
// helpers below. // helpers below.
// //
// This lets us have tests that assert that an upgrade will fail. // This lets us have tests that assert that an upgrade will fail.
func (c *Cluster) StandardUpgrade(t *testing.T, ctx context.Context, targetVersion string) error { func (c *Cluster) StandardUpgrade(t *testing.T, ctx context.Context, targetImage string, targetVersion string) error {
var err error var err error
// We take a snapshot, but note that we currently do nothing with it. // We take a snapshot, but note that we currently do nothing with it.
if c.ACLEnabled { if c.ACLEnabled {
@ -327,6 +327,7 @@ func (c *Cluster) StandardUpgrade(t *testing.T, ctx context.Context, targetVersi
upgradeFn := func(agent Agent, clientFactory func() (*api.Client, error)) error { upgradeFn := func(agent Agent, clientFactory func() (*api.Client, error)) error {
config := agent.GetConfig() config := agent.GetConfig()
config.Image = targetImage
config.Version = targetVersion config.Version = targetVersion
if agent.IsServer() { if agent.IsServer() {

3
test/integration/consul-container/libs/topology/peering_topology.go
View File

@ -41,6 +41,7 @@ type BuiltCluster struct {
// It returns objects of the accepting cluster, dialing cluster, staticServerSvc, and staticClientSvcSidecar // It returns objects of the accepting cluster, dialing cluster, staticServerSvc, and staticClientSvcSidecar
func BasicPeeringTwoClustersSetup( func BasicPeeringTwoClustersSetup(
t *testing.T, t *testing.T,
consulImage string,
consulVersion string, consulVersion string,
peeringThroughMeshgateway bool, peeringThroughMeshgateway bool,
) (*BuiltCluster, *BuiltCluster) { ) (*BuiltCluster, *BuiltCluster) {
@ -49,6 +50,7 @@ func BasicPeeringTwoClustersSetup(
NumClients: 1, NumClients: 1,
BuildOpts: &libcluster.BuildOptions{ BuildOpts: &libcluster.BuildOptions{
Datacenter: "dc1", Datacenter: "dc1",
ConsulImageName: consulImage,
ConsulVersion: consulVersion, ConsulVersion: consulVersion,
InjectAutoEncryption: true, InjectAutoEncryption: true,
}, },
@ -60,6 +62,7 @@ func BasicPeeringTwoClustersSetup(
NumClients: 1, NumClients: 1,
BuildOpts: &libcluster.BuildOptions{ BuildOpts: &libcluster.BuildOptions{
Datacenter: "dc2", Datacenter: "dc2",
ConsulImageName: consulImage,
ConsulVersion: consulVersion, ConsulVersion: consulVersion,
InjectAutoEncryption: true, InjectAutoEncryption: true,
}, },

8
test/integration/consul-container/libs/utils/version.go
View File

@ -33,6 +33,14 @@ func init() {
flag.BoolVar(&FollowLog, "follow-log", true, "follow container log in output (Default: true)") flag.BoolVar(&FollowLog, "follow-log", true, "follow container log in output (Default: true)")
} }
func GetTargetImageName() string {
return TargetImageName
}
func GetLatestImageName() string {
return LatestImageName
}
func DockerImage(image, version string) string { func DockerImage(image, version string) string {
v := image + ":" + version v := image + ":" + version
if image == DefaultImageNameENT && isSemVer(version) { if image == DefaultImageNameENT && isSemVer(version) {

2
test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go
View File

@ -50,7 +50,7 @@ import (
func TestPeering_RotateServerAndCAThenFail_(t *testing.T) { func TestPeering_RotateServerAndCAThenFail_(t *testing.T) {
t.Parallel() t.Parallel()
accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.TargetVersion, false) accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetTargetImageName(), utils.TargetVersion, false)
var ( var (
acceptingCluster = accepting.Cluster acceptingCluster = accepting.Cluster
dialingCluster = dialing.Cluster dialingCluster = dialing.Cluster

3
test/integration/consul-container/test/upgrade/acl_node_test.go
View File

@ -41,6 +41,7 @@ func TestACL_Upgrade_Node_Token(t *testing.T) {
NumClients: 1, NumClients: 1,
BuildOpts: &libcluster.BuildOptions{ BuildOpts: &libcluster.BuildOptions{
Datacenter: "dc1", Datacenter: "dc1",
ConsulImageName: utils.GetLatestImageName(),
ConsulVersion: tc.oldversion, ConsulVersion: tc.oldversion,
InjectAutoEncryption: false, InjectAutoEncryption: false,
ACLEnabled: true, ACLEnabled: true,
@ -52,7 +53,7 @@ func TestACL_Upgrade_Node_Token(t *testing.T) {
cluster.Agents[1].GetAgentName()) cluster.Agents[1].GetAgentName())
require.NoError(t, err) require.NoError(t, err)
err = cluster.StandardUpgrade(t, context.Background(), tc.targetVersion) err = cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion)
require.NoError(t, err) require.NoError(t, err)
// Post upgrade validation: agent token can be used to query the node // Post upgrade validation: agent token can be used to query the node

6
test/integration/consul-container/test/upgrade/fullstopupgrade_test.go
View File

@ -43,7 +43,7 @@ func TestStandardUpgradeToTarget_fromLatest(t *testing.T) {
run := func(t *testing.T, tc testcase) { run := func(t *testing.T, tc testcase) {
configCtx := libcluster.NewBuildContext(t, libcluster.BuildOptions{ configCtx := libcluster.NewBuildContext(t, libcluster.BuildOptions{
ConsulImageName: utils.TargetImageName, ConsulImageName: utils.GetLatestImageName(),
ConsulVersion: tc.oldversion, ConsulVersion: tc.oldversion,
}) })
@ -88,7 +88,7 @@ func TestStandardUpgradeToTarget_fromLatest(t *testing.T) {
// upgrade the cluster to the Target version // upgrade the cluster to the Target version
t.Logf("initiating standard upgrade to version=%q", tc.targetVersion) t.Logf("initiating standard upgrade to version=%q", tc.targetVersion)
err = cluster.StandardUpgrade(t, context.Background(), tc.targetVersion) err = cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion)
if !tc.expectErr { if !tc.expectErr {
require.NoError(t, err) require.NoError(t, err)
libcluster.WaitForLeader(t, cluster, client) libcluster.WaitForLeader(t, cluster, client)
@ -102,7 +102,7 @@ func TestStandardUpgradeToTarget_fromLatest(t *testing.T) {
require.Equal(r, serviceName, service[0].ServiceName) require.Equal(r, serviceName, service[0].ServiceName)
}) })
} else { } else {
require.Error(t, fmt.Errorf("context deadline exceeded")) require.ErrorContains(t, err, "context deadline exceeded")
} }
} }

3
test/integration/consul-container/test/upgrade/l7_traffic_management/resolver_default_subset_test.go
View File

@ -11,6 +11,7 @@ import (
libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster" libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service" libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
"github.com/hashicorp/consul/test/integration/consul-container/libs/topology" "github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
libutils "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" libutils "github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
upgrade "github.com/hashicorp/consul/test/integration/consul-container/test/upgrade" upgrade "github.com/hashicorp/consul/test/integration/consul-container/test/upgrade"
"github.com/hashicorp/go-version" "github.com/hashicorp/go-version"
@ -373,7 +374,7 @@ func TestTrafficManagement_ServiceResolver(t *testing.T) {
tc.extraAssertion(staticClientProxy) tc.extraAssertion(staticClientProxy)
// Upgrade cluster, restart sidecars then begin service traffic validation // Upgrade cluster, restart sidecars then begin service traffic validation
require.NoError(t, cluster.StandardUpgrade(t, context.Background(), targetVersion)) require.NoError(t, cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), targetVersion))
require.NoError(t, staticClientProxy.Restart()) require.NoError(t, staticClientProxy.Restart())
require.NoError(t, staticServerProxy.Restart()) require.NoError(t, staticServerProxy.Restart())
restartFn() restartFn()

6
test/integration/consul-container/test/upgrade/peering_control_plane_mgw_test.go
View File

@ -42,7 +42,7 @@ func TestPeering_Upgrade_ControlPlane_MGW(t *testing.T) {
} }
run := func(t *testing.T, tc testcase) { run := func(t *testing.T, tc testcase) {
accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, tc.oldversion, true) accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), tc.oldversion, true)
var ( var (
acceptingCluster = accepting.Cluster acceptingCluster = accepting.Cluster
dialingCluster = dialing.Cluster dialingCluster = dialing.Cluster
@ -66,11 +66,11 @@ func TestPeering_Upgrade_ControlPlane_MGW(t *testing.T) {
"upstream_cx_total", 1) "upstream_cx_total", 1)
// Upgrade the accepting cluster and assert peering is still ACTIVE // Upgrade the accepting cluster and assert peering is still ACTIVE
require.NoError(t, acceptingCluster.StandardUpgrade(t, context.Background(), tc.targetVersion)) require.NoError(t, acceptingCluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion))
libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive) libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive) libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)
require.NoError(t, dialingCluster.StandardUpgrade(t, context.Background(), tc.targetVersion)) require.NoError(t, dialingCluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion))
libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive) libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive) libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)

6
test/integration/consul-container/test/upgrade/peering_http_test.go
View File

@ -317,7 +317,7 @@ func TestPeering_UpgradeToTarget_fromLatest(t *testing.T) {
} }
run := func(t *testing.T, tc testcase) { run := func(t *testing.T, tc testcase) {
accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, tc.oldversion, false) accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), tc.oldversion, false)
var ( var (
acceptingCluster = accepting.Cluster acceptingCluster = accepting.Cluster
dialingCluster = dialing.Cluster dialingCluster = dialing.Cluster
@ -339,11 +339,11 @@ func TestPeering_UpgradeToTarget_fromLatest(t *testing.T) {
tc.extraAssertion(appPort) tc.extraAssertion(appPort)
// Upgrade the accepting cluster and assert peering is still ACTIVE // Upgrade the accepting cluster and assert peering is still ACTIVE
require.NoError(t, acceptingCluster.StandardUpgrade(t, context.Background(), tc.targetVersion)) require.NoError(t, acceptingCluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion))
libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive) libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive) libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)
require.NoError(t, dialingCluster.StandardUpgrade(t, context.Background(), tc.targetVersion)) require.NoError(t, dialingCluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion))
libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive) libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive) libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)