Skip to content

Commit c12cd0e

Browse files
committed
Update openshift/release branch references from master to main
1 parent 7d7b5f4 commit c12cd0e

30 files changed

Lines changed: 85 additions & 79 deletions

File tree

cmd/autoowners/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ $ /usr/bin/autoowners --github-token-path=/etc/github/oauth --git-name=openshift
9090
```
9191

9292
[openshift/origin]: https://github.com/openshift/origin
93-
[openshift/origin-jobs]: https://github.com/openshift/release/tree/master/ci-operator/jobs/openshift/origin
93+
[openshift/origin-jobs]: https://github.com/openshift/release/tree/main/ci-operator/jobs/openshift/origin

cmd/ci-images-mirror/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ For example, `registry.ci.openshift.org/namespace/name:tag` is mirrored to
1515
SHA256 hash of the docker image without the prefix `sha256:`.
1616

1717
This tool is extended with the following features (and thus is no longer temporary):
18-
- mirror images from external registries to QCI: See `.supplementalCIImages` of [the configuration file](https://github.com/openshift/release/blob/master/core-services/image-mirroring/_config.yaml).
19-
- mirror ART images from app.ci to QCI: See `.artImages` of [the configuration file](https://github.com/openshift/release/blob/master/core-services/image-mirroring/_config.yaml).
18+
- mirror images from external registries to QCI: See `.supplementalCIImages` of [the configuration file](https://github.com/openshift/release/blob/main/core-services/image-mirroring/_config.yaml).
19+
- mirror ART images from app.ci to QCI: See `.artImages` of [the configuration file](https://github.com/openshift/release/blob/main/core-services/image-mirroring/_config.yaml).
2020

2121
## Run the tool locally
2222

cmd/ci-operator-yaml-creator/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func main() {
8484
}
8585
prCreationOps = append(prCreationOps, prcreation.PrBody(`
8686
This is an autogenerated PR that updates the `+"`.ci-operator.yaml`"+`
87-
to reference the `+"`build_root_image`"+` found in the [ci-operator-config](https://github.com/openshift/release/tree/master/ci-operator/config)
87+
to reference the `+"`build_root_image`"+` found in the [ci-operator-config](https://github.com/openshift/release/tree/main/ci-operator/config)
8888
in the [openshift/release](https://github.com/openshift/release) repository.
8989
9090
This is done in preparation for enabling reading the `+"`build_root`"+` from

cmd/cvp-trigger/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ To test the optional operator images built internally in Red Hat, CVP triggers
99
testing jobs via the `cvp-trigger` tool. Currently, the only implemented test
1010
workflow is the one executing the common operator tests (component-agnostic).
1111
For common operator tests, `cvp-trigger` creates a parameterized instance of the
12-
`cpaas-cvp-optional-operator-common-tests` job, living in [openshift/release](https://github.com/openshift/release/blob/master/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml).
12+
`cpaas-cvp-optional-operator-common-tests` job, living in [openshift/release](https://github.com/openshift/release/blob/main/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml).
1313
See the [Triggered Job Interface](#triggered-job-interface) section for details
1414
about the parametrization.
1515

cmd/github-ldap-user-group-creator/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
The groups are used
1111
- by `ci-operator` which promotes the group to the admins of the namespace created for the test.
12-
- in [the manifests](https://github.com/openshift/release/tree/master/clusters) of CI clusters
12+
- in [the manifests](https://github.com/openshift/release/tree/main/clusters) of CI clusters
1313
in the release repo.
1414

1515
## How it works
@@ -31,6 +31,6 @@ This tool is also responsible for deleting the users and their identities on all
3131
## How is it deployed
3232

3333
The periodic
34-
job [periodic-github-ldap-user-group-creator](https://deck-internal-ci.apps.ci.l2s4.p1.openshiftapps.com/?job=periodic-github-ldap-user-group-creator) ([definition](https://github.com/openshift/release/blob/master/ci-operator/jobs/infra-periodics.yaml))
34+
job [periodic-github-ldap-user-group-creator](https://deck-internal-ci.apps.ci.l2s4.p1.openshiftapps.com/?job=periodic-github-ldap-user-group-creator) ([definition](https://github.com/openshift/release/blob/main/ci-operator/jobs/infra-periodics.yaml))
3535
uses `github-ldap-user-group-creator` to create the groups.
36-
The service account RBACs are defined in [admin_github-ldap-user-group-creator_rbac.yaml](https://github.com/openshift/release/blob/master/clusters/build-clusters/common/assets/admin_github-ldap-user-group-creator_rbac.yaml)
36+
The service account RBACs are defined in [admin_github-ldap-user-group-creator_rbac.yaml](https://github.com/openshift/release/blob/main/clusters/build-clusters/common/assets/admin_github-ldap-user-group-creator_rbac.yaml)

cmd/gsm-secret-sync/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# GSM Secret Sync
22

3-
A tool for synchronizing Google Secret Manager (GSM) resources with OpenShift CI secret collections based on the configuration defined in [_config.yaml](https://github.com/openshift/release/blob/master/core-services/sync-rover-groups/_config.yaml).
3+
A tool for synchronizing Google Secret Manager (GSM) resources with OpenShift CI secret collections based on the configuration defined in [_config.yaml](https://github.com/openshift/release/blob/main/core-services/sync-rover-groups/_config.yaml).
44

55
## Overview
66

@@ -47,7 +47,7 @@ gsm-secret-sync \
4747

4848
## Configuration
4949

50-
The configuration file is the **source of truth** that defines groups and their secret collection access. The groups referenced in this configuration are **Rover groups** - Red Hat internal groups managed through the Rover system and synchronized by the [`sync-rover-groups`](../sync-rover-groups) tool. The actual configuration can be found at [_config.yaml](https://github.com/openshift/release/blob/master/core-services/sync-rover-groups/_config.yaml).
50+
The configuration file is the **source of truth** that defines groups and their secret collection access. The groups referenced in this configuration are **Rover groups** - Red Hat internal groups managed through the Rover system and synchronized by the [`sync-rover-groups`](../sync-rover-groups) tool. The actual configuration can be found at [_config.yaml](https://github.com/openshift/release/blob/main/core-services/sync-rover-groups/_config.yaml).
5151

5252
```yaml
5353
groups:

cmd/multi-pr-prow-plugin/server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ func TestHandle(t *testing.T) {
355355
},
356356
},
357357
},
358-
{Org: "openshift", Repo: "release", Branch: "master"}: {},
358+
{Org: "openshift", Repo: "release", Branch: "main"}: {},
359359
},
360360
},
361361
prowConfigGetter: &fakeProwConfigGetter{

cmd/payload-testing-prow-plugin/server_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ func TestBuild(t *testing.T) {
361361
CIOperatorConfig: prpqv1.CIOperatorMetadata{
362362
Org: "openshift",
363363
Repo: "release",
364-
Branch: "master",
364+
Branch: "main",
365365
Variant: "nightly-4.10",
366366
},
367367
Test: "e2e-aws-serial",
@@ -371,7 +371,7 @@ func TestBuild(t *testing.T) {
371371
CIOperatorConfig: prpqv1.CIOperatorMetadata{
372372
Org: "openshift",
373373
Repo: "release",
374-
Branch: "master",
374+
Branch: "main",
375375
Variant: "nightly-4.10",
376376
},
377377
Test: "e2e-metal-ipi",
@@ -401,12 +401,12 @@ func TestBuild(t *testing.T) {
401401
ReleaseControllerConfig: prpqv1.ReleaseControllerConfig{OCP: "4.10", Release: "nightly", Specifier: "ci"},
402402
Jobs: []prpqv1.ReleaseJobSpec{
403403
{
404-
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "master", Variant: "nightly-4.10"},
404+
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "main", Variant: "nightly-4.10"},
405405
Test: "e2e-aws-serial",
406406
AggregatedCount: 5,
407407
},
408408
{
409-
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "master", Variant: "nightly-4.10"},
409+
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "main", Variant: "nightly-4.10"},
410410
Test: "e2e-metal-ipi",
411411
AggregatedCount: 10,
412412
},
@@ -423,7 +423,7 @@ func TestBuild(t *testing.T) {
423423
CIOperatorConfig: prpqv1.CIOperatorMetadata{
424424
Org: "openshift",
425425
Repo: "release",
426-
Branch: "master",
426+
Branch: "main",
427427
Variant: "nightly-4.10",
428428
},
429429
Test: "e2e-aws-serial",
@@ -432,7 +432,7 @@ func TestBuild(t *testing.T) {
432432
CIOperatorConfig: prpqv1.CIOperatorMetadata{
433433
Org: "openshift",
434434
Repo: "release",
435-
Branch: "master",
435+
Branch: "main",
436436
Variant: "nightly-4.10",
437437
},
438438
Test: "e2e-metal-ipi",
@@ -460,11 +460,11 @@ func TestBuild(t *testing.T) {
460460
Jobs: prpqv1.PullRequestPayloadJobSpec{
461461
Jobs: []prpqv1.ReleaseJobSpec{
462462
{
463-
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "master", Variant: "nightly-4.10"},
463+
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "main", Variant: "nightly-4.10"},
464464
Test: "e2e-aws-serial",
465465
},
466466
{
467-
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "master", Variant: "nightly-4.10"},
467+
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "main", Variant: "nightly-4.10"},
468468
Test: "e2e-metal-ipi",
469469
},
470470
},
@@ -484,7 +484,7 @@ func TestBuild(t *testing.T) {
484484
CIOperatorConfig: prpqv1.CIOperatorMetadata{
485485
Org: "openshift",
486486
Repo: "release",
487-
Branch: "master",
487+
Branch: "main",
488488
Variant: "nightly-4.10",
489489
},
490490
Test: "e2e-aws-serial",
@@ -494,7 +494,7 @@ func TestBuild(t *testing.T) {
494494
CIOperatorConfig: prpqv1.CIOperatorMetadata{
495495
Org: "openshift",
496496
Repo: "release",
497-
Branch: "master",
497+
Branch: "main",
498498
Variant: "nightly-4.10",
499499
},
500500
Test: "e2e-metal-ipi",
@@ -549,12 +549,12 @@ func TestBuild(t *testing.T) {
549549
ReleaseControllerConfig: prpqv1.ReleaseControllerConfig{OCP: "4.10", Release: "nightly", Specifier: "ci"},
550550
Jobs: []prpqv1.ReleaseJobSpec{
551551
{
552-
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "master", Variant: "nightly-4.10"},
552+
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "main", Variant: "nightly-4.10"},
553553
Test: "e2e-aws-serial",
554554
AggregatedCount: 5,
555555
},
556556
{
557-
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "master", Variant: "nightly-4.10"},
557+
CIOperatorConfig: prpqv1.CIOperatorMetadata{Org: "openshift", Repo: "release", Branch: "main", Variant: "nightly-4.10"},
558558
Test: "e2e-metal-ipi",
559559
AggregatedCount: 10,
560560
},

cmd/payload-testing-ui/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ credentials, do:
4949
$ KUBECONFIG=kubeconfig.yaml payload-testing-ui --port 8000
5050
```
5151

52-
[deployment]: https://github.com/openshift/release/tree/master/clusters/app.ci/payload-testing-ui
52+
[deployment]: https://github.com/openshift/release/tree/main/clusters/app.ci/payload-testing-ui

cmd/payload-testing-ui/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ func (s *server) runDetails(w http.ResponseWriter, r *http.Request) {
315315
<h2>Release controller</h2>
316316
<ul>
317317
<li><a href="https://amd64.ocp.releases.ci.openshift.org/#%s.0-0.%s">Release status</a></li>
318-
<li><a href="https://github.com/openshift/release/blob/master/core-services/release-controller/_releases/release-ocp-%s%s.json">Configuration</a></li>
318+
<li><a href="https://github.com/openshift/release/blob/main/core-services/release-controller/_releases/release-ocp-%s%s.json">Configuration</a></li>
319319
</ul>`, ocp, release, ocp, suffix)
320320
return template.HTML(ret)
321321
},

0 commit comments

Comments
 (0)