From 525f83467a2c80f0eb40b04c719c5758984f0fd8 Mon Sep 17 00:00:00 2001 From: Tomas Turek Date: Fri, 19 Jun 2026 15:41:50 +0200 Subject: [PATCH] Migrate MVO FBC to per-version component pattern matching RHTAS FBC - Add mvo-fbc project overlay with template and per-version components (v4.16-v4.22) - Add FBC release stream to model-validation overlay - Add FBC release-plan trait to project/base/release-plan - Migrate FBC release plans from promote-to-candidate overlays to release-plan trait for rhtas-fbc, pco-fbc and mvo-fbc - Delete promote-to-candidate directory (all FBC release plans now use trait) - Register mvo-fbc in project and stream kustomizations Co-Authored-By: Claude Opus 4.6 (1M context) --- .../base/ocp/mvo/v4.16/kustomization.yaml | 8 ++++ .../project/base/ocp/mvo/v4.16/patch.yaml | 47 +++++++++++++++++++ .../base/ocp/mvo/v4.17/kustomization.yaml | 8 ++++ .../project/base/ocp/mvo/v4.17/patch.yaml | 47 +++++++++++++++++++ .../base/ocp/mvo/v4.18/kustomization.yaml | 8 ++++ .../project/base/ocp/mvo/v4.18/patch.yaml | 47 +++++++++++++++++++ .../base/ocp/mvo/v4.19/kustomization.yaml | 8 ++++ .../project/base/ocp/mvo/v4.19/patch.yaml | 47 +++++++++++++++++++ .../base/ocp/mvo/v4.20/kustomization.yaml | 8 ++++ .../project/base/ocp/mvo/v4.20/patch.yaml | 47 +++++++++++++++++++ .../base/ocp/mvo/v4.21/kustomization.yaml | 8 ++++ .../project/base/ocp/mvo/v4.21/patch.yaml | 47 +++++++++++++++++++ .../base/ocp/mvo/v4.22/kustomization.yaml | 8 ++++ .../project/base/ocp/mvo/v4.22/patch.yaml | 47 +++++++++++++++++++ .../base/release-plan/kustomization.yaml | 6 +++ .../project/base/release-plan/patch/fbc.yaml | 32 +++++++++++++ .../base/project/kustomization.yaml | 1 + .../overlay/mvo-fbc/kustomization.yaml | 18 +++++++ .../base/project/overlay/mvo-fbc/project.yaml | 8 ++++ .../project/overlay/mvo-fbc/template.yaml | 36 ++++++++++++++ .../overlay/pco-fbc/kustomization.yaml | 1 + .../overlay/rhtas-fbc/kustomization.yaml | 1 + .../base/release-plan/kustomization.yaml | 1 - .../promote-to-candidate/README.md | 47 ------------------- .../fbc/base/kustomization.yaml | 2 - .../fbc/base/releaseplan.yaml | 28 ----------- .../fbc/overlays/fbc-v4-16/kustomization.yaml | 9 ---- .../fbc/overlays/fbc-v4-16/patch.yaml | 10 ---- .../fbc/overlays/fbc-v4-17/kustomization.yaml | 9 ---- .../fbc/overlays/fbc-v4-17/patch.yaml | 10 ---- .../fbc/overlays/fbc-v4-18/kustomization.yaml | 9 ---- .../fbc/overlays/fbc-v4-18/patch.yaml | 10 ---- .../fbc/overlays/fbc-v4-19/kustomization.yaml | 9 ---- .../fbc/overlays/fbc-v4-19/patch.yaml | 10 ---- .../fbc/overlays/fbc-v4-20/kustomization.yaml | 9 ---- .../fbc/overlays/fbc-v4-20/patch.yaml | 10 ---- .../fbc/overlays/fbc-v4-21/kustomization.yaml | 9 ---- .../fbc/overlays/fbc-v4-21/patch.yaml | 10 ---- .../fbc/overlays/kustomization.yaml | 7 --- .../pco-fbc/base/kustomization.yaml | 2 - .../pco-fbc/base/releaseplan.yaml | 30 ------------ .../pco-fbc/overlays/kustomization.yaml | 8 ---- .../overlays/pco-fbc-v4-16/kustomization.yaml | 9 ---- .../pco-fbc/overlays/pco-fbc-v4-16/patch.yaml | 10 ---- .../overlays/pco-fbc-v4-17/kustomization.yaml | 9 ---- .../pco-fbc/overlays/pco-fbc-v4-17/patch.yaml | 10 ---- .../overlays/pco-fbc-v4-18/kustomization.yaml | 9 ---- .../pco-fbc/overlays/pco-fbc-v4-18/patch.yaml | 10 ---- .../overlays/pco-fbc-v4-19/kustomization.yaml | 9 ---- .../pco-fbc/overlays/pco-fbc-v4-19/patch.yaml | 10 ---- .../overlays/pco-fbc-v4-20/kustomization.yaml | 9 ---- .../pco-fbc/overlays/pco-fbc-v4-20/patch.yaml | 10 ---- .../overlays/pco-fbc-v4-21/kustomization.yaml | 9 ---- .../pco-fbc/overlays/pco-fbc-v4-21/patch.yaml | 10 ---- .../overlays/pco-fbc-v4-22/kustomization.yaml | 9 ---- .../pco-fbc/overlays/pco-fbc-v4-22/patch.yaml | 10 ---- .../overlay/fbc}/kustomization.yaml | 6 ++- .../overlay/fbc/kustomizeconfig.yaml | 21 +++++++++ .../overlay/fbc/release-stream.yaml | 15 ++++++ .../overlay/kustomization.yaml | 1 + 60 files changed, 529 insertions(+), 374 deletions(-) create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.16/kustomization.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.16/patch.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.17/kustomization.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.17/patch.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.18/kustomization.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.18/patch.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.19/kustomization.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.19/patch.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.20/kustomization.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.20/patch.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.21/kustomization.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.21/patch.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.22/kustomization.yaml create mode 100644 konflux-configs/base/project/base/ocp/mvo/v4.22/patch.yaml create mode 100644 konflux-configs/base/project/base/release-plan/patch/fbc.yaml create mode 100644 konflux-configs/base/project/overlay/mvo-fbc/kustomization.yaml create mode 100644 konflux-configs/base/project/overlay/mvo-fbc/project.yaml create mode 100644 konflux-configs/base/project/overlay/mvo-fbc/template.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/README.md delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/base/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/base/releaseplan.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-16/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-16/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-17/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-17/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-18/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-18/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-19/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-19/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-20/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-20/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-21/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-21/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/base/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/base/releaseplan.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-16/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-16/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-17/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-17/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-18/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-18/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-19/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-19/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-20/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-20/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-21/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-21/patch.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-22/kustomization.yaml delete mode 100644 konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-22/patch.yaml rename konflux-configs/base/{release-plan/promote-to-candidate => stream/model-validation/overlay/fbc}/kustomization.yaml (53%) create mode 100644 konflux-configs/base/stream/model-validation/overlay/fbc/kustomizeconfig.yaml create mode 100644 konflux-configs/base/stream/model-validation/overlay/fbc/release-stream.yaml diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.16/kustomization.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.16/kustomization.yaml new file mode 100644 index 00000000..26cb8980 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.16/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch.yaml + target: + kind: ProjectDevelopmentStreamTemplate + labelSelector: "build.rhtas.com/type=fbc" diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.16/patch.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.16/patch.yaml new file mode 100644 index 00000000..935bdec1 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.16/patch.yaml @@ -0,0 +1,47 @@ +# OCP 4.16 + +# Component +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: Component + metadata: + annotations: + build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}' + build.appstudio.openshift.io/status: '{"pac":{"state":"enabled","merge-url":"https://github.com/securesign/fbc/pull/97","configuration-time":"Thu,27 Mar 2025 12:35:34 UTC"},"message":"done"}' + mintmaker.appstudio.redhat.com/disabled: "{{.mintmakerDisabled}}" + name: "{{.application}}{{.nameSuffix}}-v4-16" + spec: + application: "{{.application}}{{.nameSuffix}}" + componentName: "{{.application}}{{.nameSuffix}}-v4-16" + source: + git: + context: "v4.16/{{.operator}}" + dockerfileUrl: catalog.Dockerfile + revision: "{{.branch}}" + url: https://github.com/securesign/fbc + +# ImageRepository +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: ImageRepository + metadata: + name: "{{.application}}{{.nameSuffix}}-v4-16" + annotations: + image-controller.appstudio.redhat.com/update-component-image: 'true' + labels: + appstudio.redhat.com/application: "{{.application}}{{.nameSuffix}}" + appstudio.redhat.com/component: "{{.application}}{{.nameSuffix}}-v4-16" + spec: + image: + name: "rhtas-tenant/{{.application}}-v4-16" + visibility: public + notifications: + - config: + url: https://bombino.api.redhat.com/v1/sbom/quay/push + event: repo_push + method: webhook + title: SBOM-event-to-Bombino diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.17/kustomization.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.17/kustomization.yaml new file mode 100644 index 00000000..26cb8980 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.17/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch.yaml + target: + kind: ProjectDevelopmentStreamTemplate + labelSelector: "build.rhtas.com/type=fbc" diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.17/patch.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.17/patch.yaml new file mode 100644 index 00000000..0157871e --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.17/patch.yaml @@ -0,0 +1,47 @@ +# OCP 4.17 + +# Component +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: Component + metadata: + annotations: + build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}' + build.appstudio.openshift.io/status: '{"pac":{"state":"enabled","merge-url":"https://github.com/securesign/fbc/pull/97","configuration-time":"Thu,27 Mar 2025 12:35:34 UTC"},"message":"done"}' + mintmaker.appstudio.redhat.com/disabled: "{{.mintmakerDisabled}}" + name: "{{.application}}{{.nameSuffix}}-v4-17" + spec: + application: "{{.application}}{{.nameSuffix}}" + componentName: "{{.application}}{{.nameSuffix}}-v4-17" + source: + git: + context: "v4.17/{{.operator}}" + dockerfileUrl: catalog.Dockerfile + revision: "{{.branch}}" + url: https://github.com/securesign/fbc + +# ImageRepository +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: ImageRepository + metadata: + name: "{{.application}}{{.nameSuffix}}-v4-17" + annotations: + image-controller.appstudio.redhat.com/update-component-image: 'true' + labels: + appstudio.redhat.com/application: "{{.application}}{{.nameSuffix}}" + appstudio.redhat.com/component: "{{.application}}{{.nameSuffix}}-v4-17" + spec: + image: + name: "rhtas-tenant/{{.application}}-v4-17" + visibility: public + notifications: + - config: + url: https://bombino.api.redhat.com/v1/sbom/quay/push + event: repo_push + method: webhook + title: SBOM-event-to-Bombino diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.18/kustomization.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.18/kustomization.yaml new file mode 100644 index 00000000..26cb8980 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.18/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch.yaml + target: + kind: ProjectDevelopmentStreamTemplate + labelSelector: "build.rhtas.com/type=fbc" diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.18/patch.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.18/patch.yaml new file mode 100644 index 00000000..0a594486 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.18/patch.yaml @@ -0,0 +1,47 @@ +# OCP 4.18 + +# Component +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: Component + metadata: + annotations: + build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}' + build.appstudio.openshift.io/status: '{"pac":{"state":"enabled","merge-url":"https://github.com/securesign/fbc/pull/97","configuration-time":"Thu,27 Mar 2025 12:35:34 UTC"},"message":"done"}' + mintmaker.appstudio.redhat.com/disabled: "{{.mintmakerDisabled}}" + name: "{{.application}}{{.nameSuffix}}-v4-18" + spec: + application: "{{.application}}{{.nameSuffix}}" + componentName: "{{.application}}{{.nameSuffix}}-v4-18" + source: + git: + context: "v4.18/{{.operator}}" + dockerfileUrl: catalog.Dockerfile + revision: "{{.branch}}" + url: https://github.com/securesign/fbc + +# ImageRepository +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: ImageRepository + metadata: + name: "{{.application}}{{.nameSuffix}}-v4-18" + annotations: + image-controller.appstudio.redhat.com/update-component-image: 'true' + labels: + appstudio.redhat.com/application: "{{.application}}{{.nameSuffix}}" + appstudio.redhat.com/component: "{{.application}}{{.nameSuffix}}-v4-18" + spec: + image: + name: "rhtas-tenant/{{.application}}-v4-18" + visibility: public + notifications: + - config: + url: https://bombino.api.redhat.com/v1/sbom/quay/push + event: repo_push + method: webhook + title: SBOM-event-to-Bombino diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.19/kustomization.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.19/kustomization.yaml new file mode 100644 index 00000000..26cb8980 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.19/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch.yaml + target: + kind: ProjectDevelopmentStreamTemplate + labelSelector: "build.rhtas.com/type=fbc" diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.19/patch.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.19/patch.yaml new file mode 100644 index 00000000..6392b597 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.19/patch.yaml @@ -0,0 +1,47 @@ +# OCP 4.19 + +# Component +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: Component + metadata: + annotations: + build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}' + build.appstudio.openshift.io/status: '{"pac":{"state":"enabled","merge-url":"https://github.com/securesign/fbc/pull/97","configuration-time":"Thu,27 Mar 2025 12:35:34 UTC"},"message":"done"}' + mintmaker.appstudio.redhat.com/disabled: "{{.mintmakerDisabled}}" + name: "{{.application}}{{.nameSuffix}}-v4-19" + spec: + application: "{{.application}}{{.nameSuffix}}" + componentName: "{{.application}}{{.nameSuffix}}-v4-19" + source: + git: + context: "v4.19/{{.operator}}" + dockerfileUrl: catalog.Dockerfile + revision: "{{.branch}}" + url: https://github.com/securesign/fbc + +# ImageRepository +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: ImageRepository + metadata: + name: "{{.application}}{{.nameSuffix}}-v4-19" + annotations: + image-controller.appstudio.redhat.com/update-component-image: 'true' + labels: + appstudio.redhat.com/application: "{{.application}}{{.nameSuffix}}" + appstudio.redhat.com/component: "{{.application}}{{.nameSuffix}}-v4-19" + spec: + image: + name: "rhtas-tenant/{{.application}}-v4-19" + visibility: public + notifications: + - config: + url: https://bombino.api.redhat.com/v1/sbom/quay/push + event: repo_push + method: webhook + title: SBOM-event-to-Bombino diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.20/kustomization.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.20/kustomization.yaml new file mode 100644 index 00000000..26cb8980 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.20/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch.yaml + target: + kind: ProjectDevelopmentStreamTemplate + labelSelector: "build.rhtas.com/type=fbc" diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.20/patch.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.20/patch.yaml new file mode 100644 index 00000000..bf0de83f --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.20/patch.yaml @@ -0,0 +1,47 @@ +# OCP 4.20 + +# Component +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: Component + metadata: + annotations: + build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}' + build.appstudio.openshift.io/status: '{"pac":{"state":"enabled","merge-url":"https://github.com/securesign/fbc/pull/97","configuration-time":"Thu,27 Mar 2025 12:35:34 UTC"},"message":"done"}' + mintmaker.appstudio.redhat.com/disabled: "{{.mintmakerDisabled}}" + name: "{{.application}}{{.nameSuffix}}-v4-20" + spec: + application: "{{.application}}{{.nameSuffix}}" + componentName: "{{.application}}{{.nameSuffix}}-v4-20" + source: + git: + context: "v4.20/{{.operator}}" + dockerfileUrl: catalog.Dockerfile + revision: "{{.branch}}" + url: https://github.com/securesign/fbc + +# ImageRepository +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: ImageRepository + metadata: + name: "{{.application}}{{.nameSuffix}}-v4-20" + annotations: + image-controller.appstudio.redhat.com/update-component-image: 'true' + labels: + appstudio.redhat.com/application: "{{.application}}{{.nameSuffix}}" + appstudio.redhat.com/component: "{{.application}}{{.nameSuffix}}-v4-20" + spec: + image: + name: "rhtas-tenant/{{.application}}-v4-20" + visibility: public + notifications: + - config: + url: https://bombino.api.redhat.com/v1/sbom/quay/push + event: repo_push + method: webhook + title: SBOM-event-to-Bombino diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.21/kustomization.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.21/kustomization.yaml new file mode 100644 index 00000000..26cb8980 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.21/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch.yaml + target: + kind: ProjectDevelopmentStreamTemplate + labelSelector: "build.rhtas.com/type=fbc" diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.21/patch.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.21/patch.yaml new file mode 100644 index 00000000..50de1d06 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.21/patch.yaml @@ -0,0 +1,47 @@ +# OCP 4.21 + +# Component +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: Component + metadata: + annotations: + build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}' + build.appstudio.openshift.io/status: '{"pac":{"state":"enabled","merge-url":"https://github.com/securesign/fbc/pull/97","configuration-time":"Thu,27 Mar 2025 12:35:34 UTC"},"message":"done"}' + mintmaker.appstudio.redhat.com/disabled: "{{.mintmakerDisabled}}" + name: "{{.application}}{{.nameSuffix}}-v4-21" + spec: + application: "{{.application}}{{.nameSuffix}}" + componentName: "{{.application}}{{.nameSuffix}}-v4-21" + source: + git: + context: "v4.21/{{.operator}}" + dockerfileUrl: catalog.Dockerfile + revision: "{{.branch}}" + url: https://github.com/securesign/fbc + +# ImageRepository +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: ImageRepository + metadata: + name: "{{.application}}{{.nameSuffix}}-v4-21" + annotations: + image-controller.appstudio.redhat.com/update-component-image: 'true' + labels: + appstudio.redhat.com/application: "{{.application}}{{.nameSuffix}}" + appstudio.redhat.com/component: "{{.application}}{{.nameSuffix}}-v4-21" + spec: + image: + name: "rhtas-tenant/{{.application}}-v4-21" + visibility: public + notifications: + - config: + url: https://bombino.api.redhat.com/v1/sbom/quay/push + event: repo_push + method: webhook + title: SBOM-event-to-Bombino diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.22/kustomization.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.22/kustomization.yaml new file mode 100644 index 00000000..26cb8980 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.22/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch.yaml + target: + kind: ProjectDevelopmentStreamTemplate + labelSelector: "build.rhtas.com/type=fbc" diff --git a/konflux-configs/base/project/base/ocp/mvo/v4.22/patch.yaml b/konflux-configs/base/project/base/ocp/mvo/v4.22/patch.yaml new file mode 100644 index 00000000..002ce796 --- /dev/null +++ b/konflux-configs/base/project/base/ocp/mvo/v4.22/patch.yaml @@ -0,0 +1,47 @@ +# OCP 4.22 + +# Component +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: Component + metadata: + annotations: + build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}' + build.appstudio.openshift.io/status: '{"pac":{"state":"enabled","merge-url":"https://github.com/securesign/fbc/pull/97","configuration-time":"Thu,27 Mar 2025 12:35:34 UTC"},"message":"done"}' + mintmaker.appstudio.redhat.com/disabled: "{{.mintmakerDisabled}}" + name: "{{.application}}{{.nameSuffix}}-v4-22" + spec: + application: "{{.application}}{{.nameSuffix}}" + componentName: "{{.application}}{{.nameSuffix}}-v4-22" + source: + git: + context: "v4.22/{{.operator}}" + dockerfileUrl: catalog.Dockerfile + revision: "{{.branch}}" + url: https://github.com/securesign/fbc + +# ImageRepository +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: ImageRepository + metadata: + name: "{{.application}}{{.nameSuffix}}-v4-22" + annotations: + image-controller.appstudio.redhat.com/update-component-image: 'true' + labels: + appstudio.redhat.com/application: "{{.application}}{{.nameSuffix}}" + appstudio.redhat.com/component: "{{.application}}{{.nameSuffix}}-v4-22" + spec: + image: + name: "rhtas-tenant/{{.application}}-v4-22" + visibility: public + notifications: + - config: + url: https://bombino.api.redhat.com/v1/sbom/quay/push + event: repo_push + method: webhook + title: SBOM-event-to-Bombino diff --git a/konflux-configs/base/project/base/release-plan/kustomization.yaml b/konflux-configs/base/project/base/release-plan/kustomization.yaml index 5d457800..09a295bf 100644 --- a/konflux-configs/base/project/base/release-plan/kustomization.yaml +++ b/konflux-configs/base/project/base/release-plan/kustomization.yaml @@ -13,3 +13,9 @@ patches: kind: ProjectDevelopmentStreamTemplate labelSelector: "build.rhtas.com/type=component" path: patch/component.yaml + + # For fbc-type templates (rhtas-fbc, pco-fbc, mvo-fbc) + - target: + kind: ProjectDevelopmentStreamTemplate + labelSelector: "build.rhtas.com/type=fbc" + path: patch/fbc.yaml diff --git a/konflux-configs/base/project/base/release-plan/patch/fbc.yaml b/konflux-configs/base/project/base/release-plan/patch/fbc.yaml new file mode 100644 index 00000000..60030ac1 --- /dev/null +++ b/konflux-configs/base/project/base/release-plan/patch/fbc.yaml @@ -0,0 +1,32 @@ +- op: add + path: /spec/resources/- + value: + apiVersion: appstudio.redhat.com/v1alpha1 + kind: ReleasePlan + metadata: + labels: + release.appstudio.openshift.io/auto-release: 'true' + release.appstudio.openshift.io/standing-attribution: 'true' + name: "promote-to-candidate-{{.application}}{{.nameSuffix}}" + spec: + application: "{{.application}}{{.nameSuffix}}" + tenantPipeline: + params: + - name: git-url + value: https://github.com/securesign/releases + - name: code-freeze + value: "false" + - name: type + value: "fbc" + - name: file-name + value: "{{.operator}}-fbc.json" + serviceAccountName: rhtas-build-bot + pipelineRef: + resolver: git + params: + - name: url + value: "https://github.com/securesign/pipelines" + - name: revision + value: main + - name: pathInRepo + value: "pipelines/promote-to-candidate.yaml" diff --git a/konflux-configs/base/project/kustomization.yaml b/konflux-configs/base/project/kustomization.yaml index 99bc3ba1..5a93e2e4 100644 --- a/konflux-configs/base/project/kustomization.yaml +++ b/konflux-configs/base/project/kustomization.yaml @@ -21,3 +21,4 @@ resources: - overlay/sigstore-a2a - overlay/cli-stacks - overlay/rhtas-console + - overlay/mvo-fbc diff --git a/konflux-configs/base/project/overlay/mvo-fbc/kustomization.yaml b/konflux-configs/base/project/overlay/mvo-fbc/kustomization.yaml new file mode 100644 index 00000000..39c8f40e --- /dev/null +++ b/konflux-configs/base/project/overlay/mvo-fbc/kustomization.yaml @@ -0,0 +1,18 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - project.yaml + - template.yaml + +components: + - ../../base/ec + - ../../base/branch-sync + - ../../base/release-plan + - ../../base/ocp/mvo/v4.16 + - ../../base/ocp/mvo/v4.17 + - ../../base/ocp/mvo/v4.18 + - ../../base/ocp/mvo/v4.19 + - ../../base/ocp/mvo/v4.20 + - ../../base/ocp/mvo/v4.21 + - ../../base/ocp/mvo/v4.22 diff --git a/konflux-configs/base/project/overlay/mvo-fbc/project.yaml b/konflux-configs/base/project/overlay/mvo-fbc/project.yaml new file mode 100644 index 00000000..34beb67a --- /dev/null +++ b/konflux-configs/base/project/overlay/mvo-fbc/project.yaml @@ -0,0 +1,8 @@ +apiVersion: projctl.konflux.dev/v1beta1 +kind: Project +metadata: + name: mvo-fbc +spec: + displayName: "Model Validation Operator FBC" + description: | + File-Based Catalogs for Red Hat Trusted Artifact Signer Model Validation Operator. diff --git a/konflux-configs/base/project/overlay/mvo-fbc/template.yaml b/konflux-configs/base/project/overlay/mvo-fbc/template.yaml new file mode 100644 index 00000000..93587a33 --- /dev/null +++ b/konflux-configs/base/project/overlay/mvo-fbc/template.yaml @@ -0,0 +1,36 @@ +apiVersion: projctl.konflux.dev/v1beta1 +kind: ProjectDevelopmentStreamTemplate +metadata: + name: mvo-fbc-template + labels: + build.rhtas.com/ec: fbc-standard + build.rhtas.com/type: fbc +spec: + project: mvo-fbc + variables: + - name: version + description: A version number for a new development stream + - name: branch + description: Git branch + defaultValue: "main" + - name: nameSuffix + description: A suffix which will be added to K8s resource name + defaultValue: "-{{hyphenize .version}}" + - name: application + description: The application name + defaultValue: "mvo-fbc" + - name: mintmakerDisabled + description: Whether to disable mintmaker annotation on the Component + defaultValue: "false" + - name: operator + description: The operator name + defaultValue: "model-validation-operator" + resources: + - apiVersion: appstudio.redhat.com/v1alpha1 + kind: Application + metadata: + annotations: + application.thumbnail: "5" + name: "{{.application}}{{.nameSuffix}}" + spec: + displayName: "{{.application}} ({{.version}})" diff --git a/konflux-configs/base/project/overlay/pco-fbc/kustomization.yaml b/konflux-configs/base/project/overlay/pco-fbc/kustomization.yaml index 7619dcae..cbe87356 100644 --- a/konflux-configs/base/project/overlay/pco-fbc/kustomization.yaml +++ b/konflux-configs/base/project/overlay/pco-fbc/kustomization.yaml @@ -8,6 +8,7 @@ resources: components: - ../../base/ec - ../../base/branch-sync + - ../../base/release-plan - ../../base/ocp/pco/v4.16 - ../../base/ocp/pco/v4.17 - ../../base/ocp/pco/v4.18 diff --git a/konflux-configs/base/project/overlay/rhtas-fbc/kustomization.yaml b/konflux-configs/base/project/overlay/rhtas-fbc/kustomization.yaml index 05cfff00..fc4c12c9 100644 --- a/konflux-configs/base/project/overlay/rhtas-fbc/kustomization.yaml +++ b/konflux-configs/base/project/overlay/rhtas-fbc/kustomization.yaml @@ -8,6 +8,7 @@ resources: components: - ../../base/ec - ../../base/branch-sync + - ../../base/release-plan - ../../base/ocp/rhtas/v4.16 - ../../base/ocp/rhtas/v4.17 - ../../base/ocp/rhtas/v4.18 diff --git a/konflux-configs/base/release-plan/kustomization.yaml b/konflux-configs/base/release-plan/kustomization.yaml index 1b5834cc..ac4909ea 100644 --- a/konflux-configs/base/release-plan/kustomization.yaml +++ b/konflux-configs/base/release-plan/kustomization.yaml @@ -3,4 +3,3 @@ kind: Kustomization resources: - konflux-manifests/base - - promote-to-candidate/ diff --git a/konflux-configs/base/release-plan/promote-to-candidate/README.md b/konflux-configs/base/release-plan/promote-to-candidate/README.md deleted file mode 100644 index 635651d0..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/README.md +++ /dev/null @@ -1,47 +0,0 @@ -# Promote to Candidate Release Plans - -This directory contains the release plans used in the automated build process for RHTAS. To simplify management, these release plans are configured using Kustomize. -There are three release types: - -1. Component: Refers to our component applications. -2. Operator: Refers to our operator applications. -3. FBC: Refers to our FBC applications. - - -``` -├── components -│ ├── base -│ └── overlays -├── fbc -│ ├── base -│ └── overlays -├── operator -│ ├── base -│ └── overlays -└── README.md -``` - -## Configuration Guidelines -Top-Level Configurations: - Changes should be made in the /base/releasePlan directory. - -Individual Changes: - Apply modifications in the /overlays/ directory. - -Always commit any changes to ensure that the current state of the release plans on the Konflux cluster is accurately reflected in these. - -## Previewing Changes -To preview your changes, use the Kustomize CLI: -``` -kustomize build /overlays -``` - -## Applying Release Plans -Before applying changes, ensure you have access to the Konflux cluster. Then, execute the following command: -``` -oc apply -k /overlays -``` -For updating singular release plans, run: -``` -oc apply -k /overlays/ -``` \ No newline at end of file diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/base/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/base/kustomization.yaml deleted file mode 100644 index fdaa96ab..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/base/kustomization.yaml +++ /dev/null @@ -1,2 +0,0 @@ -resources: - - releaseplan.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/base/releaseplan.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/base/releaseplan.yaml deleted file mode 100644 index 9a9cad12..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/base/releaseplan.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: application - tenantPipeline: - params: - - name: git-url - value: https://github.com/securesign/releases - - name: code-freeze - value: "false" - - name: type - value: "fbc" - serviceAccountName: rhtas-build-bot - pipelineRef: - resolver: git - params: - - name: url - value: "https://github.com/securesign/pipelines" - - name: revision - value: main - - name: pathInRepo - value: "pipelines/promote-to-candidate.yaml" diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-16/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-16/kustomization.yaml deleted file mode 100644 index bce6332c..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-16/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../fbc/base - -nameSuffix: fbc-v4-16 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-16/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-16/patch.yaml deleted file mode 100644 index 3f7bac80..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-16/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: fbc-v4-16 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-17/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-17/kustomization.yaml deleted file mode 100644 index 5aa7d50b..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-17/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../fbc/base - -nameSuffix: fbc-v4-17 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-17/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-17/patch.yaml deleted file mode 100644 index a8fb78b8..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-17/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: fbc-v4-17 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-18/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-18/kustomization.yaml deleted file mode 100644 index 65c7fcad..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-18/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../fbc/base - -nameSuffix: fbc-v4-18 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-18/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-18/patch.yaml deleted file mode 100644 index 4ea28a6d..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-18/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: fbc-v4-18 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-19/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-19/kustomization.yaml deleted file mode 100644 index 0e5b1cf1..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-19/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../fbc/base - -nameSuffix: fbc-v4-19 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-19/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-19/patch.yaml deleted file mode 100644 index 85ba39df..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-19/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: fbc-v4-19 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-20/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-20/kustomization.yaml deleted file mode 100644 index bd3efaed..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-20/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../fbc/base - -nameSuffix: fbc-v4-20 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-20/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-20/patch.yaml deleted file mode 100644 index 492749cb..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-20/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: fbc-v4-20 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-21/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-21/kustomization.yaml deleted file mode 100644 index 6aa92db3..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-21/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../fbc/base - -nameSuffix: fbc-v4-21 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-21/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-21/patch.yaml deleted file mode 100644 index 46ce9362..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/fbc-v4-21/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: fbc-v4-21 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/kustomization.yaml deleted file mode 100644 index f9d14d75..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/fbc/overlays/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -resources: - - fbc-v4-16 - - fbc-v4-17 - - fbc-v4-18 - - fbc-v4-19 - - fbc-v4-20 - - fbc-v4-21 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/base/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/base/kustomization.yaml deleted file mode 100644 index fdaa96ab..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/base/kustomization.yaml +++ /dev/null @@ -1,2 +0,0 @@ -resources: - - releaseplan.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/base/releaseplan.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/base/releaseplan.yaml deleted file mode 100644 index fd09fed7..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/base/releaseplan.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: application - tenantPipeline: - params: - - name: git-url - value: https://github.com/securesign/releases - - name: code-freeze - value: "false" - - name: type - value: "fbc" - - name: file-name - value: "policy-controller-operator-fbc.json" - serviceAccountName: rhtas-build-bot - pipelineRef: - resolver: git - params: - - name: url - value: "https://github.com/securesign/pipelines" - - name: revision - value: main - - name: pathInRepo - value: "pipelines/promote-to-candidate.yaml" diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/kustomization.yaml deleted file mode 100644 index 6ef90b1c..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ -resources: - - pco-fbc-v4-16 - - pco-fbc-v4-17 - - pco-fbc-v4-18 - - pco-fbc-v4-19 - - pco-fbc-v4-20 - - pco-fbc-v4-21 - - pco-fbc-v4-22 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-16/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-16/kustomization.yaml deleted file mode 100644 index 97d5d99c..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-16/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../pco-fbc/base - -nameSuffix: pco-fbc-v4-16 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-16/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-16/patch.yaml deleted file mode 100644 index 3254c8a4..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-16/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: pco-fbc-v4-16 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-17/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-17/kustomization.yaml deleted file mode 100644 index c4541121..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-17/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../pco-fbc/base - -nameSuffix: pco-fbc-v4-17 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-17/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-17/patch.yaml deleted file mode 100644 index b2cf3a74..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-17/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: pco-fbc-v4-17 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-18/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-18/kustomization.yaml deleted file mode 100644 index 048e7852..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-18/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../pco-fbc/base - -nameSuffix: pco-fbc-v4-18 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-18/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-18/patch.yaml deleted file mode 100644 index 42366cb3..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-18/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: pco-fbc-v4-18 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-19/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-19/kustomization.yaml deleted file mode 100644 index b0fae5a7..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-19/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../pco-fbc/base - -nameSuffix: pco-fbc-v4-19 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-19/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-19/patch.yaml deleted file mode 100644 index 9fcf5d62..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-19/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: pco-fbc-v4-19 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-20/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-20/kustomization.yaml deleted file mode 100644 index 82a053b5..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-20/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../pco-fbc/base - -nameSuffix: pco-fbc-v4-20 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-20/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-20/patch.yaml deleted file mode 100644 index dc65d9ce..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-20/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: pco-fbc-v4-20 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-21/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-21/kustomization.yaml deleted file mode 100644 index 2996f3e3..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-21/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../pco-fbc/base - -nameSuffix: pco-fbc-v4-21 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-21/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-21/patch.yaml deleted file mode 100644 index 24ce6001..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-21/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: pco-fbc-v4-21 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-22/kustomization.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-22/kustomization.yaml deleted file mode 100644 index c0e8c2e0..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-22/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: -- ../../../pco-fbc/base - -nameSuffix: pco-fbc-v4-22 - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patch.yaml diff --git a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-22/patch.yaml b/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-22/patch.yaml deleted file mode 100644 index db9e54a5..00000000 --- a/konflux-configs/base/release-plan/promote-to-candidate/pco-fbc/overlays/pco-fbc-v4-22/patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: appstudio.redhat.com/v1alpha1 -kind: ReleasePlan -metadata: - labels: - release.appstudio.openshift.io/auto-release: 'true' - release.appstudio.openshift.io/standing-attribution: 'true' - name: promote-to-candidate- - namespace: rhtas-tenant -spec: - application: pco-fbc-v4-22 diff --git a/konflux-configs/base/release-plan/promote-to-candidate/kustomization.yaml b/konflux-configs/base/stream/model-validation/overlay/fbc/kustomization.yaml similarity index 53% rename from konflux-configs/base/release-plan/promote-to-candidate/kustomization.yaml rename to konflux-configs/base/stream/model-validation/overlay/fbc/kustomization.yaml index 425af404..217d96ba 100644 --- a/konflux-configs/base/release-plan/promote-to-candidate/kustomization.yaml +++ b/konflux-configs/base/stream/model-validation/overlay/fbc/kustomization.yaml @@ -2,5 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - fbc/overlays/ - - pco-fbc/overlays/ + - release-stream.yaml + +configurations: + - kustomizeconfig.yaml diff --git a/konflux-configs/base/stream/model-validation/overlay/fbc/kustomizeconfig.yaml b/konflux-configs/base/stream/model-validation/overlay/fbc/kustomizeconfig.yaml new file mode 100644 index 00000000..7ea34dcb --- /dev/null +++ b/konflux-configs/base/stream/model-validation/overlay/fbc/kustomizeconfig.yaml @@ -0,0 +1,21 @@ +nameReference: +- kind: Project + version: v1beta1 + group: projctl.konflux.dev + fieldSpecs: + - path: spec/project + kind: ProjectDevelopmentStreamTemplate + group: projctl.konflux.dev + version: v1beta1 + - path: spec/project + kind: ProjectDevelopmentStream + group: projctl.konflux.dev + version: v1beta1 +- kind: ProjectDevelopmentStreamTemplate + version: v1beta1 + group: projctl.konflux.dev + fieldSpecs: + - path: spec/template/name + kind: ProjectDevelopmentStream + group: projctl.konflux.dev + version: v1beta1 diff --git a/konflux-configs/base/stream/model-validation/overlay/fbc/release-stream.yaml b/konflux-configs/base/stream/model-validation/overlay/fbc/release-stream.yaml new file mode 100644 index 00000000..1ba2afd9 --- /dev/null +++ b/konflux-configs/base/stream/model-validation/overlay/fbc/release-stream.yaml @@ -0,0 +1,15 @@ +apiVersion: projctl.konflux.dev/v1beta1 +kind: ProjectDevelopmentStream +metadata: + name: mvo-fbc-release +spec: + project: mvo-fbc + template: + name: mvo-fbc-template + values: + - name: version + value: "release" + - name: branch + value: "main" + - name: nameSuffix + value: "" diff --git a/konflux-configs/base/stream/model-validation/overlay/kustomization.yaml b/konflux-configs/base/stream/model-validation/overlay/kustomization.yaml index 1b6c19f8..be1018fd 100644 --- a/konflux-configs/base/stream/model-validation/overlay/kustomization.yaml +++ b/konflux-configs/base/stream/model-validation/overlay/kustomization.yaml @@ -5,3 +5,4 @@ resources: - main - tech-preview - v1-0 + - fbc