Skip to content

Commit

Permalink
('openshift#6552'): Update registry.svc.ci.openshift.org to registry.…
Browse files Browse the repository at this point in the history 
…ci.openshift.org (openshift#6553)

Signed-off-by: Arthur <[email protected]>
  • Loading branch information
@ArthurVardevanyan @eifrach
ArthurVardevanyan authored and eifrach committed Aug 4, 2024
1 parent c306f2a commit fc98c54
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion api/v1beta1/agentserviceconfig_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ type AgentServiceConfigSpec struct {
IPXEHTTPRoute string `json:"iPXEHTTPRoute,omitempty"`
// UnauthenticatedRegistries is a list of registries from which container images can be pulled
// without authentication. They will be appended to the default list (quay.io,
// registry.svc.ci.openshift.org). Any registry on this list will not require credentials
// registry.ci.openshift.org). Any registry on this list will not require credentials
// to be in the pull secret validated by the assisted-service.
//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="List of container registries without authentication"
// +optional
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/agent-install.openshift.io_agentserviceconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ spec:
unauthenticatedRegistries:
description: UnauthenticatedRegistries is a list of registries from
which container images can be pulled without authentication. They
will be appended to the default list (quay.io, registry.svc.ci.openshift.org).
will be appended to the default list (quay.io, registry.ci.openshift.org).
Any registry on this list will not require credentials to be in
the pull secret validated by the assisted-service.
items:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ spec:
unauthenticatedRegistries:
description: UnauthenticatedRegistries is a list of registries from
which container images can be pulled without authentication. They
will be appended to the default list (quay.io, registry.svc.ci.openshift.org).
will be appended to the default list (quay.io, registry.ci.openshift.org).
Any registry on this list will not require credentials to be in
the pull secret validated by the assisted-service.
items:
Expand Down
4 changes: 2 additions & 2 deletions config/crd/resources.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1869,7 +1869,7 @@ spec:
unauthenticatedRegistries:
description: UnauthenticatedRegistries is a list of registries from
which container images can be pulled without authentication. They
will be appended to the default list (quay.io, registry.svc.ci.openshift.org).
will be appended to the default list (quay.io, registry.ci.openshift.org).
Any registry on this list will not require credentials to be in
the pull secret validated by the assisted-service.
items:
Expand Down Expand Up @@ -2699,7 +2699,7 @@ spec:
unauthenticatedRegistries:
description: UnauthenticatedRegistries is a list of registries from
which container images can be pulled without authentication. They
will be appended to the default list (quay.io, registry.svc.ci.openshift.org).
will be appended to the default list (quay.io, registry.ci.openshift.org).
Any registry on this list will not require credentials to be in
the pull secret validated by the assisted-service.
items:
Expand Down
4 changes: 2 additions & 2 deletions config/manifests/bases/assisted-service-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ spec:
path: osImages
- description: UnauthenticatedRegistries is a list of registries from which
container images can be pulled without authentication. They will be appended
to the default list (quay.io, registry.svc.ci.openshift.org). Any registry
on this list will not require credentials to be in the pull secret validated
to the default list (quay.io, registry.ci.openshift.org). Any registry on
this list will not require credentials to be in the pull secret validated
by the assisted-service.
displayName: List of container registries without authentication
path: unauthenticatedRegistries
Expand Down
2 changes: 1 addition & 1 deletion deploy/olm-catalog/manifests/agent-install.openshift.io_agentserviceconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ spec:
unauthenticatedRegistries:
description: UnauthenticatedRegistries is a list of registries from
which container images can be pulled without authentication. They
will be appended to the default list (quay.io, registry.svc.ci.openshift.org).
will be appended to the default list (quay.io, registry.ci.openshift.org).
Any registry on this list will not require credentials to be in
the pull secret validated by the assisted-service.
items:
Expand Down
2 changes: 1 addition & 1 deletion deploy/olm-catalog/manifests/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ spec:
unauthenticatedRegistries:
description: UnauthenticatedRegistries is a list of registries from
which container images can be pulled without authentication. They
will be appended to the default list (quay.io, registry.svc.ci.openshift.org).
will be appended to the default list (quay.io, registry.ci.openshift.org).
Any registry on this list will not require credentials to be in
the pull secret validated by the assisted-service.
items:
Expand Down
4 changes: 2 additions & 2 deletions deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,8 @@ spec:
path: osImages
- description: UnauthenticatedRegistries is a list of registries from which
container images can be pulled without authentication. They will be appended
to the default list (quay.io, registry.svc.ci.openshift.org). Any registry
on this list will not require credentials to be in the pull secret validated
to the default list (quay.io, registry.ci.openshift.org). Any registry on
this list will not require credentials to be in the pull secret validated
by the assisted-service.
displayName: List of container registries without authentication
path: unauthenticatedRegistries
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/controllers/agentserviceconfig_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@ func urlForRoute(ctx context.Context, asc ASC, routeName string) (string, error)

// unauthenticatedRegistries appends mirror registries and user-specified unauthenticated registries to the default list
func unauthenticatedRegistries(ctx context.Context, asc ASC) string {
unauthenticatedRegistries := []string{"quay.io", "registry.svc.ci.openshift.org"}
unauthenticatedRegistries := []string{"quay.io", "registry.ci.openshift.org"}
if asc.spec.MirrorRegistryRef != nil {
cm := &corev1.ConfigMap{}
// Any errors in the following code block is not handled since they indicate a problem with the
Expand Down
10 changes: 5 additions & 5 deletions internal/controller/controllers/agentserviceconfig_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2195,15 +2195,15 @@ var _ = Describe("newAssistedCM", func() {
})

It("default public container registries", func() {
ensureNewAssistedConfigmapValue(ctx, log, ascc, "PUBLIC_CONTAINER_REGISTRIES", "quay.io,registry.svc.ci.openshift.org")
ensureNewAssistedConfigmapValue(ctx, log, ascc, "PUBLIC_CONTAINER_REGISTRIES", "quay.io,registry.ci.openshift.org")
})
It("adds unqualified-search-registries", func() {
asc.Spec.MirrorRegistryRef = &corev1.LocalObjectReference{Name: testMirrorRegConfigmapName}
mirrorCM.Data[mirrorRegistryRefRegistryConfKey] = registryConf
ascr := newTestReconciler(asc, route, imageRoute, mirrorCM)
ascc = initASC(ascr, asc)
ensureNewAssistedConfigmapValue(
ctx, log, ascc, "PUBLIC_CONTAINER_REGISTRIES", "quay.io,registry.svc.ci.openshift.org,registry.access.redhat.com,docker.io,registry.ci.openshift.org",
ctx, log, ascc, "PUBLIC_CONTAINER_REGISTRIES", "quay.io,registry.ci.openshift.org,registry.access.redhat.com,docker.io",
)
})
It("adds mirror registries", func() {
Expand All @@ -2216,7 +2216,7 @@ var _ = Describe("newAssistedCM", func() {
log,
ascc,
"PUBLIC_CONTAINER_REGISTRIES",
"quay.io,registry.svc.ci.openshift.org,registry.access.redhat.com,docker.io,registry.ci.openshift.org",
"quay.io,registry.ci.openshift.org,registry.access.redhat.com,docker.io",
)
})
It("adds user-specified unauthenticated registries", func() {
Expand All @@ -2226,7 +2226,7 @@ var _ = Describe("newAssistedCM", func() {
log,
ascc,
"PUBLIC_CONTAINER_REGISTRIES",
"quay.io,registry.svc.ci.openshift.org,example.com",
"quay.io,registry.ci.openshift.org,example.com",
)
})
It("ignores duplicate values", func() {
Expand All @@ -2240,7 +2240,7 @@ var _ = Describe("newAssistedCM", func() {
log,
ascc,
"PUBLIC_CONTAINER_REGISTRIES",
"quay.io,registry.svc.ci.openshift.org,registry.access.redhat.com,docker.io,registry.ci.openshift.org,example.com")
"quay.io,registry.ci.openshift.org,registry.access.redhat.com,docker.io,example.com")
})
})

Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/openshift/assisted-service/api/v1beta1/agentserviceconfig_types.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit fc98c54

Please sign in to comment.