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.

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

Jump to bottom

Update mirroring targets to 4.10+ and add UBI9 #3147

Merged
merged 2 commits into from
Sep 6, 2023
Merged

Update mirroring targets to 4.10+ and add UBI9 #3147

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c81ec65
4.10+ mirroring
hawkowl Sep 6, 2023
796b714
add ubi9, latest MUO, mariner azure-cli
hawkowl Sep 6, 2023
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
25 changes: 22 additions & 3 deletions cmd/aro/mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,38 @@ func mirror(ctx context.Context, log *logrus.Entry) error {
}

for _, ref := range []string{

// https://mcr.microsoft.com/en-us/product/cbl-mariner/base/azure-cli/about
"mcr.microsoft.com/cbl-mariner/base/azure-cli:2",
Copy link
Collaborator

Choose a reason for hiding this comment

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

We need to update all our docs with this new msft-cli image.

Copy link
Collaborator

@bennerv bennerv Sep 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

/s/need to/should

Copy link
Contributor

@tiguelu tiguelu Sep 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

What's ose-tools-rhel8 used for again?

We use it in a few troubleshooting scenarios in the wiki, as it comes with the oc client and a few handy tools for investigations.


// https://catalog.redhat.com/software/containers/rhel8/support-tools/5ba3eaf9bed8bd6ee819b78b
// https://catalog.redhat.com/software/containers/rhel9/support-tools/615be213075b022acc111bf9
"registry.redhat.io/rhel8/support-tools:latest",
"registry.redhat.io/rhel9/support-tools:latest",

// https://catalog.redhat.com/software/containers/openshift4/ose-tools-rhel8/5f748d3399cc5b9e7c1a8747
"registry.redhat.io/openshift4/ose-tools-rhel8:v4.10",
"registry.redhat.io/openshift4/ose-tools-rhel8:v4.11",
"registry.redhat.io/openshift4/ose-tools-rhel8:v4.12",
"registry.redhat.io/openshift4/ose-tools-rhel8:v4.13",
"registry.redhat.io/openshift4/ose-tools-rhel8:latest",

// https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8
// https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5
"registry.access.redhat.com/ubi8/ubi-minimal:latest",
"mcr.microsoft.com/azure-cli:latest",
"registry.access.redhat.com/ubi9/ubi-minimal:latest",

// https://catalog.redhat.com/software/containers/ubi8/nodejs-18/6278e5c078709f5277f26998
"registry.access.redhat.com/ubi8/nodejs-18:latest",

// https://catalog.redhat.com/software/containers/ubi8/go-toolset/5ce8713aac3db925c03774d1
// https://catalog.redhat.com/software/containers/ubi9/go-toolset/61e5c00b4ec9945c18787690
"registry.access.redhat.com/ubi8/go-toolset:1.18.10",
"registry.access.redhat.com/ubi8/go-toolset:1.19.10",

// https://quay.io/repository/app-sre/managed-upgrade-operator?tab=tags
"quay.io/app-sre/managed-upgrade-operator:v0.1.891-3d94c00",
// https://gitlab.cee.redhat.com/service/app-interface/-/blob/master/data/services/osd-operators/cicd/saas/saas-managed-upgrade-operator.yaml?ref_type=heads
"quay.io/app-sre/managed-upgrade-operator:v0.1.952-44b631a",
tiguelu marked this conversation as resolved.
Show resolved Hide resolved

// https://quay.io/repository/app-sre/hive?tab=tags
"quay.io/app-sre/hive:70b666ec89",
Expand All @@ -135,7 +154,7 @@ func mirror(ctx context.Context, log *logrus.Entry) error {
var releases []pkgmirror.Node
if len(flag.Args()) == 1 {
log.Print("reading release graph")
releases, err = pkgmirror.AddFromGraph(version.NewVersion(4, 8))
releases, err = pkgmirror.AddFromGraph(version.NewVersion(4, 10))
if err != nil {
return err
}
Expand Down