Skip to content

OCPBUGS-48294: (Manual) Synchronize From Upstream Repositories #216

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

Merged
merged 45 commits into from
Jan 8, 2025
Merged

OCPBUGS-48294: (Manual) Synchronize From Upstream Repositories #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
bbae555
:seedling: Bump charset-normalizer from 3.4.0 to 3.4.1 (#1538)
dependabot[bot] Jan 7, 2025
6fa8e19
:seedling: Bump pymdown-extensions from 10.12 to 10.13 (#1537)
dependabot[bot] Jan 7, 2025
8c7a016
:seedling: Bump urllib3 from 2.2.3 to 2.3.0 (#1534)
dependabot[bot] Jan 7, 2025
9cef99f
:seedling: Bump jinja2 from 3.1.4 to 3.1.5 (#1533)
dependabot[bot] Jan 7, 2025
4bbd6fa
:seedling: Bump click from 8.1.7 to 8.1.8 (#1532)
dependabot[bot] Jan 7, 2025
83b01c3
fix: renamed catalogd service name in download-catalog hack script (#…
azych Jan 7, 2025
6755e94
test/e2e/metrics_test.go: discover operator-controller namespace and …
joelanford Jan 7, 2025
1c84d99
fix: incomplete function chain and renamed function in list-compatibl…
azych Jan 7, 2025
3dcbaf8
:seedling: Bump pygments from 2.18.0 to 2.19.1 (#1549)
dependabot[bot] Jan 7, 2025
a495be1
Upgrade github.com/joelanford/ignore from v0.1.0 to v0.1.1 (#1551)
camilamacedo86 Jan 7, 2025
4b3dfc5
Upgrade golang.org/x/net (#1552)
camilamacedo86 Jan 7, 2025
5b5ccab
Update catalogd to v1.1.0 (#1553)
tmshort Jan 7, 2025
32ec5c9
Merge branch 'main' into synchronize
tmshort Jan 8, 2025
87c45ae
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
351d7f3
UPSTREAM: <carry>: Drop commitchecker
awgreene Nov 3, 2023
87fd867
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Dec 16, 2023
9b77b06
UPSTREAM: <carry>: update owners
Mar 27, 2024
a972172
UPSTREAM: <carry>: Add pointer to tooling README
bentito Apr 1, 2024
28be997
UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
Apr 26, 2024
1208c5f
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Mar 27, 2024
797b396
UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
Apr 30, 2024
fc63a69
UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
liouk May 2, 2024
1040fe4
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
May 25, 2024
6cde69d
UPSTREAM: <carry>: add everettraven to approvers+reviewers
everettraven Jun 24, 2024
f1f1019
UPSTREAM: <carry>: add openshift kustomize overlay
everettraven Jul 9, 2024
914df6b
UPSTREAM: <carry>: Add tmshort to approvers
tmshort Sep 11, 2024
3e3a264
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Sep 18, 2024
22442e3
UPSTREAM: <carry>: Properly copy and call kustomize
tmshort Sep 23, 2024
c8be10d
UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
joelanford Sep 20, 2024
a51e1ca
UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be …
dtfranz Sep 26, 2024
bf8dd34
UPSTREAM: <carry>: Add downstream verify makefile target
dtfranz Sep 27, 2024
75fa53b
UPSTREAM: <carry>: openshift: template log verbosity to be managed by…
joelanford Sep 28, 2024
4d43d29
UPSTREAM: <carry>: Add global-pull-secret flag
Oct 8, 2024
f01c815
UPSTREAM: <carry>: Update openshift CAs to operator-controller
tmshort Oct 28, 2024
118cd8c
UPSTREAM: <carry>: Add HowTo for origin tests
tmshort Nov 1, 2024
3d1aed1
UPSTREAM: <carry>: Add e2e registry Dockerfile
dtfranz Nov 16, 2024
4a08245
UPSTREAM: <carry>: add nodeSelector and tolerations to operator-contr…
everettraven Nov 19, 2024
c651ef2
UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn l…
joelanford Nov 22, 2024
95318c9
UPSTREAM: <carry>: Enable downstream e2e
dtfranz Nov 15, 2024
c5549f0
UPSTREAM: <carry>: Remove m1kola from owners
Dec 12, 2024
b15330b
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Dec 4, 2024
d058ec8
UPSTREAM: <carry>: generate and mount service-ca server cert
joelanford Jan 6, 2025
e070dd5
UPSTREAM: <drop>: go mod vendor
tmshort Jan 8, 2025
0a69e24
UPSTREAM: <drop>: remove upstream GitHub configuration
tmshort Jan 8, 2025
35d85a4
UPSTREAM: <drop>: configure the commit-checker
tmshort Jan 8, 2025
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 commitchecker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
expectedMergeBase: 2c812aaf385ffe786538a2ef4928bd23feb58a74
expectedMergeBase: 5b5ccab5f1908ac11fa759c9c6d2f89792505dbe
upstreamBranch: main
upstreamOrg: operator-framework
upstreamRepo: operator-controller
31 changes: 14 additions & 17 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/google/go-containerregistry v0.20.2
github.com/opencontainers/go-digest v1.0.0
github.com/operator-framework/api v0.27.0
github.com/operator-framework/catalogd v1.0.0
github.com/operator-framework/catalogd v1.1.0
github.com/operator-framework/helm-operator-plugins v0.7.0
github.com/operator-framework/operator-registry v1.48.0
github.com/spf13/pflag v1.0.5
Expand All @@ -24,11 +24,11 @@ require (
gopkg.in/yaml.v2 v2.4.0
helm.sh/helm/v3 v3.16.4
k8s.io/api v0.31.4
k8s.io/apiextensions-apiserver v0.31.3
k8s.io/apiextensions-apiserver v0.31.4
k8s.io/apimachinery v0.31.4
k8s.io/cli-runtime v0.31.4
k8s.io/client-go v0.31.4
k8s.io/component-base v0.31.3
k8s.io/component-base v0.31.4
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.19.0
Expand Down Expand Up @@ -71,7 +71,7 @@ require (
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 // indirect
github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14 // indirect
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/cli v27.3.1+incompatible // indirect
Expand All @@ -90,8 +90,8 @@ require (
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.12.0 // indirect
github.com/go-git/go-billy/v5 v5.6.1 // indirect
github.com/go-git/go-git/v5 v5.13.1 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand Down Expand Up @@ -130,7 +130,7 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmoiron/sqlx v1.4.0 // indirect
github.com/joelanford/ignore v0.1.0 // indirect
github.com/joelanford/ignore v0.1.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/k14s/starlark-go v0.0.0-20200720175618-3a5c849cc368 // indirect
Expand Down Expand Up @@ -166,8 +166,7 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/onsi/ginkgo/v2 v2.22.0 // indirect
github.com/onsi/gomega v1.36.0 // indirect
github.com/onsi/gomega v1.36.2 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11 // indirect
Expand Down Expand Up @@ -220,25 +219,25 @@ require (
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
google.golang.org/protobuf v1.36.1 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.31.3 // indirect
k8s.io/apiserver v0.31.4 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kubectl v0.31.3 // indirect
oras.land/oras-go v1.2.5 // indirect
Expand All @@ -248,5 +247,3 @@ require (
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241212132220-31acec5f2bd4
Loading