djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix expected CIC status message on non-hosted control planes

Browse Source
This commit is contained in:
Andrew Keesler 2020-09-24 17:56:55 -04:00
parent 9e0195e024
commit b21b43c654
No known key found for this signature in database
GPG Key ID: 27CE0444346F9413
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/controller/kubecertagent/creater.go
View File

@ -97,7 +97,7 @@ func (c *createrController) Sync(ctx controllerlib.Context) error {
*c.credentialIssuerConfigLocationConfig, *c.credentialIssuerConfigLocationConfig,
c.clock, c.clock,
c.pinnipedAPIClient, c.pinnipedAPIClient,
constable.Error("Controller manager pod(s) could not be found"), constable.Error("did not find kube-controller-manager pod(s)"),
) )
} }

4
internal/controller/kubecertagent/creater_test.go
View File

@ -431,7 +431,7 @@ func TestCreaterControllerSync(t *testing.T) {
Type: configv1alpha1.KubeClusterSigningCertificateStrategyType, Type: configv1alpha1.KubeClusterSigningCertificateStrategyType,
Status: configv1alpha1.ErrorStrategyStatus, Status: configv1alpha1.ErrorStrategyStatus,
Reason: configv1alpha1.CouldNotFetchKeyStrategyReason, Reason: configv1alpha1.CouldNotFetchKeyStrategyReason,
Message: "Controller manager pod(s) could not be found", Message: "did not find kube-controller-manager pod(s)",
LastUpdateTime: metav1.NewTime(frozenNow), LastUpdateTime: metav1.NewTime(frozenNow),
}, },
} }
@ -509,7 +509,7 @@ func TestCreaterControllerSync(t *testing.T) {
Type: configv1alpha1.KubeClusterSigningCertificateStrategyType, Type: configv1alpha1.KubeClusterSigningCertificateStrategyType,
Status: configv1alpha1.ErrorStrategyStatus, Status: configv1alpha1.ErrorStrategyStatus,
Reason: configv1alpha1.CouldNotFetchKeyStrategyReason, Reason: configv1alpha1.CouldNotFetchKeyStrategyReason,
Message: "Controller manager pod(s) could not be found", Message: "did not find kube-controller-manager pod(s)",
LastUpdateTime: metav1.NewTime(frozenNow), LastUpdateTime: metav1.NewTime(frozenNow),
}, },
}, },

2
test/integration/credentialissuerconfig_test.go
View File

@ -59,7 +59,7 @@ func TestCredentialIssuerConfig(t *testing.T) {
} else { } else {
require.Equal(t, configv1alpha1.ErrorStrategyStatus, actualStatusStrategy.Status) require.Equal(t, configv1alpha1.ErrorStrategyStatus, actualStatusStrategy.Status)
require.Equal(t, configv1alpha1.CouldNotFetchKeyStrategyReason, actualStatusStrategy.Reason) require.Equal(t, configv1alpha1.CouldNotFetchKeyStrategyReason, actualStatusStrategy.Reason)
require.Contains(t, actualStatusStrategy.Message, "did not find kube-controller-manager pod") require.Contains(t, actualStatusStrategy.Message, "did not find kube-controller-manager pod(s)")
// For now, don't verify the kube config info because its not available on GKE. We'll need to address // 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. // 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` to remind us to address this later for other types of clusters where it is available.