fix nil pointer dereference
When the Secret referenced in an OCI HelmRepository doesn't contain a username and password, the controller doesn't panic, anymore. Signed-off-by: Max Jonas Werner <mail@makk.es>
This commit is contained in:
Max Jonas Werner
parent
a9012330d1
commit
1070d1287a
|
|
@ -284,7 +284,9 @@ func (r *HelmRepositoryOCIReconciler) reconcileSource(ctx context.Context, obj *
|
||||||
return sreconcile.ResultEmpty, e
|
return sreconcile.ResultEmpty, e
|
||||||
}
|
}
|
||||||
|
|
||||||
logOpts = append(logOpts, logOpt)
|
if logOpt != nil {
|
||||||
|
logOpts = append(logOpts, logOpt)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if result, err := r.validateSource(ctx, obj, logOpts...); err != nil || result == sreconcile.ResultEmpty {
|
if result, err := r.validateSource(ctx, obj, logOpts...); err != nil || result == sreconcile.ResultEmpty {
|
||||||
|
|
|
||||||
|
|
@ -34,99 +34,116 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestHelmRepositoryOCIReconciler_Reconcile(t *testing.T) {
|
func TestHelmRepositoryOCIReconciler_Reconcile(t *testing.T) {
|
||||||
g := NewWithT(t)
|
tests := []struct {
|
||||||
|
name string
|
||||||
ns, err := testEnv.CreateNamespace(ctx, "helmrepository-oci-reconcile-test")
|
secretData map[string][]byte
|
||||||
g.Expect(err).ToNot(HaveOccurred())
|
}{
|
||||||
defer func() { g.Expect(testEnv.Delete(ctx, ns)).To(Succeed()) }()
|
{
|
||||||
|
name: "valid auth data",
|
||||||
secret := &corev1.Secret{
|
secretData: map[string][]byte{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
"username": []byte(testUsername),
|
||||||
GenerateName: "helmrepository-",
|
"password": []byte(testPassword),
|
||||||
Namespace: ns.Name,
|
|
||||||
},
|
|
||||||
Data: map[string][]byte{
|
|
||||||
"username": []byte(testUsername),
|
|
||||||
"password": []byte(testPassword),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
g.Expect(testEnv.CreateAndWait(ctx, secret)).To(Succeed())
|
|
||||||
|
|
||||||
obj := &sourcev1.HelmRepository{
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
|
||||||
GenerateName: "helmrepository-oci-reconcile-",
|
|
||||||
Namespace: ns.Name,
|
|
||||||
},
|
|
||||||
Spec: sourcev1.HelmRepositorySpec{
|
|
||||||
Interval: metav1.Duration{Duration: interval},
|
|
||||||
URL: fmt.Sprintf("oci://%s", testRegistryserver.DockerRegistryHost),
|
|
||||||
SecretRef: &meta.LocalObjectReference{
|
|
||||||
Name: secret.Name,
|
|
||||||
},
|
},
|
||||||
Type: sourcev1.HelmRepositoryTypeOCI,
|
},
|
||||||
|
{
|
||||||
|
name: "no auth data",
|
||||||
|
secretData: nil,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
g.Expect(testEnv.Create(ctx, obj)).To(Succeed())
|
|
||||||
|
|
||||||
key := client.ObjectKey{Name: obj.Name, Namespace: obj.Namespace}
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
g := NewWithT(t)
|
||||||
|
|
||||||
// Wait for finalizer to be set
|
ns, err := testEnv.CreateNamespace(ctx, "helmrepository-oci-reconcile-test")
|
||||||
g.Eventually(func() bool {
|
g.Expect(err).ToNot(HaveOccurred())
|
||||||
if err := testEnv.Get(ctx, key, obj); err != nil {
|
defer func() { g.Expect(testEnv.Delete(ctx, ns)).To(Succeed()) }()
|
||||||
return false
|
|
||||||
}
|
|
||||||
return len(obj.Finalizers) > 0
|
|
||||||
}, timeout).Should(BeTrue())
|
|
||||||
|
|
||||||
// Wait for HelmRepository to be Ready
|
secret := &corev1.Secret{
|
||||||
g.Eventually(func() bool {
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
if err := testEnv.Get(ctx, key, obj); err != nil {
|
GenerateName: "helmrepository-",
|
||||||
return false
|
Namespace: ns.Name,
|
||||||
}
|
},
|
||||||
if !conditions.IsReady(obj) {
|
Data: tt.secretData,
|
||||||
return false
|
}
|
||||||
}
|
|
||||||
readyCondition := conditions.Get(obj, meta.ReadyCondition)
|
|
||||||
return obj.Generation == readyCondition.ObservedGeneration &&
|
|
||||||
obj.Generation == obj.Status.ObservedGeneration
|
|
||||||
}, timeout).Should(BeTrue())
|
|
||||||
|
|
||||||
// Check if the object status is valid.
|
g.Expect(testEnv.CreateAndWait(ctx, secret)).To(Succeed())
|
||||||
condns := &status.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
|
|
||||||
checker := status.NewChecker(testEnv.Client, condns)
|
|
||||||
checker.CheckErr(ctx, obj)
|
|
||||||
|
|
||||||
// kstatus client conformance check.
|
obj := &sourcev1.HelmRepository{
|
||||||
u, err := patch.ToUnstructured(obj)
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
g.Expect(err).ToNot(HaveOccurred())
|
GenerateName: "helmrepository-oci-reconcile-",
|
||||||
res, err := kstatus.Compute(u)
|
Namespace: ns.Name,
|
||||||
g.Expect(err).ToNot(HaveOccurred())
|
},
|
||||||
g.Expect(res.Status).To(Equal(kstatus.CurrentStatus))
|
Spec: sourcev1.HelmRepositorySpec{
|
||||||
|
Interval: metav1.Duration{Duration: interval},
|
||||||
|
URL: fmt.Sprintf("oci://%s", testRegistryserver.DockerRegistryHost),
|
||||||
|
SecretRef: &meta.LocalObjectReference{
|
||||||
|
Name: secret.Name,
|
||||||
|
},
|
||||||
|
Type: sourcev1.HelmRepositoryTypeOCI,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
g.Expect(testEnv.Create(ctx, obj)).To(Succeed())
|
||||||
|
|
||||||
// Patch the object with reconcile request annotation.
|
key := client.ObjectKey{Name: obj.Name, Namespace: obj.Namespace}
|
||||||
patchHelper, err := patch.NewHelper(obj, testEnv.Client)
|
|
||||||
g.Expect(err).ToNot(HaveOccurred())
|
// Wait for finalizer to be set
|
||||||
annotations := map[string]string{
|
g.Eventually(func() bool {
|
||||||
meta.ReconcileRequestAnnotation: "now",
|
if err := testEnv.Get(ctx, key, obj); err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return len(obj.Finalizers) > 0
|
||||||
|
}, timeout).Should(BeTrue())
|
||||||
|
|
||||||
|
// Wait for HelmRepository to be Ready
|
||||||
|
g.Eventually(func() bool {
|
||||||
|
if err := testEnv.Get(ctx, key, obj); err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if !conditions.IsReady(obj) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
readyCondition := conditions.Get(obj, meta.ReadyCondition)
|
||||||
|
return obj.Generation == readyCondition.ObservedGeneration &&
|
||||||
|
obj.Generation == obj.Status.ObservedGeneration
|
||||||
|
}, timeout).Should(BeTrue())
|
||||||
|
|
||||||
|
// Check if the object status is valid.
|
||||||
|
condns := &status.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
|
||||||
|
checker := status.NewChecker(testEnv.Client, condns)
|
||||||
|
checker.CheckErr(ctx, obj)
|
||||||
|
|
||||||
|
// kstatus client conformance check.
|
||||||
|
u, err := patch.ToUnstructured(obj)
|
||||||
|
g.Expect(err).ToNot(HaveOccurred())
|
||||||
|
res, err := kstatus.Compute(u)
|
||||||
|
g.Expect(err).ToNot(HaveOccurred())
|
||||||
|
g.Expect(res.Status).To(Equal(kstatus.CurrentStatus))
|
||||||
|
|
||||||
|
// Patch the object with reconcile request annotation.
|
||||||
|
patchHelper, err := patch.NewHelper(obj, testEnv.Client)
|
||||||
|
g.Expect(err).ToNot(HaveOccurred())
|
||||||
|
annotations := map[string]string{
|
||||||
|
meta.ReconcileRequestAnnotation: "now",
|
||||||
|
}
|
||||||
|
obj.SetAnnotations(annotations)
|
||||||
|
g.Expect(patchHelper.Patch(ctx, obj)).ToNot(HaveOccurred())
|
||||||
|
g.Eventually(func() bool {
|
||||||
|
if err := testEnv.Get(ctx, key, obj); err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return obj.Status.LastHandledReconcileAt == "now"
|
||||||
|
}, timeout).Should(BeTrue())
|
||||||
|
|
||||||
|
g.Expect(testEnv.Delete(ctx, obj)).To(Succeed())
|
||||||
|
|
||||||
|
// Wait for HelmRepository to be deleted
|
||||||
|
g.Eventually(func() bool {
|
||||||
|
if err := testEnv.Get(ctx, key, obj); err != nil {
|
||||||
|
return apierrors.IsNotFound(err)
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}, timeout).Should(BeTrue())
|
||||||
|
})
|
||||||
}
|
}
|
||||||
obj.SetAnnotations(annotations)
|
|
||||||
g.Expect(patchHelper.Patch(ctx, obj)).ToNot(HaveOccurred())
|
|
||||||
g.Eventually(func() bool {
|
|
||||||
if err := testEnv.Get(ctx, key, obj); err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return obj.Status.LastHandledReconcileAt == "now"
|
|
||||||
}, timeout).Should(BeTrue())
|
|
||||||
|
|
||||||
g.Expect(testEnv.Delete(ctx, obj)).To(Succeed())
|
|
||||||
|
|
||||||
// Wait for HelmRepository to be deleted
|
|
||||||
g.Eventually(func() bool {
|
|
||||||
if err := testEnv.Get(ctx, key, obj); err != nil {
|
|
||||||
return apierrors.IsNotFound(err)
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}, timeout).Should(BeTrue())
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue