From 2b89830f5a9f3f8de3bee22103f32e087b06a623 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Thu, 9 Dec 2021 08:34:43 +0100 Subject: [PATCH] containers-common-1-15.el9 - do not allow broken content from Pyxis to land in shortnames.conf - Related: #2000051 Signed-off-by: Jindrich Novy --- 001-rhel-shortnames-pyxis.conf | 5 +++-- containers-common.spec | 6 +++++- pyxis.sh | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/001-rhel-shortnames-pyxis.conf b/001-rhel-shortnames-pyxis.conf index 741e07d..65749e7 100644 --- a/001-rhel-shortnames-pyxis.conf +++ b/001-rhel-shortnames-pyxis.conf @@ -584,6 +584,7 @@ "fujitsu/fujitsu-enterprise-postgres-13-server" = "quay.io/fujitsu/fujitsu-enterprise-postgres-13-server" "fujitsu-postgres/fujitsu-enterprise-postgres-13-bundle" = "registry.redhat.io/fujitsu-postgres/fujitsu-enterprise-postgres-13-bundle" "fujitsu-postgres/fujitsu-enterprise-postgres-bundle" = "registry.connect.redhat.com/fujitsu-postgres/fujitsu-enterprise-postgres-bundle" +"fujitsu-postgres/fujitsu-enterprise-postgres-operator" = "registry.connect.redhat.com/fujitsu-postgres/fujitsu-enterprise-postgres-operator" "fujitsu/rhosp13-fujitsu-cinder-volume-161" = "registry.connect.redhat.com/fujitsu/rhosp13-fujitsu-cinder-volume-161" "fujitsu/rhosp15-fujitsu-cinder-volume-161" = "registry.redhat.io/fujitsu/rhosp15-fujitsu-cinder-volume-161" "fuse7/fuse-apicurito-generator-rhel8" = "registry.redhat.io/fuse7/fuse-apicurito-generator-rhel8" @@ -787,6 +788,7 @@ "ibm/odm-decisionserverconsole" = "registry.connect.redhat.com/ibm/odm-decisionserverconsole" "ibm/odm-decisionserverruntime" = "registry.connect.redhat.com/ibm/odm-decisionserverruntime" "ibm/open-liberty-operator-bundle" = "registry.connect.redhat.com/ibm/open-liberty-operator-bundle" +"ibm/open-liberty-operator-controller" = "registry.connect.redhat.com/ibm/open-liberty-operator-controller" "ibm/open-liberty-operator" = "registry.connect.redhat.com/ibm/open-liberty-operator" "ibm/open-liberty-samples" = "registry.connect.redhat.com/ibm/open-liberty-samples" "ibm/pai4sk" = "registry.redhat.io/ibm/pai4sk" @@ -1014,7 +1016,6 @@ "multicluster-engine/registration-operator-rhel8" = "registry.redhat.io/multicluster-engine/registration-operator-rhel8" "multicluster-engine/registration-rhel8" = "registry.redhat.io/multicluster-engine/registration-rhel8" "multicluster-engine/work-rhel8" = "registry.redhat.io/multicluster-engine/work-rhel8" -"[namespace]/ht-getkey1" = "registry.connect.redhat.com/[namespace]/ht-getkey1" "nastel/nastel-activemq" = "registry.connect.redhat.com/nastel/nastel-activemq" "nastel/nastel-ap-domain" = "registry.connect.redhat.com/nastel/nastel-ap-domain" "nastel/nastel-domain" = "registry.connect.redhat.com/nastel/nastel-domain" @@ -1518,7 +1519,6 @@ "openshift4/ose-cluster-baremetal-operator-rhel8" = "registry.redhat.io/openshift4/ose-cluster-baremetal-operator-rhel8" "openshift4/ose-cluster-bootstrap" = "registry.redhat.io/openshift4/ose-cluster-bootstrap" "openshift4/ose-cluster-capacity" = "registry.redhat.io/openshift4/ose-cluster-capacity" -"openshift4/ose-cluster-capi-operator-container-rhel8" = "registry.redhat.io/openshift4/ose-cluster-capi-operator-container-rhel8" "openshift4/ose-cluster-cloud-controller-manager-operator-rhel8" = "registry.redhat.io/openshift4/ose-cluster-cloud-controller-manager-operator-rhel8" "openshift4/ose-cluster-config-operator" = "registry.redhat.io/openshift4/ose-cluster-config-operator" "openshift4/ose-cluster-dns-operator" = "registry.redhat.io/openshift4/ose-cluster-dns-operator" @@ -2534,6 +2534,7 @@ "sumologic/sumologic-kubernetes-collection-helm-operator-bundle" = "registry.redhat.io/sumologic/sumologic-kubernetes-collection-helm-operator-bundle" "sumologic/sumologic-kubernetes-collection-helm-operator" = "registry.connect.redhat.com/sumologic/sumologic-kubernetes-collection-helm-operator" "sysdig/agent" = "registry.connect.redhat.com/sysdig/agent" +"thalescpl/lunaclient" = "registry.redhat.io/thalescpl/lunaclient" "thestormforge/optimize-controller-ubi8" = "registry.connect.redhat.com/thestormforge/optimize-controller-ubi8" "thestormforge/stormforge-optimize" = "registry.connect.redhat.com/thestormforge/stormforge-optimize" "tigera/operator-init" = "quay.io/tigera/operator-init" diff --git a/containers-common.spec b/containers-common.spec index 8bd3463..7a2d79d 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -12,7 +12,7 @@ Epoch: 2 Name: containers-common Version: 1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildArch: noarch @@ -160,6 +160,10 @@ EOF %{_datadir}/rhel/secrets/* %changelog +* Thu Dec 09 2021 Jindrich Novy - 2:1-15 +- do not allow broken content from Pyxis to land in shortnames.conf +- Related: #2000051 + * Wed Dec 08 2021 Jindrich Novy - 2:1-14 - update vendored component versions - sync shortname aliases via Pyxis diff --git a/pyxis.sh b/pyxis.sh index 6f76365..ad8423f 100755 --- a/pyxis.sh +++ b/pyxis.sh @@ -20,6 +20,7 @@ while read -r LINE; do [ $REPOSITORY == \"\" ] || [ "$AVAILABLE" != "Generally Available" ] || [[ $REPOSITORY == *[@:]* ]] || + [[ $REPOSITORY == *[* ]] || [[ "$REGISTRY" == *non_registry* ]] || [[ $REGISTRY != *.* ]] then