Merge branch 'quay:master' into master

.github/workflows/build-schedule.yaml

@@ -20,7 +20,7 @@ jobs:
         workflow_file_name: build-and-publish.yaml
         ref: ${{ env.BRANCH }}
         wait_interval: 30
-        inputs: |
+        client_payload: |
           {
             "branch": "${{ env.BRANCH }}"
           }
@@ -40,7 +40,7 @@ jobs:
         workflow_file_name: build-and-publish.yaml
         ref: ${{ env.BRANCH }}
         wait_interval: 30
-        inputs: |
+        client_payload: |
           {
             "branch": "${{ env.BRANCH }}"
           }
@@ -60,7 +60,7 @@ jobs:
         workflow_file_name: build-and-publish.yaml
         ref: ${{ env.BRANCH }}
         wait_interval: 30
-        inputs: |
+        client_payload: |
           {
             "branch": "${{ env.BRANCH }}"
           }

.github/workflows/e2e-nightly-ppc64le.yaml

@@ -11,7 +11,7 @@ on:
         description: 'quay-operator-index tag. Defaults to 3.10-unstable'
         required: false
   schedule:
-    - cron: '15 11 * * *'
+    - cron: '0 0 * * 3,5'
 
 jobs:
   deploy:
@@ -74,15 +74,16 @@ jobs:
         run: |
           ./hack/ppc64le/destroy_cluster.sh
 
-      # - name: Notify slack
-      #   if: ${{ always() }}
-      #   uses: rtCamp/action-slack-notify@v2
-      #   env:
-      #     SLACK_CHANNEL: team-quay-bots
-      #     SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-      #     SLACK_COLOR: ${{ job.status }}
-      #     SLACK_TITLE: "${{ github.workflow }}: ${{ job.status }}"
-      #     SLACK_MESSAGE: |
-      #       * **Repo**:     ${{ github.repository }}
-      #       * **Workflow**: ${{ github.workflow }}
-      #       * **Result**:   ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      - name: Notify slack
+        if: ${{ always() }}
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_CHANNEL: team-quay-bots
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_COLOR: ${{ job.status }}
+          SLACK_TITLE: "${{ github.workflow }}: ${{ job.status }}"
+          SLACK_MESSAGE: |
+            * **Repo**: ${{ github.repository }}
+            * **Workflow**: ${{ github.workflow }}
+            * **Result**: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+            * **Contact**: @yshaikh

.github/workflows/pull_request_linting.yaml

@@ -5,32 +5,16 @@ on:
     types: ['opened', 'edited', 'reopened', 'synchronize']
 
 jobs:
-  ticket-check:
-    name: ticket check
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for ticket
-        uses: neofinancial/ticket-check-action@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          ticketLink: 'https://issues.redhat.com/browse/PROJQUAY-%ticketNumber%'
-          ticketPrefix: 'PROJQUAY-'
-          titleRegex: 'PROJQUAY-(?<ticketNumber>\d+)'
-          titleFormat: '%title% (%prefix%%id%)'
-          branchRegex: 'PROJQUAY-(?<ticketNumber>\d+)'
-          bodyRegex: 'PROJQUAY-(?<ticketNumber>\d+)'
-          bodyURLRegex: 'http(s?):\/\/(issues.redhat.com)(\/browse)\/(PROJQUAY\-)(?<ticketNumber>\d+)'
-          exemptUsers: 'dependabot'
-
   conventional-commit:
     runs-on: ubuntu-latest
     name: conventional commit check
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: check conventional commit
         id: check-for-cc
-        uses: agenthunt/conventional-commit-checker-action@v1.0.0
+        uses: agenthunt/conventional-commit-checker-action@v2.0.0
         with:
+          pr-title-regex: '^(?:\[[^\]]+\] )?(?:[a-z]+(?:\([^)]+\))?: .+ \(PROJQUAY-[0-9]+\)|(?:chore|build\(deps\)|build\(deps-dev\)): .+)$'
           pr-body-regex: '(.*)?'

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi8/go-toolset:1.19 as builder
+FROM --platform=$BUILDPLATFORM quay.io/projectquay/golang:1.20 as builder
 
 ARG TARGETOS TARGETARCH
 WORKDIR /workspace

apis/quay/v1/quayregistry_types_test.go

@@ -8,7 +8,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	quaycontext "github.com/quay/quay-operator/pkg/context"
 )
@@ -430,7 +430,7 @@ var validateOverridesTests = []struct {
 			Spec: QuayRegistrySpec{
 				Components: []Component{
 					{Kind: "postgres", Managed: true},
-					{Kind: "redis", Managed: true, Overrides: &Override{Replicas: pointer.Int32(10)}},
+					{Kind: "redis", Managed: true, Overrides: &Override{Replicas: ptr.To[int32](10)}},
 					{Kind: "clair", Managed: true},
 					{Kind: "objectstorage", Managed: true},
 					{Kind: "route", Managed: true},

controllers/quay/quayregistry_controller.go

@@ -41,10 +41,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
@@ -964,8 +964,8 @@ func (r *QuayRegistryReconciler) createOrUpdateObject(
 		client.FieldOwner("quay-operator"),
 	}
 	err := r.Client.Patch(ctx, obj, client.Apply, opts...)
-	gdferr := &discovery.ErrGroupDiscoveryFailed{}
-	if goerrors.As(err, &gdferr) && gvk == hpaGVK {
+	rdferr := &apiutil.ErrResourceDiscoveryFailed{}
+	if goerrors.As(err, &rdferr) && gvk == hpaGVK {
 		var hpa *autoscalingv2beta2.HorizontalPodAutoscaler
 		hpa, err = convertHpaToV2beta2(obj.(*autoscalingv2.HorizontalPodAutoscaler))
 		if err != nil {

go.mod

@@ -1,26 +1,27 @@
 module github.com/quay/quay-operator
 
-go 1.17
+go 1.20
 
 require (
 	github.com/go-logr/logr v1.2.4
 	github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20210311161930-4bea5edaff58
 	github.com/onsi/ginkgo/v2 v2.11.0
-	github.com/onsi/gomega v1.27.8
+	github.com/onsi/gomega v1.27.10
 	github.com/openshift/api v3.9.0+incompatible
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.53.1
 	github.com/quay/clair/config v1.1.3
 	github.com/quay/config-tool v0.1.15
 	github.com/stretchr/testify v1.8.4
 	github.com/tidwall/sjson v1.2.3
-	golang.org/x/net v0.11.0
+	go.uber.org/zap v1.25.0
+	golang.org/x/net v0.17.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.27.3
-	k8s.io/apimachinery v0.27.3
-	k8s.io/client-go v0.27.3
-	k8s.io/utils v0.0.0-20230505201702-9f6742963106
-	sigs.k8s.io/controller-runtime v0.15.0
+	k8s.io/api v0.28.3
+	k8s.io/apimachinery v0.28.3
+	k8s.io/client-go v0.28.3
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
+	sigs.k8s.io/controller-runtime v0.16.3
 	sigs.k8s.io/kustomize/api v0.10.1
 	sigs.k8s.io/kustomize/kyaml v0.13.0
 	sigs.k8s.io/yaml v1.3.0
@@ -38,16 +39,16 @@ require (
 	github.com/creasty/defaults v1.4.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
+	github.com/evanphx/json-patch/v5 v5.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect
 	github.com/go-errors/errors v1.0.1 // indirect
 	github.com/go-ldap/ldap/v3 v3.2.4 // indirect
 	github.com/go-logr/zapr v1.2.4 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.20.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/go-redis/redis/v8 v8.11.4 // indirect
@@ -56,12 +57,12 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.8.1 // indirect
@@ -78,7 +79,7 @@ require (
 	github.com/klauspost/cpuid/v2 v2.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-ieproxy v0.0.1 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/minio-go/v7 v7.0.40 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
@@ -90,10 +91,10 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/pquerna/cachecontrol v0.1.0 // indirect
-	github.com/prometheus/client_golang v1.16.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.11.0 // indirect
+	github.com/prometheus/client_golang v1.17.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rs/xid v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
@@ -102,27 +103,26 @@ require (
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/crypto v0.10.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/oauth2 v0.9.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
-	golang.org/x/term v0.9.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
+	golang.org/x/mod v0.13.0 // indirect
+	golang.org/x/oauth2 v0.13.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.9.3 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
+	golang.org/x/tools v0.14.0 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.66.6 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
-	k8s.io/apiextensions-apiserver v0.27.3 // indirect
-	k8s.io/component-base v0.27.3 // indirect
+	k8s.io/apiextensions-apiserver v0.28.3 // indirect
+	k8s.io/component-base v0.28.3 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
 )