From c8b377d6fe83ee1e645bbe9d323f5da6489d3285 Mon Sep 17 00:00:00 2001 From: Joep van Delft Date: Thu, 24 Oct 2024 10:17:10 +0200 Subject: [PATCH] scan-sources:noop 4.11: Remove non_shipping_repos --- images/cluster-monitoring-operator.yml | 3 +-- images/cluster-node-tuning-operator.yml | 2 -- images/configmap-reload.yml | 3 +-- images/driver-toolkit.yml | 2 -- images/golang-github-prometheus-alertmanager.yml | 2 -- images/golang-github-prometheus-node_exporter.yml | 5 +---- images/golang-github-prometheus-prometheus.yml | 2 -- images/grafana.yml | 3 +-- images/kuryr-cni.yml | 2 -- images/kuryr-controller.yml | 2 -- images/multus-cni.yml | 3 +-- images/openshift-enterprise-base.yml | 5 ++--- images/openshift-enterprise-builder.yml | 3 +-- images/openshift-enterprise-cli.yml | 3 +-- images/openshift-enterprise-cluster-capacity.yml | 6 ++---- images/openshift-enterprise-console.yml | 3 +-- images/openshift-enterprise-deployer.yml | 4 +--- images/openshift-enterprise-egress-router.yml | 3 +-- images/openshift-enterprise-haproxy-router.yml | 5 +---- images/openshift-enterprise-hyperkube.yml | 3 +-- images/openshift-enterprise-keepalived-ipfailover.yml | 4 +--- images/openshift-enterprise-operator-sdk.yml | 2 -- images/openshift-enterprise-pod.yml | 5 +---- images/openshift-enterprise-registry.yml | 4 +--- images/openshift-enterprise-tests.yml | 3 +-- images/operator-lifecycle-manager.yml | 3 +-- images/ose-agent-installer-api-server.yml | 2 -- images/ose-aws-cloud-controller-manager.yml | 3 +-- images/ose-azure-cloud-controller-manager.yml | 3 +-- images/ose-azure-cloud-node-manager.yml | 3 +-- images/ose-egress-http-proxy.yml | 3 +-- images/ose-etcd.yml | 3 +-- images/ose-frr.yml | 2 -- images/ose-haproxy-router-base.yml | 3 +-- images/ose-machine-os-images.yml | 4 ---- images/ose-metallb-operator.yml | 3 +-- images/ose-openstack-cloud-controller-manager.yml | 3 +-- images/ose-ovn-kubernetes.yml | 3 +-- images/ose-tools.yml | 5 +---- images/prom-label-proxy.yml | 2 -- images/prometheus-config-reloader.yml | 3 +-- images/prometheus-operator.yml | 3 +-- images/thanos.yml | 2 -- 43 files changed, 33 insertions(+), 102 deletions(-) diff --git a/images/cluster-monitoring-operator.yml b/images/cluster-monitoring-operator.yml index be45683788..51d12f897d 100644 --- a/images/cluster-monitoring-operator.yml +++ b/images/cluster-monitoring-operator.yml @@ -21,8 +21,7 @@ from: member: openshift-enterprise-base labels: License: ASL 2.0 - io.k8s.description: This is a component of OpenShift Container Platform and manages - the lifecycle of the Prometheus based cluster monitoring stack. + io.k8s.description: This is a component of OpenShift Container Platform and manages the lifecycle of the Prometheus based cluster monitoring stack. io.k8s.display-name: OpenShift cluster-monitoring-operator io.openshift.tags: openshift vendor: Red Hat diff --git a/images/cluster-node-tuning-operator.yml b/images/cluster-node-tuning-operator.yml index fb9e2a51bb..e5ac42c226 100644 --- a/images/cluster-node-tuning-operator.yml +++ b/images/cluster-node-tuning-operator.yml @@ -26,5 +26,3 @@ from: name: openshift/ose-cluster-node-tuning-operator owners: - openshift-psap@redhat.com -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed diff --git a/images/configmap-reload.yml b/images/configmap-reload.yml index be8ffdd615..433effe626 100644 --- a/images/configmap-reload.yml +++ b/images/configmap-reload.yml @@ -21,8 +21,7 @@ from: member: openshift-enterprise-base labels: License: ASL 2.0 - io.k8s.description: This is a component reloads another process if a configured - configmap volume is remounted. + io.k8s.description: This is a component reloads another process if a configured configmap volume is remounted. io.k8s.display-name: configmap reload io.openshift.tags: kubernetes vendor: Red Hat diff --git a/images/driver-toolkit.yml b/images/driver-toolkit.yml index 6520fd8a31..50f0d5dfe0 100644 --- a/images/driver-toolkit.yml +++ b/images/driver-toolkit.yml @@ -32,5 +32,3 @@ from: name: openshift/ose-driver-toolkit owners: - edge-sro@redhat.com -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed diff --git a/images/golang-github-prometheus-alertmanager.yml b/images/golang-github-prometheus-alertmanager.yml index 6b80235f64..86b70662cf 100644 --- a/images/golang-github-prometheus-alertmanager.yml +++ b/images/golang-github-prometheus-alertmanager.yml @@ -26,7 +26,5 @@ labels: io.openshift.tags: openshift,prometheus vendor: Red Hat name: openshift/ose-prometheus-alertmanager -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed owners: - team-monitoring@redhat.com diff --git a/images/golang-github-prometheus-node_exporter.yml b/images/golang-github-prometheus-node_exporter.yml index ee4a35843a..206702f631 100644 --- a/images/golang-github-prometheus-node_exporter.yml +++ b/images/golang-github-prometheus-node_exporter.yml @@ -21,13 +21,10 @@ from: member: openshift-base-rhel8 labels: License: ASL 2.0 - io.k8s.description: Prometheus exporter for hardware and OS metrics exposed by *NIX - kernels, written in Go with pluggable metric collectors + io.k8s.description: Prometheus exporter for hardware and OS metrics exposed by *NIX kernels, written in Go with pluggable metric collectors io.k8s.display-name: Node Exporter io.openshift.tags: openshift,node vendor: Red Hat name: openshift/ose-prometheus-node-exporter -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed owners: - team-monitoring@redhat.com diff --git a/images/golang-github-prometheus-prometheus.yml b/images/golang-github-prometheus-prometheus.yml index 822f649da6..287e319871 100644 --- a/images/golang-github-prometheus-prometheus.yml +++ b/images/golang-github-prometheus-prometheus.yml @@ -26,7 +26,5 @@ labels: io.openshift.tags: openshift,prometheus vendor: Red Hat name: openshift/ose-prometheus -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed owners: - team-monitoring@redhat.com diff --git a/images/grafana.yml b/images/grafana.yml index 3d59914e5b..4589c76927 100644 --- a/images/grafana.yml +++ b/images/grafana.yml @@ -22,8 +22,7 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: Grafana is an open source, feature rich metrics dashboard and - graph editor for Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB. + io.k8s.description: Grafana is an open source, feature rich metrics dashboard and graph editor for Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB. io.k8s.display-name: Grafana io.openshift.tags: openshift vendor: Red Hat diff --git a/images/kuryr-cni.yml b/images/kuryr-cni.yml index 293908221d..fd4c3e5d55 100644 --- a/images/kuryr-cni.yml +++ b/images/kuryr-cni.yml @@ -40,5 +40,3 @@ name: openshift/ose-kuryr-cni owners: - kuryr-team@redhat.com - mdulko@redhat.com -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed diff --git a/images/kuryr-controller.yml b/images/kuryr-controller.yml index 531b918f63..6b9a9d892a 100644 --- a/images/kuryr-controller.yml +++ b/images/kuryr-controller.yml @@ -34,5 +34,3 @@ name: openshift/ose-kuryr-controller owners: - kuryr-team@redhat.com - mdulko@redhat.com -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed diff --git a/images/multus-cni.yml b/images/multus-cni.yml index 4bcf8fade8..79b39e8e1a 100644 --- a/images/multus-cni.yml +++ b/images/multus-cni.yml @@ -23,8 +23,7 @@ from: - stream: golang member: openshift-enterprise-base labels: - io.k8s.description: This is a component of OpenShift Container Platform and provides - a meta CNI plugin. + io.k8s.description: This is a component of OpenShift Container Platform and provides a meta CNI plugin. io.k8s.display-name: Multus CNI io.openshift.tags: openshift vendor: Red Hat diff --git a/images/openshift-enterprise-base.yml b/images/openshift-enterprise-base.yml index 129d460a0d..5d03182663 100644 --- a/images/openshift-enterprise-base.yml +++ b/images/openshift-enterprise-base.yml @@ -14,7 +14,7 @@ content: auto_label: - approved - lgtm - merge_first: true + merge_first: true # The OpenShift 4.x:base image used by numerous images in CI. # The problem is that the actual image is built upstream very infrequently @@ -50,8 +50,7 @@ from: member: openshift-base-rhel8 labels: License: GPLv2+ - io.k8s.description: This is the base image from which all OpenShift Container Platform - images inherit. + io.k8s.description: This is the base image from which all OpenShift Container Platform images inherit. io.k8s.display-name: OpenShift Container Platform RHEL 7 Base io.openshift.tags: openshift,base vendor: Red Hat diff --git a/images/openshift-enterprise-builder.yml b/images/openshift-enterprise-builder.yml index 813b7cf18b..c0a411dd52 100644 --- a/images/openshift-enterprise-builder.yml +++ b/images/openshift-enterprise-builder.yml @@ -21,8 +21,7 @@ from: member: openshift-base-rhel8 labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform and is responsible - for executing container image builds. + io.k8s.description: This is a component of OpenShift Container Platform and is responsible for executing container image builds. io.k8s.display-name: OpenShift Container Platform Container Builder io.openshift.tags: openshift,builder vendor: Red Hat diff --git a/images/openshift-enterprise-cli.yml b/images/openshift-enterprise-cli.yml index 323e85abb3..fb45574b9f 100644 --- a/images/openshift-enterprise-cli.yml +++ b/images/openshift-enterprise-cli.yml @@ -22,8 +22,7 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: OpenShift is a platform for developing, building, and deploying - containerized applications. + io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications. io.k8s.display-name: OpenShift Client io.openshift.tags: openshift,cli vendor: Red Hat diff --git a/images/openshift-enterprise-cluster-capacity.yml b/images/openshift-enterprise-cluster-capacity.yml index 34038ffb9f..484d72ccfa 100644 --- a/images/openshift-enterprise-cluster-capacity.yml +++ b/images/openshift-enterprise-cluster-capacity.yml @@ -20,13 +20,11 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform and runs - Cluster Capacity analysis tool. + io.k8s.description: This is a component of OpenShift Container Platform and runs Cluster Capacity analysis tool. io.k8s.display-name: OpenShift Container Platform Cluster Capacity io.openshift.tags: openshift,cluster-capacity vendor: Red Hat - summary: Framework that estimates a number of instances of a specified pod that - would be scheduled in a cluster + summary: Framework that estimates a number of instances of a specified pod that would be scheduled in a cluster name: openshift/ose-cluster-capacity owners: - jchaloup@redhat.com diff --git a/images/openshift-enterprise-console.yml b/images/openshift-enterprise-console.yml index 25b2389721..ebf6da7918 100644 --- a/images/openshift-enterprise-console.yml +++ b/images/openshift-enterprise-console.yml @@ -32,8 +32,7 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform and provides - a web console. + io.k8s.description: This is a component of OpenShift Container Platform and provides a web console. io.k8s.display-name: OpenShift Console io.openshift.tags: openshift,console vendor: Red Hat diff --git a/images/openshift-enterprise-deployer.yml b/images/openshift-enterprise-deployer.yml index 35ef1adff5..0b5888e214 100644 --- a/images/openshift-enterprise-deployer.yml +++ b/images/openshift-enterprise-deployer.yml @@ -15,9 +15,7 @@ from: member: openshift-enterprise-cli labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform and executes - the user deployment process to roll out new containers. It may be used as a base - image for building your own custom deployer image. + io.k8s.description: This is a component of OpenShift Container Platform and executes the user deployment process to roll out new containers. It may be used as a base image for building your own custom deployer image. io.k8s.display-name: OpenShift Container Platform Deployer io.openshift.tags: openshift,deployer vendor: Red Hat diff --git a/images/openshift-enterprise-egress-router.yml b/images/openshift-enterprise-egress-router.yml index 0acad24d4e..21fc61df45 100644 --- a/images/openshift-enterprise-egress-router.yml +++ b/images/openshift-enterprise-egress-router.yml @@ -14,8 +14,7 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform and contains - an egress router. + io.k8s.description: This is a component of OpenShift Container Platform and contains an egress router. io.k8s.display-name: OpenShift Container Platform Egress Router io.openshift.tags: openshift,router,egress vendor: Red Hat diff --git a/images/openshift-enterprise-haproxy-router.yml b/images/openshift-enterprise-haproxy-router.yml index 59fd7c6ea5..fc350f1450 100644 --- a/images/openshift-enterprise-haproxy-router.yml +++ b/images/openshift-enterprise-haproxy-router.yml @@ -15,10 +15,7 @@ from: member: ose-haproxy-router-base labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform and contains - an HAProxy instance that automatically exposes services within the cluster through - routes, and offers TLS termination, reencryption, or SNI-passthrough on ports - 80 and 443. + io.k8s.description: This is a component of OpenShift Container Platform and contains an HAProxy instance that automatically exposes services within the cluster through routes, and offers TLS termination, reencryption, or SNI-passthrough on ports 80 and 443. io.k8s.display-name: OpenShift Container Platform HAProxy Router io.openshift.tags: openshift,router,haproxy vendor: Red Hat diff --git a/images/openshift-enterprise-hyperkube.yml b/images/openshift-enterprise-hyperkube.yml index ba42ca8981..11e5577ba7 100644 --- a/images/openshift-enterprise-hyperkube.yml +++ b/images/openshift-enterprise-hyperkube.yml @@ -26,8 +26,7 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: OpenShift is a platform for developing, building, and deploying - containerized applications. + io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications. io.k8s.display-name: OpenShift Kubernetes Server Commands io.openshift.tags: openshift,hyperkube vendor: Red Hat diff --git a/images/openshift-enterprise-keepalived-ipfailover.yml b/images/openshift-enterprise-keepalived-ipfailover.yml index 92ae9bdba9..3051826d7c 100644 --- a/images/openshift-enterprise-keepalived-ipfailover.yml +++ b/images/openshift-enterprise-keepalived-ipfailover.yml @@ -14,9 +14,7 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform and runs - a clustered keepalived instance across multiple hosts to allow highly available - IP addresses. + io.k8s.description: This is a component of OpenShift Container Platform and runs a clustered keepalived instance across multiple hosts to allow highly available IP addresses. io.k8s.display-name: OpenShift Container Platform IP Failover io.openshift.tags: openshift,ha,ip,failover vendor: Red Hat diff --git a/images/openshift-enterprise-operator-sdk.yml b/images/openshift-enterprise-operator-sdk.yml index 0bbcca769d..9eb49bdeaf 100644 --- a/images/openshift-enterprise-operator-sdk.yml +++ b/images/openshift-enterprise-operator-sdk.yml @@ -28,5 +28,3 @@ owners: - jlanford@redhat.com - fabian@redhat.com - cmacedo@redhat.com -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed diff --git a/images/openshift-enterprise-pod.yml b/images/openshift-enterprise-pod.yml index 0e74e6da30..916da0edfa 100644 --- a/images/openshift-enterprise-pod.yml +++ b/images/openshift-enterprise-pod.yml @@ -26,13 +26,10 @@ maintainer: component: Node labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform and holds - on to the shared Linux namespaces within a Pod. + io.k8s.description: This is a component of OpenShift Container Platform and holds on to the shared Linux namespaces within a Pod. io.k8s.display-name: OpenShift Container Platform Pod Infrastructure io.openshift.tags: openshift,pod vendor: Red Hat name: openshift/ose-pod -non_shipping_repos: -- rhel-8-codeready-builder-rpms owners: - aos-pod@redhat.com diff --git a/images/openshift-enterprise-registry.yml b/images/openshift-enterprise-registry.yml index 026b2325bf..f978519769 100644 --- a/images/openshift-enterprise-registry.yml +++ b/images/openshift-enterprise-registry.yml @@ -20,9 +20,7 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform and exposes - a container registry that is integrated with the cluster for authentication and - management. + io.k8s.description: This is a component of OpenShift Container Platform and exposes a container registry that is integrated with the cluster for authentication and management. io.k8s.display-name: OpenShift Container Platform Image Registry io.openshift.tags: openshift,container,image,registry vendor: Red Hat diff --git a/images/openshift-enterprise-tests.yml b/images/openshift-enterprise-tests.yml index 4652736768..48f68c7068 100644 --- a/images/openshift-enterprise-tests.yml +++ b/images/openshift-enterprise-tests.yml @@ -34,8 +34,7 @@ from: member: ose-tools labels: License: GPLv2+ - io.k8s.description: OpenShift is a platform for developing, building, and deploying - containerized applications. + io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications. io.k8s.display-name: OpenShift End-to-End Tests io.openshift.tags: openshift,tests,e2e vendor: Red Hat diff --git a/images/operator-lifecycle-manager.yml b/images/operator-lifecycle-manager.yml index 1833d2e911..5e8401065c 100644 --- a/images/operator-lifecycle-manager.yml +++ b/images/operator-lifecycle-manager.yml @@ -22,8 +22,7 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform and runs - the Operator Lifecycle Manager + io.k8s.description: This is a component of OpenShift Container Platform and runs the Operator Lifecycle Manager io.k8s.display-name: OpenShift Container Platform Operator Lifecycle Manager vendor: Red Hat name: openshift/ose-operator-lifecycle-manager diff --git a/images/ose-agent-installer-api-server.yml b/images/ose-agent-installer-api-server.yml index 731a7933bf..89e17751a6 100644 --- a/images/ose-agent-installer-api-server.yml +++ b/images/ose-agent-installer-api-server.yml @@ -26,5 +26,3 @@ maintainer: name: openshift/ose-agent-installer-api-server owners: - ocp-agent-team@redhat.com -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed diff --git a/images/ose-aws-cloud-controller-manager.yml b/images/ose-aws-cloud-controller-manager.yml index 2f1734daa1..7b47f67f58 100644 --- a/images/ose-aws-cloud-controller-manager.yml +++ b/images/ose-aws-cloud-controller-manager.yml @@ -24,8 +24,7 @@ from: member: openshift-enterprise-base labels: License: ASL 2.0 - io.k8s.description: This is a component of OpenShift Container Platform and provides - AWS Cloud Controller Manager + io.k8s.description: This is a component of OpenShift Container Platform and provides AWS Cloud Controller Manager io.k8s.display-name: OpenShift AWS Cloud Controller Manager io.openshift.tags: openshift,cloud-controller-manager,aws vendor: Red Hat diff --git a/images/ose-azure-cloud-controller-manager.yml b/images/ose-azure-cloud-controller-manager.yml index f4026f4f07..cf63de893f 100644 --- a/images/ose-azure-cloud-controller-manager.yml +++ b/images/ose-azure-cloud-controller-manager.yml @@ -24,8 +24,7 @@ from: member: openshift-enterprise-base labels: License: ASL 2.0 - io.k8s.description: This is a component of OpenShift Container Platform and provides - Azure Cloud Controller Manager + io.k8s.description: This is a component of OpenShift Container Platform and provides Azure Cloud Controller Manager io.k8s.display-name: OpenShift Azure Cloud Controller Manager io.openshift.tags: openshift,cloud-controller-manager,azure vendor: Red Hat diff --git a/images/ose-azure-cloud-node-manager.yml b/images/ose-azure-cloud-node-manager.yml index 9b69f4fe9a..38faff2329 100644 --- a/images/ose-azure-cloud-node-manager.yml +++ b/images/ose-azure-cloud-node-manager.yml @@ -24,8 +24,7 @@ from: member: openshift-enterprise-base labels: License: ASL 2.0 - io.k8s.description: This is a component of OpenShift Container Platform and provides - Azure Cloud Node Manager + io.k8s.description: This is a component of OpenShift Container Platform and provides Azure Cloud Node Manager io.k8s.display-name: OpenShift Azure Cloud Node Manager io.openshift.tags: openshift,cloud-node-manager,azure vendor: Red Hat diff --git a/images/ose-egress-http-proxy.yml b/images/ose-egress-http-proxy.yml index e4f02c0195..b1e4129861 100644 --- a/images/ose-egress-http-proxy.yml +++ b/images/ose-egress-http-proxy.yml @@ -14,8 +14,7 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform and contains - an egress http proxy. + io.k8s.description: This is a component of OpenShift Container Platform and contains an egress http proxy. io.k8s.display-name: OpenShift Container Platform Egress Http Proxy io.openshift.tags: openshift,http-proxy,egress vendor: Red Hat diff --git a/images/ose-etcd.yml b/images/ose-etcd.yml index 5c06381053..6da81d4b59 100644 --- a/images/ose-etcd.yml +++ b/images/ose-etcd.yml @@ -40,8 +40,7 @@ from: member: openshift-enterprise-base labels: License: Apache 2.0 - io.k8s.description: etcd is distributed key-value store which stores the persistent - master state for Kubernetes and OpenShift. + io.k8s.description: etcd is distributed key-value store which stores the persistent master state for Kubernetes and OpenShift. io.k8s.display-name: etcd server io.openshift.tags: etcd name: openshift/ose-etcd diff --git a/images/ose-frr.yml b/images/ose-frr.yml index 0fe992f445..396d7db420 100644 --- a/images/ose-frr.yml +++ b/images/ose-frr.yml @@ -19,5 +19,3 @@ name: openshift/frr-rhel8 name_in_bundle: metallb-frr-rhel8 owners: - metallb-dev@redhat.com -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed diff --git a/images/ose-haproxy-router-base.yml b/images/ose-haproxy-router-base.yml index 9a1dca3868..8c5f13e73e 100644 --- a/images/ose-haproxy-router-base.yml +++ b/images/ose-haproxy-router-base.yml @@ -22,8 +22,7 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: This is the base image from which all template based routers - inherit. + io.k8s.description: This is the base image from which all template based routers inherit. io.k8s.display-name: OpenShift Container Platform Router io.openshift.tags: openshift,router vendor: Red Hat diff --git a/images/ose-machine-os-images.yml b/images/ose-machine-os-images.yml index 08d974dcad..3158d2734f 100644 --- a/images/ose-machine-os-images.yml +++ b/images/ose-machine-os-images.yml @@ -20,7 +20,3 @@ from: name: openshift/ose-machine-os-images owners: - metal-platform@redhat.com -non_shipping_repos: -- rhel-8-appstream-rpms -- rhel-8-baseos-rpms -- rhel-8-server-ose-rpms-embargoed diff --git a/images/ose-metallb-operator.yml b/images/ose-metallb-operator.yml index 54bca0fd87..1af7db1840 100644 --- a/images/ose-metallb-operator.yml +++ b/images/ose-metallb-operator.yml @@ -25,5 +25,4 @@ update-csv: bundle-dir: 'stable/' manifests-dir: manifests/ registry: image-registry.openshift-image-registry.svc:5000 - valid-subscription-label: '["OpenShift Kubernetes Engine", "OpenShift Container - Platform", "OpenShift Platform Plus"]' + valid-subscription-label: '["OpenShift Kubernetes Engine", "OpenShift Container Platform", "OpenShift Platform Plus"]' diff --git a/images/ose-openstack-cloud-controller-manager.yml b/images/ose-openstack-cloud-controller-manager.yml index bf6a42d2aa..cb4e20864d 100644 --- a/images/ose-openstack-cloud-controller-manager.yml +++ b/images/ose-openstack-cloud-controller-manager.yml @@ -21,8 +21,7 @@ from: member: openshift-enterprise-base labels: License: ASL 2.0 - io.k8s.description: This is a component of OpenShift Container Platform and provides - Openstack Cloud Controller Manager + io.k8s.description: This is a component of OpenShift Container Platform and provides Openstack Cloud Controller Manager io.k8s.display-name: OpenShift Openstack Cloud Controller Manager io.openshift.tags: openshift,cloud-controller-manager,openstack vendor: Red Hat diff --git a/images/ose-ovn-kubernetes.yml b/images/ose-ovn-kubernetes.yml index c2c91f0363..4b2cb136e5 100644 --- a/images/ose-ovn-kubernetes.yml +++ b/images/ose-ovn-kubernetes.yml @@ -35,8 +35,7 @@ from: member: openshift-enterprise-base labels: License: GPLv2+ - io.k8s.description: This is a component of OpenShift Container Platform that provides - an overlay network using ovn. + io.k8s.description: This is a component of OpenShift Container Platform that provides an overlay network using ovn. io.k8s.display-name: ovn kubernetes io.openshift.tags: openshift vendor: Red Hat diff --git a/images/ose-tools.yml b/images/ose-tools.yml index 18d13a856f..7d957ea444 100644 --- a/images/ose-tools.yml +++ b/images/ose-tools.yml @@ -21,8 +21,7 @@ from: member: openshift-enterprise-cli labels: License: GPLv2+ - io.k8s.description: Contains debugging and diagnostic tools for use with an OpenShift - cluster. + io.k8s.description: Contains debugging and diagnostic tools for use with an OpenShift cluster. io.k8s.display-name: OpenShift Tools io.openshift.tags: openshift,tools vendor: Red Hat @@ -30,5 +29,3 @@ name: openshift/ose-tools owners: - ccoleman@redhat.com - aos-master@redhat.com -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed diff --git a/images/prom-label-proxy.yml b/images/prom-label-proxy.yml index cc4da13219..f68067ec5e 100644 --- a/images/prom-label-proxy.yml +++ b/images/prom-label-proxy.yml @@ -20,7 +20,5 @@ from: - stream: golang member: openshift-base-rhel8 name: openshift/ose-prom-label-proxy -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed owners: - team-monitoring@redhat.com diff --git a/images/prometheus-config-reloader.yml b/images/prometheus-config-reloader.yml index 89780b9902..602fd0ee8e 100644 --- a/images/prometheus-config-reloader.yml +++ b/images/prometheus-config-reloader.yml @@ -20,8 +20,7 @@ from: member: openshift-enterprise-base labels: License: ASL 2.0 - io.k8s.description: This component reloads a Prometheus server in a controlled and - configurable way. + io.k8s.description: This component reloads a Prometheus server in a controlled and configurable way. io.k8s.display-name: Prometheus config reloader io.openshift.tags: prometheus vendor: Red Hat diff --git a/images/prometheus-operator.yml b/images/prometheus-operator.yml index 951adfe61c..de57f47f79 100644 --- a/images/prometheus-operator.yml +++ b/images/prometheus-operator.yml @@ -21,8 +21,7 @@ from: member: openshift-enterprise-base labels: License: ASL 2.0 - io.k8s.description: This component manages the lifecycle and configuration of a - Prometheus monitoring server as well as Prometheus Alertmanager clusters. + io.k8s.description: This component manages the lifecycle and configuration of a Prometheus monitoring server as well as Prometheus Alertmanager clusters. io.k8s.display-name: Prometheus Operator io.openshift.tags: prometheus vendor: Red Hat diff --git a/images/thanos.yml b/images/thanos.yml index 8de5a3ca50..31272612c5 100644 --- a/images/thanos.yml +++ b/images/thanos.yml @@ -22,7 +22,5 @@ from: - stream: golang member: openshift-enterprise-base name: openshift/ose-thanos -non_shipping_repos: -- rhel-8-server-ose-rpms-embargoed owners: - team-monitoring@redhat.com