-
Notifications
You must be signed in to change notification settings - Fork 134
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1352 from tjungblu/ETCD-677
ETCD-677: add unsupported config override for etcd container removal
- Loading branch information
Showing
6 changed files
with
174 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,118 +1,80 @@ | ||
| package ceohelpers | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "fmt" | ||
| "github.com/stretchr/testify/require" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "testing" | ||
|
|
||
| operatorv1 "github.com/openshift/api/operator/v1" | ||
| ) | ||
|
|
||
| func TestIsUnsupportedUnsafeEtcd(t *testing.T) { | ||
| type args struct { | ||
| spec *operatorv1.StaticPodOperatorSpec | ||
| } | ||
| func TestIsUnsupportedOptions(t *testing.T) { | ||
| options := []string{"useUnsupportedUnsafeNonHANonProductionUnstableEtcd", "useUnsupportedUnsafeEtcdContainerRemoval"} | ||
| tests := []struct { | ||
| name string | ||
| args args | ||
| args string | ||
| want bool | ||
| wantErr bool | ||
| }{ | ||
| { | ||
| name: "test value with a bool", | ||
| args: args{spec: &operatorv1.StaticPodOperatorSpec{ | ||
| OperatorSpec: operatorv1.OperatorSpec{ | ||
| UnsupportedConfigOverrides: runtime.RawExtension{ | ||
| Raw: []byte("useUnsupportedUnsafeNonHANonProductionUnstableEtcd: true"), | ||
| }, | ||
| }, | ||
| }}, | ||
| name: "test value with a bool", | ||
| args: "%s: true", | ||
| want: true, | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "test value=true with a string", | ||
| args: args{spec: &operatorv1.StaticPodOperatorSpec{ | ||
| OperatorSpec: operatorv1.OperatorSpec{ | ||
| UnsupportedConfigOverrides: runtime.RawExtension{ | ||
| Raw: []byte(`useUnsupportedUnsafeNonHANonProductionUnstableEtcd: "true"`), | ||
| }, | ||
| }, | ||
| }}, | ||
| name: "test value=true with a string", | ||
| args: `%s: "true"`, | ||
| want: true, | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "test value=false with a string", | ||
| args: args{spec: &operatorv1.StaticPodOperatorSpec{ | ||
| OperatorSpec: operatorv1.OperatorSpec{ | ||
| UnsupportedConfigOverrides: runtime.RawExtension{ | ||
| Raw: []byte(`useUnsupportedUnsafeNonHANonProductionUnstableEtcd: "false"`), | ||
| }, | ||
| }, | ||
| }}, | ||
| name: "test value=false with a string", | ||
| args: `%s: "false"`, | ||
| want: false, | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "test value=true with a json bool", | ||
| args: args{spec: &operatorv1.StaticPodOperatorSpec{ | ||
| OperatorSpec: operatorv1.OperatorSpec{ | ||
| UnsupportedConfigOverrides: runtime.RawExtension{ | ||
| Raw: []byte(`{"useUnsupportedUnsafeNonHANonProductionUnstableEtcd": true}`), | ||
| }, | ||
| }, | ||
| }}, | ||
| name: "test value=true with a json bool", | ||
| args: `{"%s": true}`, | ||
| want: true, | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "test value=true with a json string", | ||
| args: args{spec: &operatorv1.StaticPodOperatorSpec{ | ||
| OperatorSpec: operatorv1.OperatorSpec{ | ||
| UnsupportedConfigOverrides: runtime.RawExtension{ | ||
| Raw: []byte(`{"useUnsupportedUnsafeNonHANonProductionUnstableEtcd": "true"}`), | ||
| }, | ||
| }, | ||
| }}, | ||
| name: "test value=true with a json string", | ||
| args: `{"%s": "true"}`, | ||
| want: true, | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "test value=false with a json string", | ||
| args: args{spec: &operatorv1.StaticPodOperatorSpec{ | ||
| OperatorSpec: operatorv1.OperatorSpec{ | ||
| UnsupportedConfigOverrides: runtime.RawExtension{ | ||
| Raw: []byte(`{"useUnsupportedUnsafeNonHANonProductionUnstableEtcd": "false"}`), | ||
| }, | ||
| }, | ||
| }}, | ||
| name: "test value=false with a json string", | ||
| args: `{"%s": "false"}`, | ||
| want: false, | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "test value=false with a json string", | ||
| args: args{spec: &operatorv1.StaticPodOperatorSpec{ | ||
| OperatorSpec: operatorv1.OperatorSpec{ | ||
| UnsupportedConfigOverrides: runtime.RawExtension{ | ||
| Raw: []byte(`{"useUnsupportedUnsafeNonHANonProductionUnstableEtcd": "randomValue"}`), | ||
| }, | ||
| }, | ||
| }}, | ||
| name: "test value=false with a json string", | ||
| args: `{"%s": "randomValue"}`, | ||
| want: false, | ||
| wantErr: true, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| got, err := isUnsupportedUnsafeEtcd(tt.args.spec) | ||
| if (err != nil) != tt.wantErr { | ||
| t.Errorf("IsUnsupportedUnsafeEtcd() error = %v, wantErr %v", err, tt.wantErr) | ||
| return | ||
| } | ||
| if got != tt.want { | ||
| t.Errorf("IsUnsupportedUnsafeEtcd() got = %v, want %v", got, tt.want) | ||
| } | ||
| }) | ||
|
|
||
| for _, option := range options { | ||
| for _, tt := range tests { | ||
| t.Run(fmt.Sprintf("%s/%s", option, tt.name), func(t *testing.T) { | ||
| spec := &operatorv1.StaticPodOperatorSpec{ | ||
| OperatorSpec: operatorv1.OperatorSpec{ | ||
| UnsupportedConfigOverrides: runtime.RawExtension{ | ||
| Raw: []byte(fmt.Sprintf(tt.args, option)), | ||
| }, | ||
| }, | ||
| } | ||
| got, err := tryGetUnsupportedValue(spec, option) | ||
| require.Equal(t, tt.wantErr, err != nil) | ||
| require.Equal(t, tt.want, got) | ||
| }) | ||
| } | ||
| } | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.