Merge branch 'master' into pgmigration-3.13

quay · Oct 10, 2024 · 29a9a60 · 29a9a60
2 parents b0edc1f + 02508d9
commit 29a9a60
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -87,7 +87,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.2.1
-CONTROLLER_TOOLS_VERSION ?= v0.13.0
+CONTROLLER_TOOLS_VERSION ?= v0.16.3
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.

diff --git a/bundle/manifests/quayregistries.crd.yaml b/bundle/manifests/quayregistries.crd.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: quayregistries.quay.redhat.com
 spec:
   group: quay.redhat.com
@@ -871,7 +871,6 @@ spec:
                                         description: |-
                                           Name of the referent.
                                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion, kind, uid?
                                         type: string
                                       optional:
                                         description: Specify whether the ConfigMap
@@ -934,7 +933,6 @@ spec:
                                         description: |-
                                           Name of the referent.
                                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion, kind, uid?
                                         type: string
                                       optional:
                                         description: Specify whether the Secret or

diff --git a/config/crd/bases/quay.redhat.com_quayregistries.yaml b/config/crd/bases/quay.redhat.com_quayregistries.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: quayregistries.quay.redhat.com
 spec:
   group: quay.redhat.com
@@ -871,7 +871,6 @@ spec:
                                         description: |-
                                           Name of the referent.
                                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion, kind, uid?
                                         type: string
                                       optional:
                                         description: Specify whether the ConfigMap
@@ -934,7 +933,6 @@ spec:
                                         description: |-
                                           Name of the referent.
                                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion, kind, uid?
                                         type: string
                                       optional:
                                         description: Specify whether the Secret or

diff --git a/controllers/quay/features.go b/controllers/quay/features.go
@@ -344,8 +344,7 @@ func (r *QuayRegistryReconciler) checkObjectBucketClaimsAvailable(
 		return nil
 	}
 
-	r.Log.Info("`ObjectBucketClaim` not found")
-	return nil
+	return fmt.Errorf("`ObjectBucketClaim` not found")
 }
 
 // checkBuildManagerAvailable verifies if the config bundle contains an entry pointing to the

diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/clair-pg-scale-up.patch.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/clair-pg-scale-up.patch.yaml
@@ -0,0 +1,6 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: clair-app
+spec:
+  replicas: 2
diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml
@@ -0,0 +1,6 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: clair-postgres
+spec:
+  replicas: 2
diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml
@@ -3,4 +3,4 @@ kind: Component
 patchesStrategicMerge:
   - ./clair.deployment.patch.yaml
 components:
-  - "../base"
+  - "../base"