kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add overrides support in lifecycle integration tests 

This allows specific changes to be tested during an `update cluster --yes` and ensuring a subsequent `update cluster` dryrun correctly reports no changes.

To specify changes, create a cluster.overrides.txt or instancegroup.<name>.overrides.txt file in the update_cluster integration test's directory.
Each line is a field=value format, each batch of changes is separated by a `---` line.
Each batch will be ran through `update cluster --yes`
This commit is contained in:
Peter Rifel 2021-02-06 23:07:05 -06:00
parent c91ea29cb8
commit dd1ebb8b77
No known key found for this signature in database
GPG Key ID: BC6469E5B16DB2B6
4 changed files with 124 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kops/BUILD.bazel
View File

@ -166,6 +166,7 @@ go_test(
"//cloudmock/aws/mockec2:go_default_library",
"//cmd/kops/util:go_default_library",
"//pkg/apis/kops:go_default_library",
"//pkg/commands:go_default_library",
"//pkg/featureflag:go_default_library",
"//pkg/jsonutils:go_default_library",
"//pkg/kopscodecs:go_default_library",

184
cmd/kops/lifecycle_integration_test.go
View File

@ -17,8 +17,10 @@ limitations under the License.
package main
import (
"bufio"
"bytes"
"context"
"fmt"
"os"
"path"
"reflect"
@ -29,6 +31,8 @@ import (
"k8s.io/kops/cloudmock/aws/mockec2"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/commands"
"k8s.io/kops/pkg/featureflag"
"k8s.io/kops/pkg/testutils"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup"
@ -152,6 +156,12 @@ func TestLifecyclePrivateSharedIP(t *testing.T) {
func runLifecycleTest(h *testutils.IntegrationTestHarness, o *LifecycleTestOptions, cloud *awsup.MockAWSCloud) {
ctx := context.Background()
featureflag.ParseFlags("+SpecOverrideFlag")
unsetFeatureFlags := func() {
featureflag.ParseFlags("-SpecOverrideFlag")
}
defer unsetFeatureFlags()
t := o.t
t.Logf("running lifecycle test for cluster %s", o.ClusterName)
@ -188,43 +198,58 @@ func runLifecycleTest(h *testutils.IntegrationTestHarness, o *LifecycleTestOptio
t.Fatalf("error running %q create: %v", inputYAML, err)
}
}
updateEnsureNoChanges(ctx, t, factory, o.ClusterName, stdout)
// Overrides
{
options := &UpdateClusterOptions{}
options.InitDefaults()
options.RunTasksOptions.MaxTaskDuration = 10 * time.Second
options.Yes = true
// We don't test it here, and it adds a dependency on kubectl
options.CreateKubecfg = false
_, err := RunUpdateCluster(ctx, factory, o.ClusterName, &stdout, options)
cluster, err := GetCluster(ctx, factory, o.ClusterName)
if err != nil {
t.Fatalf("error running update cluster %q: %v", o.ClusterName, err)
t.Fatalf("error getting cluster: %v", err)
}
}
{
options := &UpdateClusterOptions{}
options.InitDefaults()
options.Target = cloudup.TargetDryRun
options.RunTasksOptions.MaxTaskDuration = 10 * time.Second
// We don't test it here, and it adds a dependency on kubectl
options.CreateKubecfg = false
results, err := RunUpdateCluster(ctx, factory, o.ClusterName, &stdout, options)
clientset, err := factory.Clientset()
if err != nil {
t.Fatalf("error running update cluster %q: %v", o.ClusterName, err)
t.Fatalf("error getting clientset: %v", err)
}
target := results.Target.(*fi.DryRunTarget)
if target.HasChanges() {
var b bytes.Buffer
if err := target.PrintReport(results.TaskMap, &b); err != nil {
t.Fatalf("error building report: %v", err)
overrides, err := loadOverrides(path.Join(o.SrcDir, "cluster.overrides.txt"))
if err != nil {
t.Fatalf("error loading overrides file: %v", err)
}
for _, overrideBatch := range overrides {
t.Logf("overriding cluster values %v\n", overrideBatch)
setClusterOptions := &commands.SetClusterOptions{
Fields: overrideBatch,
ClusterName: o.ClusterName,
}
if err := commands.RunSetCluster(ctx, factory, nil, nil, setClusterOptions); err != nil {
t.Fatalf("error applying overrides: %v", err)
}
updateEnsureNoChanges(ctx, t, factory, o.ClusterName, stdout)
}
instanceGroups, err := commands.ReadAllInstanceGroups(ctx, clientset, cluster)
if err != nil {
t.Fatalf("error reading instance groups: %v", err)
}
for _, ig := range instanceGroups {
overrideFile := path.Join(o.SrcDir, fmt.Sprintf("instancegroup.%v.overrides.txt", ig.Name))
overrides, err := loadOverrides(overrideFile)
if err != nil {
t.Fatalf("error loading overrides file: %v", err)
}
for _, overrideBatch := range overrides {
t.Logf("overriding instance group values (%v) %v\n", ig.Name, overrideBatch)
setIGOptions := &commands.SetInstanceGroupOptions{
Fields: overrideBatch,
ClusterName: o.ClusterName,
InstanceGroupName: ig.Name,
}
if err := commands.RunSetInstancegroup(ctx, factory, nil, nil, setIGOptions); err != nil {
t.Fatalf("error applying overrides: %v", err)
}
updateEnsureNoChanges(ctx, t, factory, o.ClusterName, stdout)
}
t.Fatalf("Target had changes after executing: %v", b.String())
}
}
@ -405,44 +430,7 @@ func runLifecycleTestOpenstack(o *LifecycleTestOptions) {
}
}
{
options := &UpdateClusterOptions{}
options.InitDefaults()
options.RunTasksOptions.MaxTaskDuration = 10 * time.Second
options.Yes = true
// We don't test it here, and it adds a dependency on kubectl
options.CreateKubecfg = false
_, err := RunUpdateCluster(ctx, factory, o.ClusterName, &stdout, options)
if err != nil {
t.Fatalf("error running update cluster %q: %v", o.ClusterName, err)
}
}
{
options := &UpdateClusterOptions{}
options.InitDefaults()
options.Target = cloudup.TargetDryRun
options.RunTasksOptions.MaxTaskDuration = 10 * time.Second
// We don't test it here, and it adds a dependency on kubectl
options.CreateKubecfg = false
results, err := RunUpdateCluster(ctx, factory, o.ClusterName, &stdout, options)
if err != nil {
t.Fatalf("error running update cluster %q: %v", o.ClusterName, err)
}
target := results.Target.(*fi.DryRunTarget)
if target.HasChanges() {
var b bytes.Buffer
if err := target.PrintReport(results.TaskMap, &b); err != nil {
t.Fatalf("error building report: %v", err)
}
t.Fatalf("Target had changes after executing: %v", b.String())
}
}
updateEnsureNoChanges(ctx, t, factory, o.ClusterName, stdout)
{
options := &DeleteClusterOptions{}
@ -465,3 +453,65 @@ func runLifecycleTestOpenstack(o *LifecycleTestOptions) {
}
}
}
func updateEnsureNoChanges(ctx context.Context, t *testing.T, factory *util.Factory, clusterName string, stdout bytes.Buffer) {
t.Helper()
options := &UpdateClusterOptions{}
options.InitDefaults()
options.RunTasksOptions.MaxTaskDuration = 10 * time.Second
options.Yes = true
// We don't test it here, and it adds a dependency on kubectl
options.CreateKubecfg = false
_, err := RunUpdateCluster(ctx, factory, clusterName, &stdout, options)
if err != nil {
t.Fatalf("error running update cluster %q: %v", clusterName, err)
}
// Now perform another dryrun update and ensure no changes are reported
options = &UpdateClusterOptions{}
options.InitDefaults()
options.Target = cloudup.TargetDryRun
options.RunTasksOptions.MaxTaskDuration = 10 * time.Second
// We don't test it here, and it adds a dependency on kubectl
options.CreateKubecfg = false
results, err := RunUpdateCluster(ctx, factory, clusterName, &stdout, options)
if err != nil {
t.Fatalf("error running update cluster %q: %v", clusterName, err)
}
target := results.Target.(*fi.DryRunTarget)
if target.HasChanges() {
var b bytes.Buffer
if err := target.PrintReport(results.TaskMap, &b); err != nil {
t.Fatalf("error building report: %v", err)
}
t.Fatalf("Target had changes after executing: %v", b.String())
}
}
// Returns a list of lists of overrides. each list of overrides will be applied in a batch
func loadOverrides(filepath string) ([][]string, error) {
f, err := os.Open(filepath)
if os.IsNotExist(err) {
return nil, nil
} else if err != nil {
return nil, err
}
overrides := make([][]string, 0)
overrides = append(overrides, make([]string, 0))
scanner := bufio.NewScanner(f)
for scanner.Scan() {
line := scanner.Text()
if line == "---" {
overrides = append(overrides, make([]string, 0))
continue
}
overrides[len(overrides)-1] = append(overrides[len(overrides)-1], line)
}
return overrides, nil
}

3
tests/integration/update_cluster/complex/cluster.overrides.txt Normal file
View File

@ -0,0 +1,3 @@
spec.api.loadBalancer.sslCertificate=arn:aws:acm:us-east-1:123456789012:certificate/123456789012-1234-1234-1234-12345678
---
spec.api.loadBalancer.additionalSecurityGroups=sg-123456

3
tests/integration/update_cluster/complex/instancegroup.nodes.overrides.txt Normal file
View File

@ -0,0 +1,3 @@
spec.mixedInstancesPolicy.instances=[m5.xlarge,m5.large]
---
spec.mixedInstancesPolicy.instances=[m5.xlarge]