Skip to content

DNM: UT for DNS preventing new Provision #2249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
2uasimojo wants to merge 1 commit into from
Closed

DNM: UT for DNS preventing new Provision #2249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 68 additions & 4 deletions pkg/controller/clusterdeployment/clusterdeployment_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,6 +1380,47 @@ platform:
Reason: "DNSZoneFailedToReconcile",
},
})
provisions := getProvisions(c)
assert.Empty(t, provisions, "provision should not exist")
},
},
{
name: "No-op when DNSZone cannot be created due to credentials missing permissions",
existing: []runtime.Object{
func() *hivev1.ClusterDeployment {
cd := testClusterDeploymentWithInitializedConditions(testClusterDeployment())
cd.Spec.ManageDNS = true
return cd
}(),
testSecret(corev1.SecretTypeDockerConfigJson, pullSecretSecret, corev1.DockerConfigJsonKey, "{}"),
testSecret(corev1.SecretTypeDockerConfigJson, constants.GetMergedPullSecretName(testClusterDeployment()), corev1.DockerConfigJsonKey, "{}"),
testDNSZoneWithInvalidCredentialsCondition(),
},
expectExplicitRequeue: true,
validate: func(c client.Client, t *testing.T) {
cd := getCD(c)
testassert.AssertConditions(t, cd, []hivev1.ClusterDeploymentCondition{
// Insufficient credentials
{
Type: hivev1.DNSNotReadyCondition,
Status: corev1.ConditionTrue,
Reason: "InsufficientCredentials",
},
// Provision stopped
{
Type: hivev1.ProvisionedCondition,
Status: corev1.ConditionFalse,
Reason: hivev1.ProvisionedReasonProvisionStopped,
},
// Not provisioned
{
Type: hivev1.ProvisionStoppedCondition,
Status: corev1.ConditionTrue,
Reason: "DNSZoneFailedToReconcile",
},
})
provisions := getProvisions(c)
assert.Empty(t, provisions, "provision should not exist")
},
},
{
Expand Down Expand Up @@ -2649,12 +2690,31 @@ platform:
testInstallConfigSecretAWS(),
func() runtime.Object {
cd := testClusterDeploymentWithInitializedConditions(testClusterDeployment())
cd.Status.Conditions = append(cd.Status.Conditions, hivev1.ClusterDeploymentCondition{
Type: hivev1.ProvisionStoppedCondition,
Status: corev1.ConditionTrue,
})
cd.Status.Conditions = controllerutils.SetClusterDeploymentCondition(
cd.Status.Conditions,
hivev1.ProvisionStoppedCondition,
corev1.ConditionTrue,
"DNSZoneFailedToReconcile",
"DNSZone failed to reconcile (see the DNSNotReadyCondition condition for details)",
controllerutils.UpdateConditionAlways)
cd.Status.Conditions = controllerutils.SetClusterDeploymentCondition(
cd.Status.Conditions,
hivev1.ProvisionedCondition,
corev1.ConditionFalse,
hivev1.ProvisionedReasonProvisionStopped,
"Provisioning failed terminally (see the ProvisionStopped condition for details)",
controllerutils.UpdateConditionAlways)
cd.Status.Conditions = controllerutils.SetClusterDeploymentCondition(
cd.Status.Conditions,
hivev1.DNSNotReadyCondition,
corev1.ConditionTrue,
"InsufficientCredentials",
"",
controllerutils.UpdateConditionAlways)
cd.Spec.ManageDNS = true
return cd
}(),
testDNSZoneWithInvalidCredentialsCondition(),
testSecret(corev1.SecretTypeDockerConfigJson, pullSecretSecret, corev1.DockerConfigJsonKey, "{}"),
testSecret(corev1.SecretTypeDockerConfigJson, constants.GetMergedPullSecretName(testClusterDeployment()), corev1.DockerConfigJsonKey, "{}"),
},
Expand All @@ -2665,8 +2725,12 @@ platform:
{
Type: hivev1.ProvisionStoppedCondition,
Status: corev1.ConditionTrue,
Reason: "DNSZoneFailedToReconcile",
Message: "DNSZone failed to reconcile (see the DNSNotReadyCondition condition for details)",
},
})
provisions := getProvisions(c)
assert.Empty(t, provisions, "provision should not exist")
},
},
{
Expand Down