Skip to content

Commit 497e849

Browse files
michaelalangmichaelalang
authored
Merge branch 'quay:master' into master
2 parents fe88f95 + 9c540f3 commit 497e849

675 files changed

Lines changed: 57946 additions & 21044 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build-schedule.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
workflow_file_name: build-and-publish.yaml
2121
ref: ${{ env.BRANCH }}
2222
wait_interval: 30
23-
inputs: |
23+
client_payload: |
2424
{
2525
"branch": "${{ env.BRANCH }}"
2626
}
@@ -40,7 +40,7 @@ jobs:
4040
workflow_file_name: build-and-publish.yaml
4141
ref: ${{ env.BRANCH }}
4242
wait_interval: 30
43-
inputs: |
43+
client_payload: |
4444
{
4545
"branch": "${{ env.BRANCH }}"
4646
}
@@ -60,7 +60,7 @@ jobs:
6060
workflow_file_name: build-and-publish.yaml
6161
ref: ${{ env.BRANCH }}
6262
wait_interval: 30
63-
inputs: |
63+
client_payload: |
6464
{
6565
"branch": "${{ env.BRANCH }}"
6666
}

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
description: 'quay-operator-index tag. Defaults to 3.10-unstable'
1212
required: false
1313
schedule:
14-
- cron: '15 11 * * *'
14+
- cron: '0 0 * * 3,5'
1515

1616
jobs:
1717
deploy:
@@ -74,15 +74,16 @@ jobs:
7474
run: |
7575
./hack/ppc64le/destroy_cluster.sh
7676
77-
# - name: Notify slack
78-
# if: ${{ always() }}
79-
# uses: rtCamp/action-slack-notify@v2
80-
# env:
81-
# SLACK_CHANNEL: team-quay-bots
82-
# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
83-
# SLACK_COLOR: ${{ job.status }}
84-
# SLACK_TITLE: "${{ github.workflow }}: ${{ job.status }}"
85-
# SLACK_MESSAGE: |
86-
# * **Repo**: ${{ github.repository }}
87-
# * **Workflow**: ${{ github.workflow }}
88-
# * **Result**: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
77+
- name: Notify slack
78+
if: ${{ always() }}
79+
uses: rtCamp/action-slack-notify@v2
80+
env:
81+
SLACK_CHANNEL: team-quay-bots
82+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
83+
SLACK_COLOR: ${{ job.status }}
84+
SLACK_TITLE: "${{ github.workflow }}: ${{ job.status }}"
85+
SLACK_MESSAGE: |
86+
* **Repo**: ${{ github.repository }}
87+
* **Workflow**: ${{ github.workflow }}
88+
* **Result**: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
89+
* **Contact**: @yshaikh

‎.github/workflows/pull_request_linting.yaml‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,16 @@ on:
55
types: ['opened', 'edited', 'reopened', 'synchronize']
66

77
jobs:
8-
ticket-check:
9-
name: ticket check
10-
runs-on: ubuntu-latest
11-
steps:
12-
- name: Check for ticket
13-
uses: neofinancial/ticket-check-action@v1
14-
with:
15-
token: ${{ secrets.GITHUB_TOKEN }}
16-
ticketLink: 'https://issues.redhat.com/browse/PROJQUAY-%ticketNumber%'
17-
ticketPrefix: 'PROJQUAY-'
18-
titleRegex: 'PROJQUAY-(?<ticketNumber>\d+)'
19-
titleFormat: '%title% (%prefix%%id%)'
20-
branchRegex: 'PROJQUAY-(?<ticketNumber>\d+)'
21-
bodyRegex: 'PROJQUAY-(?<ticketNumber>\d+)'
22-
bodyURLRegex: 'http(s?):\/\/(issues.redhat.com)(\/browse)\/(PROJQUAY\-)(?<ticketNumber>\d+)'
23-
exemptUsers: 'dependabot'
24-
258
conventional-commit:
269
runs-on: ubuntu-latest
2710
name: conventional commit check
2811
steps:
2912
- name: Checkout
30-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
3114

3215
- name: check conventional commit
3316
id: check-for-cc
34-
uses: agenthunt/conventional-commit-checker-action@v1.0.0
17+
uses: agenthunt/conventional-commit-checker-action@v2.0.0
3518
with:
19+
pr-title-regex: '^(?:\[[^\]]+\] )?(?:[a-z]+(?:\([^)]+\))?: .+ \(PROJQUAY-[0-9]+\)|(?:chore|build\(deps\)|build\(deps-dev\)): .+)$'
3620
pr-body-regex: '(.*)?'

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi8/go-toolset:1.19 as builder
1+
FROM --platform=$BUILDPLATFORM quay.io/projectquay/golang:1.20 as builder
22

33
ARG TARGETOS TARGETARCH
44
WORKDIR /workspace

‎apis/quay/v1/quayregistry_types_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
corev1 "k8s.io/api/core/v1"
99
"k8s.io/apimachinery/pkg/api/resource"
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
11-
"k8s.io/utils/pointer"
11+
"k8s.io/utils/ptr"
1212

1313
quaycontext "github.com/quay/quay-operator/pkg/context"
1414
)
@@ -430,7 +430,7 @@ var validateOverridesTests = []struct {
430430
Spec: QuayRegistrySpec{
431431
Components: []Component{
432432
{Kind: "postgres", Managed: true},
433-
{Kind: "redis", Managed: true, Overrides: &Override{Replicas: pointer.Int32(10)}},
433+
{Kind: "redis", Managed: true, Overrides: &Override{Replicas: ptr.To[int32](10)}},
434434
{Kind: "clair", Managed: true},
435435
{Kind: "objectstorage", Managed: true},
436436
{Kind: "route", Managed: true},

‎controllers/quay/quayregistry_controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ import (
4141
"k8s.io/apimachinery/pkg/runtime/schema"
4242
"k8s.io/apimachinery/pkg/types"
4343
"k8s.io/apimachinery/pkg/util/wait"
44-
"k8s.io/client-go/discovery"
4544
"k8s.io/client-go/tools/record"
4645
ctrl "sigs.k8s.io/controller-runtime"
4746
"sigs.k8s.io/controller-runtime/pkg/client"
47+
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
4848
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
4949
"sigs.k8s.io/controller-runtime/pkg/predicate"
5050

@@ -964,8 +964,8 @@ func (r *QuayRegistryReconciler) createOrUpdateObject(
964964
client.FieldOwner("quay-operator"),
965965
}
966966
err := r.Client.Patch(ctx, obj, client.Apply, opts...)
967-
gdferr := &discovery.ErrGroupDiscoveryFailed{}
968-
if goerrors.As(err, &gdferr) && gvk == hpaGVK {
967+
rdferr := &apiutil.ErrResourceDiscoveryFailed{}
968+
if goerrors.As(err, &rdferr) && gvk == hpaGVK {
969969
var hpa *autoscalingv2beta2.HorizontalPodAutoscaler
970970
hpa, err = convertHpaToV2beta2(obj.(*autoscalingv2.HorizontalPodAutoscaler))
971971
if err != nil {

‎go.mod‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
module github.com/quay/quay-operator
22

3-
go 1.17
3+
go 1.20
44

55
require (
66
github.com/go-logr/logr v1.2.4
77
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20210311161930-4bea5edaff58
88
github.com/onsi/ginkgo/v2 v2.11.0
9-
github.com/onsi/gomega v1.27.8
9+
github.com/onsi/gomega v1.27.10
1010
github.com/openshift/api v3.9.0+incompatible
1111
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.53.1
1212
github.com/quay/clair/config v1.1.3
1313
github.com/quay/config-tool v0.1.15
1414
github.com/stretchr/testify v1.8.4
1515
github.com/tidwall/sjson v1.2.3
16-
golang.org/x/net v0.11.0
16+
go.uber.org/zap v1.25.0
17+
golang.org/x/net v0.17.0
1718
gopkg.in/yaml.v2 v2.4.0
1819
gopkg.in/yaml.v3 v3.0.1
19-
k8s.io/api v0.27.3
20-
k8s.io/apimachinery v0.27.3
21-
k8s.io/client-go v0.27.3
22-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
23-
sigs.k8s.io/controller-runtime v0.15.0
20+
k8s.io/api v0.28.3
21+
k8s.io/apimachinery v0.28.3
22+
k8s.io/client-go v0.28.3
23+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
24+
sigs.k8s.io/controller-runtime v0.16.3
2425
sigs.k8s.io/kustomize/api v0.10.1
2526
sigs.k8s.io/kustomize/kyaml v0.13.0
2627
sigs.k8s.io/yaml v1.3.0
@@ -38,16 +39,16 @@ require (
3839
github.com/creasty/defaults v1.4.0 // indirect
3940
github.com/davecgh/go-spew v1.1.1 // indirect
4041
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
41-
github.com/dustin/go-humanize v1.0.0 // indirect
42-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
43-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
44-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
45-
github.com/fsnotify/fsnotify v1.6.0 // indirect
42+
github.com/dustin/go-humanize v1.0.1 // indirect
43+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
44+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
45+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
46+
github.com/fsnotify/fsnotify v1.7.0 // indirect
4647
github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect
4748
github.com/go-errors/errors v1.0.1 // indirect
4849
github.com/go-ldap/ldap/v3 v3.2.4 // indirect
4950
github.com/go-logr/zapr v1.2.4 // indirect
50-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
51+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
5152
github.com/go-openapi/jsonreference v0.20.2 // indirect
5253
github.com/go-openapi/swag v0.22.4 // indirect
5354
github.com/go-redis/redis/v8 v8.11.4 // indirect
@@ -56,12 +57,12 @@ require (
5657
github.com/gogo/protobuf v1.3.2 // indirect
5758
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5859
github.com/golang/protobuf v1.5.3 // indirect
59-
github.com/google/gnostic v0.6.9 // indirect
60-
github.com/google/go-cmp v0.5.9 // indirect
60+
github.com/google/gnostic-models v0.6.8 // indirect
61+
github.com/google/go-cmp v0.6.0 // indirect
6162
github.com/google/gofuzz v1.2.0 // indirect
6263
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
6364
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
64-
github.com/google/uuid v1.3.0 // indirect
65+
github.com/google/uuid v1.3.1 // indirect
6566
github.com/imdario/mergo v0.3.16 // indirect
6667
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
6768
github.com/jackc/pgconn v1.8.1 // indirect
@@ -78,7 +79,7 @@ require (
7879
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
7980
github.com/mailru/easyjson v0.7.7 // indirect
8081
github.com/mattn/go-ieproxy v0.0.1 // indirect
81-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
82+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
8283
github.com/minio/md5-simd v1.1.2 // indirect
8384
github.com/minio/minio-go/v7 v7.0.40 // indirect
8485
github.com/minio/sha256-simd v1.0.0 // indirect
@@ -90,10 +91,10 @@ require (
9091
github.com/pkg/errors v0.9.1 // indirect
9192
github.com/pmezard/go-difflib v1.0.0 // indirect
9293
github.com/pquerna/cachecontrol v0.1.0 // indirect
93-
github.com/prometheus/client_golang v1.16.0 // indirect
94-
github.com/prometheus/client_model v0.4.0 // indirect
95-
github.com/prometheus/common v0.44.0 // indirect
96-
github.com/prometheus/procfs v0.11.0 // indirect
94+
github.com/prometheus/client_golang v1.17.0 // indirect
95+
github.com/prometheus/client_model v0.5.0 // indirect
96+
github.com/prometheus/common v0.45.0 // indirect
97+
github.com/prometheus/procfs v0.12.0 // indirect
9798
github.com/rs/xid v1.4.0 // indirect
9899
github.com/sirupsen/logrus v1.9.0 // indirect
99100
github.com/spf13/pflag v1.0.5 // indirect
@@ -102,27 +103,26 @@ require (
102103
github.com/tidwall/pretty v1.2.0 // indirect
103104
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
104105
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
105-
go.uber.org/atomic v1.7.0 // indirect
106-
go.uber.org/multierr v1.6.0 // indirect
107-
go.uber.org/zap v1.24.0 // indirect
108-
golang.org/x/crypto v0.10.0 // indirect
109-
golang.org/x/mod v0.10.0 // indirect
110-
golang.org/x/oauth2 v0.9.0 // indirect
111-
golang.org/x/sys v0.9.0 // indirect
112-
golang.org/x/term v0.9.0 // indirect
113-
golang.org/x/text v0.10.0 // indirect
106+
go.uber.org/multierr v1.11.0 // indirect
107+
golang.org/x/crypto v0.14.0 // indirect
108+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
109+
golang.org/x/mod v0.13.0 // indirect
110+
golang.org/x/oauth2 v0.13.0 // indirect
111+
golang.org/x/sys v0.13.0 // indirect
112+
golang.org/x/term v0.13.0 // indirect
113+
golang.org/x/text v0.13.0 // indirect
114114
golang.org/x/time v0.3.0 // indirect
115-
golang.org/x/tools v0.9.3 // indirect
116-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
117-
google.golang.org/appengine v1.6.7 // indirect
115+
golang.org/x/tools v0.14.0 // indirect
116+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
117+
google.golang.org/appengine v1.6.8 // indirect
118118
google.golang.org/protobuf v1.31.0 // indirect
119119
gopkg.in/inf.v0 v0.9.1 // indirect
120120
gopkg.in/ini.v1 v1.66.6 // indirect
121121
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
122-
k8s.io/apiextensions-apiserver v0.27.3 // indirect
123-
k8s.io/component-base v0.27.3 // indirect
122+
k8s.io/apiextensions-apiserver v0.28.3 // indirect
123+
k8s.io/component-base v0.28.3 // indirect
124124
k8s.io/klog/v2 v2.100.1 // indirect
125-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
125+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
126126
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
127-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
127+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
128128
)

0 commit comments

Comments
 (0)