Skip to content
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.

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

containerdregistry: support per-repo credentials #1165

Merged
merged 2 commits into from
Nov 19, 2023

Conversation

joelanford
Copy link
Member

@joelanford joelanford commented Nov 13, 2023

Description of the change:

Updates the containerdregistry implementation (e.g. used by opm render and the none container tool) to support:

  • per-repo authentication using the podman/skopeo-style containers/auth.json file format
  • REGISTRY_AUTH_FILE and DOCKER_CONFIG environment variables.

Motivation for the change:

Closes #935
Closes #919
Closes #1114

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /docs
  • Commit messages sensible and descriptive

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 13, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 13, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 13, 2023
@@ -8,14 +8,14 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"google.golang.org/grpc"
health "google.golang.org/grpc/health/grpc_health_v1"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had a copy of this package in our repo, and some dependencies pulled in from this commit caused a namespace conflict because two different packages defined the same GRPC protobuf names: our copy, and this official package.

To resolve, I deleted our package and switched everything to the official package.

Copy link

codecov bot commented Nov 13, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6cb25c2) 53.32% compared to head (3f92a5c) 53.32%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1165   +/-   ##
=======================================
  Coverage   53.32%   53.32%           
=======================================
  Files         108      108           
  Lines       10337    10337           
=======================================
  Hits         5512     5512           
  Misses       3841     3841           
  Partials      984      984           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Copy link
Contributor

openshift-ci bot commented Nov 14, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelanford, stevekuznetsov

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@stevekuznetsov stevekuznetsov merged commit 5e23ef5 into operator-framework:master Nov 19, 2023
@joelanford joelanford deleted the per-repo-auth branch November 27, 2023 13:33
tonyskapunk added a commit to redhatci/ansible-collection-redhatci-ocp that referenced this pull request Jan 4, 2024
The opm-auths is a wrapper script provided by dci-openshift-agent
that brings support for multi-entry registry authentication when
using opm.

The opm client lacked the functionality as reported in:
operator-framework/operator-registry#935

But lately it was added in:
operator-framework/operator-registry#1165

Now it is available in the stable ocp clients:
https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/
tonyskapunk added a commit to redhatci/ansible-collection-redhatci-ocp that referenced this pull request Jul 30, 2024
The opm-auths is a wrapper script provided by dci-openshift-agent
that brings support for multi-entry registry authentication when
using opm.

The opm client lacked the functionality as reported in:
operator-framework/operator-registry#935

But lately it was added in:
operator-framework/operator-registry#1165

Now it is available in the stable ocp clients:
https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/
sf-project-io pushed a commit to redhat-cip/dci-openshift-agent that referenced this pull request Aug 9, 2024
The opm-auths is a wrapper script that brings support for multi-entry
registry authentication when using opm. The opm client lacked the
functionality as reported in:
operator-framework/operator-registry#935

But lately it was added in:
operator-framework/operator-registry#1165
And now it is available in the stable ocp clients
https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/

Thus, the wrapper is not needed any longer.

Lastly, opm stable now provides two FIPS compiant binaries. ONe for rhel8
and another for rhel9, downloading the correct one for the agent.

Change-Id: Idab1a56a594a2f5c1e6a623af8d6d9b7ff359cb1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files.
Projects
None yet
3 participants