From e0b5c3a146706336f2b1fa00efd612031a09fbac Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Thu, 27 Aug 2020 17:18:48 -0700 Subject: [PATCH] Fix an assumption about GKE in an integration test --- test/integration/credentialissuerconfig_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/integration/credentialissuerconfig_test.go b/test/integration/credentialissuerconfig_test.go index 2642d1dc..4b053786 100644 --- a/test/integration/credentialissuerconfig_test.go +++ b/test/integration/credentialissuerconfig_test.go @@ -38,9 +38,7 @@ func TestCredentialIssuerConfig(t *testing.T) { require.NoError(t, err) require.Len(t, actualConfigList.Items, 1) - // Verify the published kube config info. actualStatusKubeConfigInfo := actualConfigList.Items[0].Status.KubeConfigInfo - require.Equal(t, expectedStatusKubeConfigInfo(config), actualStatusKubeConfigInfo) // Verify the cluster strategy status based on what's expected of the test cluster's ability to share signing keys. actualStatusStrategies := actualConfigList.Items[0].Status.Strategies @@ -52,10 +50,16 @@ func TestCredentialIssuerConfig(t *testing.T) { require.Equal(t, crdpinnipedv1alpha1.SuccessStrategyStatus, actualStatusStrategy.Status) require.Equal(t, crdpinnipedv1alpha1.FetchedKeyStrategyReason, actualStatusStrategy.Reason) require.Equal(t, "Key was fetched successfully", actualStatusStrategy.Message) + // Verify the published kube config info. + require.Equal(t, expectedStatusKubeConfigInfo(config), actualStatusKubeConfigInfo) } else { require.Equal(t, crdpinnipedv1alpha1.ErrorStrategyStatus, actualStatusStrategy.Status) require.Equal(t, crdpinnipedv1alpha1.CouldNotFetchKeyStrategyReason, actualStatusStrategy.Reason) require.Contains(t, actualStatusStrategy.Message, "some part of the error message") + // For now, don't verify the kube config info because its not available on GKE. We'll need to address + // this somehow once we starting supporting those cluster types. + // Require `nil` to remind us to address this later for other types of clusters where it is available. + require.Nil(t, actualStatusKubeConfigInfo) } require.WithinDuration(t, time.Now(), actualStatusStrategy.LastUpdateTime.Local(), 10*time.Minute)