-
Notifications
You must be signed in to change notification settings - Fork 364
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix antctl ClusterSet output when status is empty (#4174)
After a ClusterSet is just created in the leader cluster, it might have no status yet, then `antctl mc get clustersets -A` will skip print the ClusterSet when its status is empty. Fix it by passing an empty status and condition. Signed-off-by: Lan Luo <[email protected]>
- Loading branch information
1 parent
4a378d5
commit 53bb0c3
Showing
7 changed files
with
295 additions
and
56 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| // Copyright 2022 Antrea Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package get | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| v1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "sigs.k8s.io/controller-runtime/pkg/client/fake" | ||
|
|
||
| mcsv1alpha1 "antrea.io/antrea/multicluster/apis/multicluster/v1alpha1" | ||
| mcscheme "antrea.io/antrea/pkg/antctl/raw/multicluster/scheme" | ||
| ) | ||
|
|
||
| func TestGetClusterSet(t *testing.T) { | ||
| clusterSetList := &mcsv1alpha1.ClusterSetList{ | ||
| Items: []mcsv1alpha1.ClusterSet{ | ||
| { | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "default", | ||
| Name: "clusterset-name", | ||
| }, | ||
| Status: mcsv1alpha1.ClusterSetStatus{}, | ||
| }, | ||
| }, | ||
| } | ||
| tests := []struct { | ||
| name string | ||
| existingClusterSets *mcsv1alpha1.ClusterSetList | ||
| args []string | ||
| output string | ||
| allNamespaces bool | ||
| donotFake bool | ||
| expectedErr string | ||
| expectedOutput string | ||
| }{ | ||
| { | ||
| name: "get single ClusterSet", | ||
| existingClusterSets: clusterSetList, | ||
| args: []string{"clusterset-name"}, | ||
| expectedOutput: "CLUSTER-ID NAMESPACE CLUSTER-SET-ID TYPE STATUS REASON\n<NONE> default clusterset-name <NONE> <NONE> <NONE>\n", | ||
| }, | ||
| { | ||
| name: "get single ClusterSet with json output", | ||
| existingClusterSets: clusterSetList, | ||
| args: []string{"clusterset-name"}, | ||
| output: "json", | ||
| expectedOutput: "[\n {\n \"kind\": \"ClusterSet\",\n \"apiVersion\": \"multicluster.crd.antrea.io/v1alpha1\",\n \"metadata\": {\n \"name\": \"clusterset-name\",\n \"namespace\": \"default\",\n \"resourceVersion\": \"999\",\n \"creationTimestamp\": null\n },\n \"spec\": {\n \"leaders\": null\n },\n \"status\": {}\n }\n]\n", | ||
| }, | ||
| { | ||
| name: "get single ClusterSet with yaml output", | ||
| existingClusterSets: clusterSetList, | ||
| args: []string{"clusterset-name"}, | ||
| output: "yaml", | ||
| expectedOutput: "- apiVersion: multicluster.crd.antrea.io/v1alpha1\n kind: ClusterSet\n metadata:\n creationTimestamp: null\n name: clusterset-name\n namespace: default\n resourceVersion: \"999\"\n spec:\n leaders: null\n status: {}\n", | ||
| }, | ||
| { | ||
| name: "get non-existing ClusterSet", | ||
| args: []string{"clusterset1"}, | ||
| expectedErr: "clustersets.multicluster.crd.antrea.io \"clusterset1\" not found", | ||
| }, | ||
| { | ||
| name: "get all ClusterSets", | ||
| allNamespaces: true, | ||
| existingClusterSets: &mcsv1alpha1.ClusterSetList{ | ||
| Items: []mcsv1alpha1.ClusterSet{ | ||
| { | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "default", | ||
| Name: "clusterset-name", | ||
| }, | ||
| Status: mcsv1alpha1.ClusterSetStatus{}, | ||
| }, | ||
| { | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "kube-system", | ||
| Name: "clusterset-1", | ||
| }, | ||
| Status: mcsv1alpha1.ClusterSetStatus{ | ||
| ClusterStatuses: []mcsv1alpha1.ClusterStatus{{ | ||
| ClusterID: "cluster-a", | ||
| Conditions: []mcsv1alpha1.ClusterCondition{ | ||
| { | ||
| Message: "Member Connected", | ||
| Reason: "Connected", | ||
| Status: v1.ConditionTrue, | ||
| Type: mcsv1alpha1.ClusterReady, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| expectedOutput: "CLUSTER-ID NAMESPACE CLUSTER-SET-ID TYPE STATUS REASON \n<NONE> default clusterset-name <NONE> <NONE> <NONE> \ncluster-a kube-system clusterset-1 Ready True Connected\n", | ||
| }, | ||
| { | ||
| name: "get all ClusterSets but empty result", | ||
| allNamespaces: true, | ||
| expectedOutput: "No resources found\n", | ||
| }, | ||
| { | ||
| name: "get all ClusterSets but empty result in default Namespace", | ||
| expectedOutput: "No resource found in Namespace default\n", | ||
| }, | ||
| { | ||
| name: "error due to no kubeconfig", | ||
| expectedErr: "flag accessed but not defined: kubeconfig", | ||
| donotFake: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| cmd := NewClusterSetCommand() | ||
| buf := new(bytes.Buffer) | ||
| cmd.SetOutput(buf) | ||
| cmd.SetOut(buf) | ||
| cmd.SetErr(buf) | ||
| cmd.SetArgs(tt.args) | ||
|
|
||
| fakeClient := fake.NewClientBuilder().WithScheme(mcscheme.Scheme).Build() | ||
| if tt.existingClusterSets != nil { | ||
| fakeClient = fake.NewClientBuilder().WithScheme(mcscheme.Scheme).WithLists(tt.existingClusterSets).Build() | ||
| } | ||
| if !tt.donotFake { | ||
| optionsClusterSet.k8sClient = fakeClient | ||
| } | ||
|
|
||
| if tt.allNamespaces { | ||
| optionsClusterSet.allNamespaces = true | ||
| } | ||
| if tt.output != "" { | ||
| optionsClusterSet.outputFormat = tt.output | ||
| } | ||
| err := cmd.Execute() | ||
| if err != nil { | ||
| assert.Equal(t, tt.expectedErr, err.Error()) | ||
| } else { | ||
| assert.Equal(t, tt.expectedOutput, buf.String()) | ||
| } | ||
| }) | ||
| } | ||
| } |
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.