Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: operator-framework/operator-registry
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: operator-framework/operator-registry
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release-4.7
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 14 commits
  • 102 files changed
  • 6 contributors

Commits on Jan 14, 2021

  1. Updating operator-registry builder & base images to be consistent wit… 

    …h ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/f01352e0069d4e8cedc0880ae427359a96668512/images/operator-registry.yml
    AOS Automation Release Team committed Jan 14, 2021
    Copy the full SHA
    a6cdcdf View commit details

Commits on Feb 23, 2021

  1. add missing closes 

    Signed-off-by: Ryan Phillips <[email protected]>
    @rphillips
    rphillips authored and openshift-cherrypick-robot committed Feb 23, 2021
    Copy the full SHA
    658cbbc View commit details

Commits on Mar 2, 2021

  1. Merge pull request #584 from openshift-bot/art-consistency-openshift-… 

    …4.7-operator-registry

Updating operator-registry builder & base images to be consistent with ART
    @openshift-merge-robot
    openshift-merge-robot authored Mar 2, 2021
    Copy the full SHA
    be599a2 View commit details

  2. Merge pull request #597 from openshift-cherrypick-robot/cherry-pick-5… 

    …70-to-release-4.7

[release-4.7] Bug 1931903: add missing closes
    @openshift-merge-robot
    openshift-merge-robot authored Mar 2, 2021
    Copy the full SHA
    a97d366 View commit details

Commits on Apr 15, 2021

  1. go.*,vendor: Bump the k8s dependencies to v1.20.6 

    The v1.20.6 contains the github.com/gogo/protobuf version bump:

https://github.com/kubernetes/kubernetes/blob/v1.20.6/go.mod#L53.

Fixes CVE-2021-3121.

Signed-off-by: timflannagan <[email protected]>
    @timflannagan
    timflannagan committed Apr 15, 2021
    Copy the full SHA
    d22e9dd View commit details

  2. .github/workflows: Remove the unneeded 'minikube docker-env' command 

    Signed-off-by: timflannagan <[email protected]>
    @timflannagan
    timflannagan committed Apr 15, 2021
    Copy the full SHA
    cb1ccdb View commit details

Commits on Apr 21, 2021

  1. Add retries when pulling images 

    This commit adds retries to the containerd and podman pull tools.
The docker pull tool shells out to the docker CLI, which already
supports retries.

The retry backoff is setup to retry every 1 second, 5 times.

Signed-off-by: Joe Lanford <[email protected]>
    @joelanford
    joelanford committed Apr 21, 2021
    Copy the full SHA
    6d327d5 View commit details

  2. .github/workflows: Remove unneeded docker-env command 

    I'm not sure why this is needed when diving into the minikube
documentation - maybe this is a requirement of an older minikube version
- and that the `none` driver should just be able to autodetect the local
docker registry w/o any explicit bash environment variables being
exported by that command.

This was producing the following error in the e2e-minikube job logs:

```bash
X Exiting due to ENV_DRIVER_CONFLICT: 'none' driver does not support 'minikube docker-env' command
```

Signed-off-by: timflannagan <[email protected]>
    @timflannagan @joelanford
    timflannagan authored and joelanford committed Apr 21, 2021
    Copy the full SHA
    a7d0636 View commit details

  3. .github/workflows: Fix error when installing podman 

    Signed-off-by: timflannagan <[email protected]>
    @timflannagan @joelanford
    timflannagan authored and joelanford committed Apr 21, 2021
    Copy the full SHA
    8f355a4 View commit details

Commits on Apr 27, 2021

  1. Force latest install of podman to fix currently broken e2e tests 

    Signed-off-by: Joe Lanford <[email protected]>
    @joelanford
    joelanford committed Apr 27, 2021
    Copy the full SHA
    3cd2505 View commit details

Commits on Apr 28, 2021

  1. Merge pull request #643 from joelanford/bz-1937097 

    [release-4.7] Bug 1937097: Add retries to opm index add
    @openshift-merge-robot
    openshift-merge-robot authored Apr 28, 2021
    Copy the full SHA
    fb7196f View commit details

Commits on Apr 29, 2021

  1. Merge pull request #638 from timflannagan/bump-to-k8s-v1.20.6 

    [release-4.7] Bug 1924468: Bump the k8s dependencies to v1.20.6
    @openshift-merge-robot
    openshift-merge-robot authored Apr 29, 2021
    Copy the full SHA
    5ccabf9 View commit details

Commits on Jun 7, 2021

  1. fix(containerd): drop xattrs during unpack 

    On some systems, creating files with certain extended attributes is a
restricted operation -- e.g. "security.compatibility" on SELinux -- and
causes bundle and index unpacking to fail for unprivileged users. To fix
this, we drop all xattrs from unpacked files before writing them.

Signed-off-by: Nick Hale <[email protected]>
    @njhale
    njhale authored and openshift-cherrypick-robot committed Jun 7, 2021
    Copy the full SHA
    d7e1f52 View commit details

Commits on Jun 18, 2021

  1. Merge pull request #676 from openshift-cherrypick-robot/cherry-pick-6… 

    …67-to-release-4.7

[release-4.7] Bug 1968680: fix(containerd): drop xattrs during unpack
    @openshift-merge-robot
    openshift-merge-robot authored Jun 18, 2021
    Copy the full SHA
    06e950d View commit details
Showing with 3,917 additions and 4,096 deletions.
  1. +13 −4 .github/workflows/test.yml
  2. +2 −2 Dockerfile
  3. +8 −7 go.mod
  4. +32 −139 go.sum
  5. +3 −2 pkg/image/buildahregistry/_registry.go
  6. +56 −2 pkg/image/containerdregistry/registry.go
  7. +168 −18 pkg/image/registry_test.go
  8. +7 −1 pkg/lib/image/registry.go
  9. +1 −0 pkg/registry/csv.go
  10. +3 −0 pkg/sqlite/directory.go
  11. +21 −1 pkg/sqlite/load.go
  12. +1 −1 vendor/github.com/gogo/protobuf/proto/text_parser.go
  13. +1 −4 vendor/github.com/gogo/protobuf/types/any.pb.go
  14. +3 −12 vendor/github.com/gogo/protobuf/types/api.pb.go
  15. +1 −4 vendor/github.com/gogo/protobuf/types/duration.pb.go
  16. +1 −4 vendor/github.com/gogo/protobuf/types/empty.pb.go
  17. +1 −4 vendor/github.com/gogo/protobuf/types/field_mask.pb.go
  18. +1 −4 vendor/github.com/gogo/protobuf/types/source_context.pb.go
  19. +4 −13 vendor/github.com/gogo/protobuf/types/struct.pb.go
  20. +1 −4 vendor/github.com/gogo/protobuf/types/timestamp.pb.go
  21. +5 −20 vendor/github.com/gogo/protobuf/types/type.pb.go
  22. +9 −36 vendor/github.com/gogo/protobuf/types/wrappers.pb.go
  23. +10 −1 vendor/golang.org/x/sync/semaphore/semaphore.go
  24. +4 −0 vendor/golang.org/x/tools/go/ast/astutil/util.go
  25. +1 −1 vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go
  26. +5 −73 vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
  27. +1 −1 vendor/golang.org/x/tools/go/packages/external.go
  28. +267 −78 vendor/golang.org/x/tools/go/packages/golist.go
  29. +161 −46 vendor/golang.org/x/tools/go/packages/golist_overlay.go
  30. +22 −1 vendor/golang.org/x/tools/go/packages/packages.go
  31. +4 −0 vendor/golang.org/x/tools/go/packages/visit.go
  32. +23 −16 vendor/golang.org/x/tools/imports/forward.go
  33. +1 −1 vendor/golang.org/x/tools/internal/event/core/event.go
  34. +121 −54 vendor/golang.org/x/tools/internal/gocommand/invoke.go
  35. +51 −0 vendor/golang.org/x/tools/internal/gocommand/version.go
  36. +0 −11 vendor/golang.org/x/tools/internal/gopathwalk/walk.go
  37. +228 −82 vendor/golang.org/x/tools/internal/imports/fix.go
  38. +13 −80 vendor/golang.org/x/tools/internal/imports/imports.go
  39. +45 −12 vendor/golang.org/x/tools/internal/imports/mod.go
  40. +4 −0 vendor/golang.org/x/tools/internal/imports/mod_cache.go
  41. +10 −10 vendor/golang.org/x/tools/internal/imports/sortimports.go
  42. +52 −0 vendor/golang.org/x/tools/internal/imports/zstdlib.go
  43. +7 −0 vendor/golang.org/x/tools/internal/packagesinternal/packages.go
  44. +1,358 −0 vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
  45. +152 −0 vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
  46. +17 −0 vendor/golang.org/x/tools/internal/typesinternal/types.go
  47. +10 −40 vendor/k8s.io/api/admissionregistration/v1/generated.pb.go
  48. +10 −40 vendor/k8s.io/api/admissionregistration/v1beta1/generated.pb.go
  49. +6 −24 vendor/k8s.io/api/apiserverinternal/v1alpha1/generated.pb.go
  50. +28 −112 vendor/k8s.io/api/apps/v1/generated.pb.go
  51. +23 −86 vendor/k8s.io/api/apps/v1beta1/generated.pb.go
  52. +32 −125 vendor/k8s.io/api/apps/v1beta2/generated.pb.go
  53. +10 −37 vendor/k8s.io/api/authentication/v1/generated.pb.go
  54. +6 −21 vendor/k8s.io/api/authentication/v1beta1/generated.pb.go
  55. +15 −57 vendor/k8s.io/api/authorization/v1/generated.pb.go
  56. +15 −57 vendor/k8s.io/api/authorization/v1beta1/generated.pb.go
  57. +21 −84 vendor/k8s.io/api/autoscaling/v1/generated.pb.go
  58. +18 −72 vendor/k8s.io/api/autoscaling/v2beta1/generated.pb.go
  59. +24 −96 vendor/k8s.io/api/autoscaling/v2beta2/generated.pb.go
  60. +5 −20 vendor/k8s.io/api/batch/v1/generated.pb.go
  61. +6 −24 vendor/k8s.io/api/batch/v1beta1/generated.pb.go
  62. +6 −24 vendor/k8s.io/api/batch/v2alpha1/generated.pb.go
  63. +7 −25 vendor/k8s.io/api/certificates/v1/generated.pb.go
  64. +7 −25 vendor/k8s.io/api/certificates/v1beta1/generated.pb.go
  65. +3 −12 vendor/k8s.io/api/coordination/v1/generated.pb.go
  66. +3 −12 vendor/k8s.io/api/coordination/v1beta1/generated.pb.go
  67. +235 −859 vendor/k8s.io/api/core/v1/generated.pb.go
  68. +1 −0 vendor/k8s.io/api/core/v1/generated.proto
  69. +1 −0 vendor/k8s.io/api/core/v1/types.go
  70. +6 −21 vendor/k8s.io/api/discovery/v1alpha1/generated.pb.go
  71. +6 −21 vendor/k8s.io/api/discovery/v1beta1/generated.pb.go
  72. +3 −12 vendor/k8s.io/api/events/v1/generated.pb.go
  73. +3 −12 vendor/k8s.io/api/events/v1beta1/generated.pb.go
  74. +58 −226 vendor/k8s.io/api/extensions/v1beta1/generated.pb.go
  75. +22 −88 vendor/k8s.io/api/flowcontrol/v1alpha1/generated.pb.go
  76. +22 −88 vendor/k8s.io/api/flowcontrol/v1beta1/generated.pb.go
  77. +23 −92 vendor/k8s.io/api/networking/v1/generated.pb.go
  78. +13 −52 vendor/k8s.io/api/networking/v1beta1/generated.pb.go
  79. +6 −18 vendor/k8s.io/api/node/v1/generated.pb.go
  80. +7 −22 vendor/k8s.io/api/node/v1alpha1/generated.pb.go
  81. +6 −18 vendor/k8s.io/api/node/v1beta1/generated.pb.go
  82. +20 −77 vendor/k8s.io/api/policy/v1beta1/generated.pb.go
  83. +12 −48 vendor/k8s.io/api/rbac/v1/generated.pb.go
  84. +12 −48 vendor/k8s.io/api/rbac/v1alpha1/generated.pb.go
  85. +12 −48 vendor/k8s.io/api/rbac/v1beta1/generated.pb.go
  86. +2 −8 vendor/k8s.io/api/scheduling/v1/generated.pb.go
  87. +2 −8 vendor/k8s.io/api/scheduling/v1alpha1/generated.pb.go
  88. +2 −8 vendor/k8s.io/api/scheduling/v1beta1/generated.pb.go
  89. +19 −70 vendor/k8s.io/api/storage/v1/generated.pb.go
  90. +9 −33 vendor/k8s.io/api/storage/v1alpha1/generated.pb.go
  91. +19 −70 vendor/k8s.io/api/storage/v1beta1/generated.pb.go
  92. +29 −104 vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/generated.pb.go
  93. +28 −100 vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.pb.go
  94. +1 −1 vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go
  95. +45 −171 vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
  96. +3 −12 vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go
  97. +1 −4 vendor/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go
  98. +4 −0 vendor/k8s.io/client-go/util/retry/OWNERS
  99. +105 −0 vendor/k8s.io/client-go/util/retry/util.go
  100. +13 −12 vendor/modules.txt
  101. +6 −0 vendor/sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/client.go
  102. +7 −3 vendor/sigs.k8s.io/structured-merge-diff/v4/value/reflectcache.go
17 changes: 13 additions & 4 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
@@ -28,15 +28,19 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: |
sudo apt-get -y update
. /etc/os-release
echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | sudo apt-key add -
sudo apt-get update
sudo apt-get -y install conntrack podman
podman version
- run: |
curl -sLo minikube "$(curl -sL https://api.github.com/repos/kubernetes/minikube/releases/latest | jq -r '[.assets[] | select(.name == "minikube-linux-amd64")] | first | .browser_download_url')"
chmod +x minikube
sudo mv minikube /bin/
minikube start --driver=none
sudo chown -R "$USER" "$HOME/.kube" "$HOME/.minikube"
sudo usermod -aG docker "$USER"
eval $(minikube docker-env)
- run: |
mkdir -p certs
openssl req -x509 -newkey rsa:4096 -keyout certs/key.pem -out certs/cert.pem -days 365 -subj '/CN=localhost' -nodes -addext 'subjectAltName = DNS:localhost'
@@ -57,8 +61,13 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: |
sudo apt-get -y update
sudo apt-get -y install podman
. /etc/os-release
echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | sudo apt-key add -
sudo apt-get update
sudo apt-get -y install conntrack podman
podman version
- run: |
curl -sLo kind "$(curl -sL https://api.github.com/repos/kubernetes-sigs/kind/releases/latest | jq -r '[.assets[] | select(.name == "kind-linux-amd64")] | first | .browser_download_url')"
chmod +x kind
sudo mv kind /bin/
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder

ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
@@ -11,7 +11,7 @@ RUN make build cross
# copy and build vendored grpc_health_probe
RUN CGO_ENABLED=0 go build -mod=vendor -tags netgo -ldflags "-w" ./vendor/github.com/grpc-ecosystem/grpc-health-probe/...

FROM registry.svc.ci.openshift.org/ocp/4.7:base
FROM registry.ci.openshift.org/ocp/4.7:base

COPY --from=builder /src/bin/* /bin/registry/
COPY --from=builder /src/grpc-health-probe /bin/grpc_health_probe
15 changes: 8 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -31,6 +31,7 @@ require (
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
github.com/onsi/ginkgo v1.14.1
github.com/onsi/gomega v1.10.2
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
github.com/opencontainers/runc v0.1.1 // indirect
github.com/operator-framework/api v0.5.0
@@ -47,18 +48,18 @@ require (
golang.org/x/mod v0.3.0
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
google.golang.org/grpc v1.30.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200709232328-d8193ee9cc3e
google.golang.org/protobuf v1.25.0
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.20.0
k8s.io/apiextensions-apiserver v0.20.0
k8s.io/apimachinery v0.20.0
k8s.io/apiserver v0.20.0
k8s.io/client-go v0.20.0
k8s.io/api v0.20.6
k8s.io/apiextensions-apiserver v0.20.6
k8s.io/apimachinery v0.20.6
k8s.io/apiserver v0.20.6
k8s.io/client-go v0.20.6
k8s.io/klog v1.0.0
k8s.io/kubectl v0.20.0
k8s.io/kubectl v0.20.6
)

replace (
Loading