From 8dd10ad19efa4f566e7f034ea5b280f48f87b542 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Thu, 2 Jan 2025 15:37:03 +0100 Subject: [PATCH 1/3] Add comment not to delete source-location LABEL from Konflux Dockerfiles --- image/postgres/Dockerfile | 1 + image/postgres/konflux.Dockerfile | 1 + image/rhel/konflux.Dockerfile | 1 + image/roxctl/konflux.Dockerfile | 1 + operator/konflux.Dockerfile | 1 + operator/konflux.bundle.Dockerfile | 1 + scanner/image/db/konflux.Dockerfile | 1 + scanner/image/scanner/konflux.Dockerfile | 1 + 8 files changed, 8 insertions(+) diff --git a/image/postgres/Dockerfile b/image/postgres/Dockerfile index b117bbd0d0bb4..e9f3a547ed878 100644 --- a/image/postgres/Dockerfile +++ b/image/postgres/Dockerfile @@ -12,6 +12,7 @@ LABEL \ io.openshift.tags="rhacs,central-db,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-central-db-rhel8" \ + # We must set source-location to provide it to our custom Snapshot. source-location="https://github.com/stackrox/stackrox" \ summary="Central DB for Red Hat Advanced Cluster Security for Kubernetes" \ # We must set version label to prevent inheriting value set in the base stage. diff --git a/image/postgres/konflux.Dockerfile b/image/postgres/konflux.Dockerfile index e216ad189e14f..79c5243c1a790 100644 --- a/image/postgres/konflux.Dockerfile +++ b/image/postgres/konflux.Dockerfile @@ -14,6 +14,7 @@ LABEL \ io.openshift.tags="rhacs,central-db,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-central-db-rhel8" \ + # We must set source-location to provide it to our custom Snapshot. source-location="https://github.com/stackrox/stackrox" \ summary="Central DB for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \ diff --git a/image/rhel/konflux.Dockerfile b/image/rhel/konflux.Dockerfile index 73736ecc7cb98..72ce633f25d4c 100644 --- a/image/rhel/konflux.Dockerfile +++ b/image/rhel/konflux.Dockerfile @@ -116,6 +116,7 @@ LABEL \ io.openshift.tags="rhacs,main,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-main-rhel8" \ + # We must set source-location to provide it to our custom Snapshot. source-location="https://github.com/stackrox/stackrox" \ summary="Main Image for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \ diff --git a/image/roxctl/konflux.Dockerfile b/image/roxctl/konflux.Dockerfile index ac16dd31d54b0..38196cf55c4f8 100644 --- a/image/roxctl/konflux.Dockerfile +++ b/image/roxctl/konflux.Dockerfile @@ -52,6 +52,7 @@ LABEL \ io.openshift.tags="rhacs,roxctl,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-roxctl-rhel8" \ + # We must set source-location to provide it to our custom Snapshot. source-location="https://github.com/stackrox/stackrox" \ summary="The CLI for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \ diff --git a/operator/konflux.Dockerfile b/operator/konflux.Dockerfile index 2024e30627569..96e724ef57010 100644 --- a/operator/konflux.Dockerfile +++ b/operator/konflux.Dockerfile @@ -34,6 +34,7 @@ LABEL \ io.openshift.tags="rhacs,operator,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-rhel8-operator" \ + # We must set source-location to provide it to our custom Snapshot. source-location="https://github.com/stackrox/stackrox" \ summary="Operator for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \ diff --git a/operator/konflux.bundle.Dockerfile b/operator/konflux.bundle.Dockerfile index 58e87bff7d6ff..dbdcc56e8f457 100644 --- a/operator/konflux.bundle.Dockerfile +++ b/operator/konflux.bundle.Dockerfile @@ -90,6 +90,7 @@ LABEL io.k8s.display-name="operator-bundle" LABEL io.openshift.tags="rhacs,operator-bundle,stackrox" LABEL maintainer="Red Hat, Inc." LABEL name="rhacs-operator-bundle" +# We must set source-location to provide it to our custom Snapshot. LABEL source-location="https://github.com/stackrox/stackrox" LABEL summary="Operator Bundle Image for Red Hat Advanced Cluster Security for Kubernetes" LABEL url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" diff --git a/scanner/image/db/konflux.Dockerfile b/scanner/image/db/konflux.Dockerfile index f8bb2918097a6..5a8b938631bb2 100644 --- a/scanner/image/db/konflux.Dockerfile +++ b/scanner/image/db/konflux.Dockerfile @@ -12,6 +12,7 @@ LABEL \ io.openshift.tags="rhacs,scanner-v4-db,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-scanner-v4-db-rhel8" \ + # We must set source-location to provide it to our custom Snapshot. source-location="https://github.com/stackrox/stackrox" \ summary="Scanner v4 DB for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \ diff --git a/scanner/image/scanner/konflux.Dockerfile b/scanner/image/scanner/konflux.Dockerfile index ffefbc7a60a18..e1da0cb313afa 100644 --- a/scanner/image/scanner/konflux.Dockerfile +++ b/scanner/image/scanner/konflux.Dockerfile @@ -37,6 +37,7 @@ LABEL \ io.openshift.tags="rhacs,scanner-v4,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-scanner-v4-rhel8" \ + # We must set source-location to provide it to our custom Snapshot. source-location="https://github.com/stackrox/stackrox" \ summary="The image scanner v4 for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \ From 7e3b2aa59c17bef660b35177ae02dd1e1519d37e Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Thu, 2 Jan 2025 15:39:52 +0100 Subject: [PATCH 2/3] trigger konflux From e6305b41f54a79efb4727727438cd757a9d9a84c Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Fri, 3 Jan 2025 09:36:12 +0100 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Misha Sugakov <537715+msugakov@users.noreply.github.com> --- image/postgres/Dockerfile | 1 - image/postgres/konflux.Dockerfile | 2 +- image/rhel/konflux.Dockerfile | 2 +- image/roxctl/konflux.Dockerfile | 2 +- operator/konflux.Dockerfile | 2 +- operator/konflux.bundle.Dockerfile | 2 +- scanner/image/db/konflux.Dockerfile | 2 +- scanner/image/scanner/konflux.Dockerfile | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/image/postgres/Dockerfile b/image/postgres/Dockerfile index e9f3a547ed878..b117bbd0d0bb4 100644 --- a/image/postgres/Dockerfile +++ b/image/postgres/Dockerfile @@ -12,7 +12,6 @@ LABEL \ io.openshift.tags="rhacs,central-db,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-central-db-rhel8" \ - # We must set source-location to provide it to our custom Snapshot. source-location="https://github.com/stackrox/stackrox" \ summary="Central DB for Red Hat Advanced Cluster Security for Kubernetes" \ # We must set version label to prevent inheriting value set in the base stage. diff --git a/image/postgres/konflux.Dockerfile b/image/postgres/konflux.Dockerfile index 79c5243c1a790..071641a83cc3d 100644 --- a/image/postgres/konflux.Dockerfile +++ b/image/postgres/konflux.Dockerfile @@ -14,7 +14,7 @@ LABEL \ io.openshift.tags="rhacs,central-db,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-central-db-rhel8" \ - # We must set source-location to provide it to our custom Snapshot. + # Custom Snapshot creation in `operator-bundle-pipeline` depends on source-location label to be set correctly. source-location="https://github.com/stackrox/stackrox" \ summary="Central DB for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \ diff --git a/image/rhel/konflux.Dockerfile b/image/rhel/konflux.Dockerfile index 72ce633f25d4c..2d8d7615ee375 100644 --- a/image/rhel/konflux.Dockerfile +++ b/image/rhel/konflux.Dockerfile @@ -116,7 +116,7 @@ LABEL \ io.openshift.tags="rhacs,main,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-main-rhel8" \ - # We must set source-location to provide it to our custom Snapshot. + # Custom Snapshot creation in `operator-bundle-pipeline` depends on source-location label to be set correctly. source-location="https://github.com/stackrox/stackrox" \ summary="Main Image for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \ diff --git a/image/roxctl/konflux.Dockerfile b/image/roxctl/konflux.Dockerfile index 38196cf55c4f8..7643edb42f789 100644 --- a/image/roxctl/konflux.Dockerfile +++ b/image/roxctl/konflux.Dockerfile @@ -52,7 +52,7 @@ LABEL \ io.openshift.tags="rhacs,roxctl,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-roxctl-rhel8" \ - # We must set source-location to provide it to our custom Snapshot. + # Custom Snapshot creation in `operator-bundle-pipeline` depends on source-location label to be set correctly. source-location="https://github.com/stackrox/stackrox" \ summary="The CLI for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \ diff --git a/operator/konflux.Dockerfile b/operator/konflux.Dockerfile index 96e724ef57010..83e044afde8ef 100644 --- a/operator/konflux.Dockerfile +++ b/operator/konflux.Dockerfile @@ -34,7 +34,7 @@ LABEL \ io.openshift.tags="rhacs,operator,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-rhel8-operator" \ - # We must set source-location to provide it to our custom Snapshot. + # Custom Snapshot creation in `operator-bundle-pipeline` depends on source-location label to be set correctly. source-location="https://github.com/stackrox/stackrox" \ summary="Operator for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \ diff --git a/operator/konflux.bundle.Dockerfile b/operator/konflux.bundle.Dockerfile index dbdcc56e8f457..7b005ec7293c0 100644 --- a/operator/konflux.bundle.Dockerfile +++ b/operator/konflux.bundle.Dockerfile @@ -90,7 +90,7 @@ LABEL io.k8s.display-name="operator-bundle" LABEL io.openshift.tags="rhacs,operator-bundle,stackrox" LABEL maintainer="Red Hat, Inc." LABEL name="rhacs-operator-bundle" -# We must set source-location to provide it to our custom Snapshot. +# Custom Snapshot creation in `operator-bundle-pipeline` depends on source-location label to be set correctly. LABEL source-location="https://github.com/stackrox/stackrox" LABEL summary="Operator Bundle Image for Red Hat Advanced Cluster Security for Kubernetes" LABEL url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" diff --git a/scanner/image/db/konflux.Dockerfile b/scanner/image/db/konflux.Dockerfile index 5a8b938631bb2..668380a41917e 100644 --- a/scanner/image/db/konflux.Dockerfile +++ b/scanner/image/db/konflux.Dockerfile @@ -12,7 +12,7 @@ LABEL \ io.openshift.tags="rhacs,scanner-v4-db,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-scanner-v4-db-rhel8" \ - # We must set source-location to provide it to our custom Snapshot. + # Custom Snapshot creation in `operator-bundle-pipeline` depends on source-location label to be set correctly. source-location="https://github.com/stackrox/stackrox" \ summary="Scanner v4 DB for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \ diff --git a/scanner/image/scanner/konflux.Dockerfile b/scanner/image/scanner/konflux.Dockerfile index e1da0cb313afa..82ab6b6b34b94 100644 --- a/scanner/image/scanner/konflux.Dockerfile +++ b/scanner/image/scanner/konflux.Dockerfile @@ -37,7 +37,7 @@ LABEL \ io.openshift.tags="rhacs,scanner-v4,stackrox" \ maintainer="Red Hat, Inc." \ name="rhacs-scanner-v4-rhel8" \ - # We must set source-location to provide it to our custom Snapshot. + # Custom Snapshot creation in `operator-bundle-pipeline` depends on source-location label to be set correctly. source-location="https://github.com/stackrox/stackrox" \ summary="The image scanner v4 for Red Hat Advanced Cluster Security for Kubernetes" \ url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \