Skip to content

PROJQUAY-12383: fix(cmpstatus): handle unmanaged component HPAs #1311

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

Open
LiZhang19817 wants to merge 1 commit into
base: master
Choose a base branch
from
+137 −34
Open

PROJQUAY-12383: fix(cmpstatus): handle unmanaged component HPAs #1311

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion pkg/cmpstatus/evaluator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func TestEvaluate(t *testing.T) {
Type: qv1.ComponentHPAReady,
Status: metav1.ConditionFalse,
Reason: qv1.ConditionReasonComponentNotReady,
Message: "Horizontal pod autoscaler not found",
Message: "Horizontal pod autoscaler registry-quay-app not found",
},
{
Type: qv1.ComponentRouteReady,
Expand Down
12 changes: 10 additions & 2 deletions pkg/cmpstatus/hpa.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,15 @@ func (h *HPA) Check(ctx context.Context, reg qv1.QuayRegistry) (qv1.Condition, e
}, nil
}

for _, hpasuffix := range []string{"quay-app", "clair-app", "quay-mirror"} {
hpaSuffixes := []string{"quay-app"}
if qv1.ComponentIsManaged(reg.Spec.Components, qv1.ComponentClair) {
hpaSuffixes = append(hpaSuffixes, "clair-app")
}
if qv1.ComponentIsManaged(reg.Spec.Components, qv1.ComponentMirror) {
hpaSuffixes = append(hpaSuffixes, "quay-mirror")
}

for _, hpasuffix := range hpaSuffixes {
nsn := types.NamespacedName{
Namespace: reg.Namespace,
Name: fmt.Sprintf("%s-%s", reg.Name, hpasuffix),
Expand All @@ -52,7 +60,7 @@ func (h *HPA) Check(ctx context.Context, reg qv1.QuayRegistry) (qv1.Condition, e
Type: qv1.ComponentHPAReady,
Status: metav1.ConditionFalse,
Reason: qv1.ConditionReasonComponentNotReady,
Message: "Horizontal pod autoscaler not found",
Message: fmt.Sprintf("Horizontal pod autoscaler %s not found", nsn.Name),
LastUpdateTime: metav1.NewTime(time.Now()),
}, nil
}
Expand Down
157 changes: 126 additions & 31 deletions pkg/cmpstatus/hpa_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,22 @@ import (
qv1 "github.com/quay/quay-operator/apis/quay/v1"
)

func ownedHPA(name string) *asv2.HorizontalPodAutoscaler {
return &asv2.HorizontalPodAutoscaler{
ObjectMeta: metav1.ObjectMeta{
Name: name,
OwnerReferences: []metav1.OwnerReference{
{
Kind: "QuayRegistry",
Name: "registry",
APIVersion: "quay.redhat.com/v1",
UID: "uid",
},
},
},
}
}

func TestHPACheck(t *testing.T) {
for _, tt := range []struct {
name string
Expand Down Expand Up @@ -66,7 +82,7 @@ func TestHPACheck(t *testing.T) {
Type: qv1.ComponentHPAReady,
Status: metav1.ConditionFalse,
Reason: qv1.ConditionReasonComponentNotReady,
Message: "Horizontal pod autoscaler not found",
Message: "Horizontal pod autoscaler registry-quay-app not found",
},
},
{
Expand Down Expand Up @@ -114,50 +130,129 @@ func TestHPACheck(t *testing.T) {
Kind: qv1.ComponentHPA,
Managed: true,
},
{
Kind: qv1.ComponentClair,
Managed: true,
},
{
Kind: qv1.ComponentMirror,
Managed: true,
},
},
},
},
objs: []client.Object{
&asv2.HorizontalPodAutoscaler{
ObjectMeta: metav1.ObjectMeta{
Name: "registry-quay-app",
OwnerReferences: []metav1.OwnerReference{
{
Kind: "QuayRegistry",
Name: "registry",
APIVersion: "quay.redhat.com/v1",
UID: "uid",
},
ownedHPA("registry-quay-app"),
ownedHPA("registry-quay-mirror"),
ownedHPA("registry-clair-app"),
},
cond: qv1.Condition{
Type: qv1.ComponentHPAReady,
Status: metav1.ConditionTrue,
Reason: qv1.ConditionReasonComponentReady,
Message: "Horizontal pod autoscaler found",
},
},
{
name: "hpa found with clair unmanaged",
quay: qv1.QuayRegistry{
ObjectMeta: metav1.ObjectMeta{
Name: "registry",
UID: "uid",
},
Spec: qv1.QuayRegistrySpec{
ConfigBundleSecret: "config-bundle",
Components: []qv1.Component{
{
Kind: qv1.ComponentHPA,
Managed: true,
},
{
Kind: qv1.ComponentClair,
Managed: false,
},
{
Kind: qv1.ComponentMirror,
Managed: true,
},
},
},
&asv2.HorizontalPodAutoscaler{
ObjectMeta: metav1.ObjectMeta{
Name: "registry-quay-mirror",
OwnerReferences: []metav1.OwnerReference{
{
Kind: "QuayRegistry",
Name: "registry",
APIVersion: "quay.redhat.com/v1",
UID: "uid",
},
},
objs: []client.Object{
ownedHPA("registry-quay-app"),
ownedHPA("registry-quay-mirror"),
},
cond: qv1.Condition{
Type: qv1.ComponentHPAReady,
Status: metav1.ConditionTrue,
Reason: qv1.ConditionReasonComponentReady,
Message: "Horizontal pod autoscaler found",
},
},
{
name: "hpa found with mirror unmanaged",
quay: qv1.QuayRegistry{
ObjectMeta: metav1.ObjectMeta{
Name: "registry",
UID: "uid",
},
Spec: qv1.QuayRegistrySpec{
ConfigBundleSecret: "config-bundle",
Components: []qv1.Component{
{
Kind: qv1.ComponentHPA,
Managed: true,
},
{
Kind: qv1.ComponentClair,
Managed: true,
},
{
Kind: qv1.ComponentMirror,
Managed: false,
},
},
},
&asv2.HorizontalPodAutoscaler{
ObjectMeta: metav1.ObjectMeta{
Name: "registry-clair-app",
OwnerReferences: []metav1.OwnerReference{
{
Kind: "QuayRegistry",
Name: "registry",
APIVersion: "quay.redhat.com/v1",
UID: "uid",
},
},
objs: []client.Object{
ownedHPA("registry-quay-app"),
ownedHPA("registry-clair-app"),
},
cond: qv1.Condition{
Type: qv1.ComponentHPAReady,
Status: metav1.ConditionTrue,
Reason: qv1.ConditionReasonComponentReady,
Message: "Horizontal pod autoscaler found",
},
},
{
name: "hpa found with clair and mirror unmanaged",
quay: qv1.QuayRegistry{
ObjectMeta: metav1.ObjectMeta{
Name: "registry",
UID: "uid",
},
Spec: qv1.QuayRegistrySpec{
ConfigBundleSecret: "config-bundle",
Components: []qv1.Component{
{
Kind: qv1.ComponentHPA,
Managed: true,
},
{
Kind: qv1.ComponentClair,
Managed: false,
},
{
Kind: qv1.ComponentMirror,
Managed: false,
},
},
},
},
objs: []client.Object{
ownedHPA("registry-quay-app"),
},
cond: qv1.Condition{
Type: qv1.ComponentHPAReady,
Status: metav1.ConditionTrue,
Expand Down
Loading