From 1d9e72c0e4758b3f37b45ea372daecf4865768fc Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 10 Jul 2024 02:49:03 +0000 Subject: [PATCH] ('#6552'): Update registry.svc.ci.openshift.org to registry.ci.openshift.org Signed-off-by: Arthur --- api/v1beta1/agentserviceconfig_types.go | 2 +- ...agent-install.openshift.io_agentserviceconfigs.yaml | 2 +- ...all.openshift.io_hypershiftagentserviceconfigs.yaml | 2 +- config/crd/resources.yaml | 4 ++-- ...ssisted-service-operator.clusterserviceversion.yaml | 2 +- ...agent-install.openshift.io_agentserviceconfigs.yaml | 2 +- ...all.openshift.io_hypershiftagentserviceconfigs.yaml | 2 +- ...ssisted-service-operator.clusterserviceversion.yaml | 2 +- .../controllers/agentserviceconfig_controller.go | 2 +- .../controllers/agentserviceconfig_controller_test.go | 10 +++++----- .../api/v1beta1/agentserviceconfig_types.go | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api/v1beta1/agentserviceconfig_types.go b/api/v1beta1/agentserviceconfig_types.go index 552684349e7..6a5671d8865 100644 --- a/api/v1beta1/agentserviceconfig_types.go +++ b/api/v1beta1/agentserviceconfig_types.go @@ -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 diff --git a/config/crd/bases/agent-install.openshift.io_agentserviceconfigs.yaml b/config/crd/bases/agent-install.openshift.io_agentserviceconfigs.yaml index 7ce49f1799e..0e417e08ac8 100644 --- a/config/crd/bases/agent-install.openshift.io_agentserviceconfigs.yaml +++ b/config/crd/bases/agent-install.openshift.io_agentserviceconfigs.yaml @@ -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: diff --git a/config/crd/bases/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml b/config/crd/bases/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml index 7cb21efe539..041f13bbbea 100644 --- a/config/crd/bases/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml +++ b/config/crd/bases/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml @@ -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: diff --git a/config/crd/resources.yaml b/config/crd/resources.yaml index da43d9ec645..5761e5a3676 100644 --- a/config/crd/resources.yaml +++ b/config/crd/resources.yaml @@ -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: @@ -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: diff --git a/config/manifests/bases/assisted-service-operator.clusterserviceversion.yaml b/config/manifests/bases/assisted-service-operator.clusterserviceversion.yaml index 318978b57f0..44e7574daf8 100644 --- a/config/manifests/bases/assisted-service-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/assisted-service-operator.clusterserviceversion.yaml @@ -97,7 +97,7 @@ 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 + 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 diff --git a/deploy/olm-catalog/manifests/agent-install.openshift.io_agentserviceconfigs.yaml b/deploy/olm-catalog/manifests/agent-install.openshift.io_agentserviceconfigs.yaml index a1ec3886aed..1c6677149bd 100644 --- a/deploy/olm-catalog/manifests/agent-install.openshift.io_agentserviceconfigs.yaml +++ b/deploy/olm-catalog/manifests/agent-install.openshift.io_agentserviceconfigs.yaml @@ -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: diff --git a/deploy/olm-catalog/manifests/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml b/deploy/olm-catalog/manifests/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml index afb6e820d7e..da7ef396cac 100644 --- a/deploy/olm-catalog/manifests/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml +++ b/deploy/olm-catalog/manifests/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml @@ -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: diff --git a/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml b/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml index 4c5836f1cc9..4fb17faae72 100644 --- a/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml @@ -353,7 +353,7 @@ 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 + 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 diff --git a/internal/controller/controllers/agentserviceconfig_controller.go b/internal/controller/controllers/agentserviceconfig_controller.go index a378f53617a..dce2b884357 100644 --- a/internal/controller/controllers/agentserviceconfig_controller.go +++ b/internal/controller/controllers/agentserviceconfig_controller.go @@ -1122,7 +1122,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 diff --git a/internal/controller/controllers/agentserviceconfig_controller_test.go b/internal/controller/controllers/agentserviceconfig_controller_test.go index 7a590e5c10d..e560b82b8ae 100644 --- a/internal/controller/controllers/agentserviceconfig_controller_test.go +++ b/internal/controller/controllers/agentserviceconfig_controller_test.go @@ -2192,7 +2192,7 @@ 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} @@ -2200,7 +2200,7 @@ var _ = Describe("newAssistedCM", func() { 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.access.redhat.com,docker.io,registry.ci.openshift.org", ) }) It("adds mirror registries", func() { @@ -2213,7 +2213,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.access.redhat.com,docker.io,registry.ci.openshift.org", ) }) It("adds user-specified unauthenticated registries", func() { @@ -2223,7 +2223,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() { @@ -2237,7 +2237,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.access.redhat.com,docker.io,registry.ci.openshift.org,example.com") }) }) diff --git a/vendor/github.com/openshift/assisted-service/api/v1beta1/agentserviceconfig_types.go b/vendor/github.com/openshift/assisted-service/api/v1beta1/agentserviceconfig_types.go index 552684349e7..6a5671d8865 100644 --- a/vendor/github.com/openshift/assisted-service/api/v1beta1/agentserviceconfig_types.go +++ b/vendor/github.com/openshift/assisted-service/api/v1beta1/agentserviceconfig_types.go @@ -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