hpa: Only deploy clair HPA when HPA component is managed (PROJQUAY-2435…

…) (#520) - Clair HPA is only deployed when HPA component is managed
quay · Oct 28, 2021 · a2d08d8 · a2d08d8
1 parent 283983e
commit a2d08d8
Show file tree

Hide file tree

Showing 9 changed files with 130 additions and 23 deletions.
diff --git a/kustomize/components/clair/kustomization.yaml b/kustomize/components/clair/kustomization.yaml
@@ -5,7 +5,6 @@ resources:
   - ./clair.serviceaccount.yaml
   - ./postgres.serviceaccount.yaml
   - ./clair.deployment.yaml
-  - ./clair.horizontalpodautoscaler.yaml
   - ./clair.service.yaml
   - ./postgres.persistentvolumeclaim.yaml
   - ./postgres.deployment.yaml

diff --git a/.../clair/clair.horizontalpodautoscaler.yaml → ...scaler/clair.horizontalpodautoscaler.yaml b/.../clair/clair.horizontalpodautoscaler.yaml → ...scaler/clair.horizontalpodautoscaler.yaml
diff --git a/kustomize/components/horizontalpodautoscaler/kustomization.yaml b/kustomize/components/horizontalpodautoscaler/kustomization.yaml
@@ -3,3 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 resources: 
   - ./quay.horizontalpodautoscalar.yaml
+  - ./clair.horizontalpodautoscaler.yaml
+  - ./mirror.horizontalpodautoscaler.yaml
+
diff --git a/...irror/mirror.horizontalpodautoscaler.yaml → ...caler/mirror.horizontalpodautoscaler.yaml b/...irror/mirror.horizontalpodautoscaler.yaml → ...caler/mirror.horizontalpodautoscaler.yaml
diff --git a/kustomize/components/mirror/kustomization.yaml b/kustomize/components/mirror/kustomization.yaml
@@ -3,7 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 resources: 
   - ./mirror.deployment.yaml
-  - ./mirror.horizontalpodautoscaler.yaml
 vars:
   - name: QUAY_APP_SERVICE_HOST
     objref:

diff --git a/pkg/cmpstatus/evaluator_test.go b/pkg/cmpstatus/evaluator_test.go
@@ -226,6 +226,32 @@ func TestEvaluate(t *testing.T) {
 						},
 					},
 				},
+				&asv2b2.HorizontalPodAutoscaler{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "registry-quay-mirror",
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								Kind:       "QuayRegistry",
+								Name:       "registry",
+								APIVersion: "quay.redhat.com/v1",
+								UID:        "uid",
+							},
+						},
+					},
+				},
+				&asv2b2.HorizontalPodAutoscaler{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "registry-clair-app",
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								Kind:       "QuayRegistry",
+								Name:       "registry",
+								APIVersion: "quay.redhat.com/v1",
+								UID:        "uid",
+							},
+						},
+					},
+				},
 				&monv1.PrometheusRule{
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "registry-quay-prometheus-rules",
@@ -511,6 +537,32 @@ func TestEvaluate(t *testing.T) {
 						},
 					},
 				},
+				&asv2b2.HorizontalPodAutoscaler{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "registry-quay-mirror",
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								Kind:       "QuayRegistry",
+								Name:       "registry",
+								APIVersion: "quay.redhat.com/v1",
+								UID:        "uid",
+							},
+						},
+					},
+				},
+				&asv2b2.HorizontalPodAutoscaler{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "registry-clair-app",
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								Kind:       "QuayRegistry",
+								Name:       "registry",
+								APIVersion: "quay.redhat.com/v1",
+								UID:        "uid",
+							},
+						},
+					},
+				},
 				&monv1.PrometheusRule{
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "registry-quay-prometheus-rules",
@@ -840,6 +892,32 @@ func TestEvaluate(t *testing.T) {
 						},
 					},
 				},
+				&asv2b2.HorizontalPodAutoscaler{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "registry-quay-mirror",
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								Kind:       "QuayRegistry",
+								Name:       "registry",
+								APIVersion: "quay.redhat.com/v1",
+								UID:        "uid",
+							},
+						},
+					},
+				},
+				&asv2b2.HorizontalPodAutoscaler{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "registry-clair-app",
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								Kind:       "QuayRegistry",
+								Name:       "registry",
+								APIVersion: "quay.redhat.com/v1",
+								UID:        "uid",
+							},
+						},
+					},
+				},
 				&monv1.PrometheusRule{
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "registry-quay-prometheus-rules",

diff --git a/pkg/cmpstatus/hpa.go b/pkg/cmpstatus/hpa.go
@@ -39,33 +39,35 @@ func (h *HPA) Check(ctx context.Context, reg qv1.QuayRegistry) (qv1.Condition, e
 		}, nil
 	}
 
-	nsn := types.NamespacedName{
-		Namespace: reg.Namespace,
-		Name:      fmt.Sprintf("%s-quay-app", reg.Name),
-	}
+	for _, hpasuffix := range []string{"quay-app", "clair-app", "quay-mirror"} {
+		nsn := types.NamespacedName{
+			Namespace: reg.Namespace,
+			Name:      fmt.Sprintf("%s-%s", reg.Name, hpasuffix),
+		}
 
-	var hpa asv2b2.HorizontalPodAutoscaler
-	if err := h.Client.Get(ctx, nsn, &hpa); err != nil {
-		if errors.IsNotFound(err) {
+		var hpa asv2b2.HorizontalPodAutoscaler
+		if err := h.Client.Get(ctx, nsn, &hpa); err != nil {
+			if errors.IsNotFound(err) {
+				return qv1.Condition{
+					Type:           qv1.ComponentHPAReady,
+					Status:         metav1.ConditionFalse,
+					Reason:         qv1.ConditionReasonComponentNotReady,
+					Message:        "Horizontal pod autoscaler not found",
+					LastUpdateTime: metav1.NewTime(time.Now()),
+				}, nil
+			}
+			return zero, err
+		}
+
+		if !qv1.Owns(reg, &hpa) {
 			return qv1.Condition{
 				Type:           qv1.ComponentHPAReady,
 				Status:         metav1.ConditionFalse,
 				Reason:         qv1.ConditionReasonComponentNotReady,
-				Message:        "Horizontal pod autoscaler not found",
+				Message:        "Horizontal pod autoscaler not owned by QuayRegistry",
 				LastUpdateTime: metav1.NewTime(time.Now()),
 			}, nil
 		}
-		return zero, err
-	}
-
-	if !qv1.Owns(reg, &hpa) {
-		return qv1.Condition{
-			Type:           qv1.ComponentHPAReady,
-			Status:         metav1.ConditionFalse,
-			Reason:         qv1.ConditionReasonComponentNotReady,
-			Message:        "Horizontal pod autoscaler not owned by QuayRegistry",
-			LastUpdateTime: metav1.NewTime(time.Now()),
-		}, nil
 	}
 
 	return qv1.Condition{

diff --git a/pkg/cmpstatus/hpa_test.go b/pkg/cmpstatus/hpa_test.go
@@ -131,6 +131,32 @@ func TestHPACheck(t *testing.T) {
 						},
 					},
 				},
+				&asv2b2.HorizontalPodAutoscaler{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "registry-quay-mirror",
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								Kind:       "QuayRegistry",
+								Name:       "registry",
+								APIVersion: "quay.redhat.com/v1",
+								UID:        "uid",
+							},
+						},
+					},
+				},
+				&asv2b2.HorizontalPodAutoscaler{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "registry-clair-app",
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								Kind:       "QuayRegistry",
+								Name:       "registry",
+								APIVersion: "quay.redhat.com/v1",
+								UID:        "uid",
+							},
+						},
+					},
+				},
 			},
 			cond: qv1.Condition{
 				Type:    qv1.ComponentHPAReady,

diff --git a/pkg/kustomize/kustomize_test.go b/pkg/kustomize/kustomize_test.go
@@ -254,7 +254,6 @@ var quayComponents = map[string][]client.Object{
 		&corev1.Secret{ObjectMeta: metav1.ObjectMeta{Name: "clair-config-secret"}},
 		&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "clair-app"}},
 		&corev1.Service{ObjectMeta: metav1.ObjectMeta{Name: "clair-app"}},
-		&autoscaling.HorizontalPodAutoscaler{ObjectMeta: metav1.ObjectMeta{Name: "clair-app"}},
 		&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "clair-postgres"}},
 		&corev1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{Name: "clair-postgres"}},
 		&corev1.Service{ObjectMeta: metav1.ObjectMeta{Name: "clair-postgres"}},
@@ -283,10 +282,11 @@ var quayComponents = map[string][]client.Object{
 	},
 	"mirror": {
 		&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "quay-mirror"}},
-		&autoscaling.HorizontalPodAutoscaler{ObjectMeta: metav1.ObjectMeta{Name: "quay-mirror"}},
 	},
 	"horizontalpodautoscaler": {
 		&autoscaling.HorizontalPodAutoscaler{ObjectMeta: metav1.ObjectMeta{Name: "quay-app"}},
+		&autoscaling.HorizontalPodAutoscaler{ObjectMeta: metav1.ObjectMeta{Name: "quay-mirror"}},
+		&autoscaling.HorizontalPodAutoscaler{ObjectMeta: metav1.ObjectMeta{Name: "clair-app"}},
 	},
 }