Conversation
Configuration Diff17 document(s) impacted: + 13 added
- 0 removed
! 4 modifiedDiff@@ spec.resources.appstudio.redhat.com/v1alpha1/ReleasePlan/promote-to-candidate-{{.application}}{{.nameSuffix}}.spec.tenantPipeline.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/ansible-template
! - one list entry removed:
- - name: revision
- value: RHTAS-build-bot_candidate-images-{{.version}}
@@ spec.resources.appstudio.redhat.com/v1alpha1/ReleasePlan/promote-to-candidate-{{.application}}{{.nameSuffix}}.spec.tenantPipeline.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/operator-template
! - one list entry removed:
- - name: revision
- value: RHTAS-build-bot_candidate-images-{{.version}}
@@ spec.resources.appstudio.redhat.com/v1alpha1/ReleasePlan/promote-to-candidate-{{.application}}{{.nameSuffix}}.spec.tenantPipeline.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/tas-tools-template
! - one list entry removed:
- - name: revision
- value: RHTAS-build-bot_candidate-images-{{.version}}
@@ spec.resources.appstudio.redhat.com/v1alpha1/ReleasePlan/promote-to-candidate-{{.application}}{{.nameSuffix}}.spec.tenantPipeline.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/tough-template
! - one list entry removed:
- - name: revision
- value: RHTAS-build-bot_candidate-images-{{.version}}
@@ (root level) @@
# projctl.konflux.dev/v1beta1/Project/rhtas-tenant/rekor-monitor
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: Project
+ metadata:
+ name: rekor-monitor
+ namespace: rhtas-tenant
+ spec:
+ description: "Rekor transparency log monitoring"
+ displayName: "Red Hat Trusted Artifact Signer Rekor Monitor"
@@ (root level) @@
# projctl.konflux.dev/v1beta1/Project/rhtas-tenant/segment-backup-job
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: Project
+ metadata:
+ name: segment-backup-job
+ namespace: rhtas-tenant
+ spec:
+ description: |
+ Segment backup job for TAS (deprecated in 1.4+)
+
+ displayName: "Red Hat Trusted Artifact Signer Segment Backup Job"
@@ (root level) @@
# projctl.konflux.dev/v1beta1/Project/rhtas-tenant/tas-components
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: Project
+ metadata:
+ name: tas-components
+ namespace: rhtas-tenant
+ spec:
+ description: |
+ Dependencies of the TAS Operator
+
+ displayName: tas-components
@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/rekor-monitor-main
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: ProjectDevelopmentStream
+ metadata:
+ name: rekor-monitor-main
+ namespace: rhtas-tenant
+ spec:
+ project: rekor-monitor
+ template:
+ name: rekor-monitor-template
+ values:
+ - name: version
+ value: main
+ - name: branch
+ value: main
+ - name: nameSuffix
+ value:
@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/rekor-monitor-v1-3
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: ProjectDevelopmentStream
+ metadata:
+ name: rekor-monitor-v1-3
+ namespace: rhtas-tenant
+ spec:
+ project: rekor-monitor
+ template:
+ name: rekor-monitor-template
+ values:
+ - name: version
+ value: v1.3
+ - name: branch
+ value: release-1.3
@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/segment-backup-job-v1-2
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: ProjectDevelopmentStream
+ metadata:
+ name: segment-backup-job-v1-2
+ namespace: rhtas-tenant
+ spec:
+ project: segment-backup-job
+ template:
+ name: segment-backup-job-template
+ values:
+ - name: version
+ value: v1.2
+ - name: branch
+ value: release-1.2
+ - name: mintmakerDisabled
+ value: "true"
@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/segment-backup-job-v1-3
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: ProjectDevelopmentStream
+ metadata:
+ name: segment-backup-job-v1-3
+ namespace: rhtas-tenant
+ spec:
+ project: segment-backup-job
+ template:
+ name: segment-backup-job-template
+ values:
+ - name: version
+ value: v1.3
+ - name: branch
+ value: release-1.3
@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/tas-components-main
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: ProjectDevelopmentStream
+ metadata:
+ name: tas-components-main
+ namespace: rhtas-tenant
+ spec:
+ project: tas-components
+ template:
+ name: tas-components-template
+ values:
+ - name: version
+ value: main
+ - name: branch
+ value: main
+ - name: nameSuffix
+ value:
@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/tas-components-v1-2
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: ProjectDevelopmentStream
+ metadata:
+ name: tas-components-v1-2
+ namespace: rhtas-tenant
+ spec:
+ project: tas-components
+ template:
+ name: tas-components-template
+ values:
+ - name: version
+ value: v1.2
+ - name: branch
+ value: release-1.2
+ - name: mintmakerDisabled
+ value: "true"
@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/tas-components-v1-3
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: ProjectDevelopmentStream
+ metadata:
+ name: tas-components-v1-3
+ namespace: rhtas-tenant
+ spec:
+ project: tas-components
+ template:
+ name: tas-components-template
+ values:
+ - name: version
+ value: v1.3
+ - name: branch
+ value: release-1.3
@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/rekor-monitor-template
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: ProjectDevelopmentStreamTemplate
+ metadata:
+ name: rekor-monitor-template
+ namespace: rhtas-tenant
+ labels:
+ build.rhtas.com/ec: registry-rhtas
+ build.rhtas.com/type: component
+ spec:
+ resources:
+ - apiVersion: appstudio.redhat.com/v1alpha1
+ kind: Application
+ metadata:
+ name: {{.application}}{{.nameSuffix}}
+ annotations:
+ application.thumbnail: 5
+ spec:
+ displayName: "{{.application}} ({{.version}})"
+ - apiVersion: appstudio.redhat.com/v1beta2
+ kind: IntegrationTestScenario
+ metadata:
+ name: {{.application}}{{.nameSuffix}}-enterprise-contract
+ annotations:
+ test.appstudio.openshift.io/kind: enterprise-contract
+ spec:
+ application: {{.application}}{{.nameSuffix}}
+ params:
+ - name: POLICY_CONFIGURATION
+ value: rhtap-releng-tenant/registry-rhtas
+ resolverRef:
+ params:
+ - name: url
+ value: "https://github.com/konflux-ci/build-definitions"
+ - name: revision
+ value: main
+ - name: pathInRepo
+ value: pipelines/enterprise-contract.yaml
+ resolver: git
+ resourceKind: pipeline
+ - apiVersion: appstudio.redhat.com/v1alpha1
+ kind: ReleasePlan
+ metadata:
+ name: promote-to-candidate-{{.application}}{{.nameSuffix}}
+ labels:
+ release.appstudio.openshift.io/auto-release: "true"
+ release.appstudio.openshift.io/standing-attribution: "true"
+ spec:
+ application: {{.application}}{{.nameSuffix}}
+ tenantPipeline:
+ params:
+ - name: git-url
+ value: "https://github.com/securesign/releases"
+ - name: code-freeze
+ value: "false"
+ - name: type
+ value: component
+ pipelineRef:
+ params:
+ - name: url
+ value: "https://github.com/securesign/pipelines"
+ - name: revision
+ value: main
+ - name: pathInRepo
+ value: pipelines/promote-to-candidate.yaml
+ resolver: git
+ serviceAccountName: rhtas-build-bot
+ - apiVersion: appstudio.redhat.com/v1alpha1
+ kind: Component
+ metadata:
+ name: rekor-monitor{{.nameSuffix}}
+ annotations:
+ build.appstudio.openshift.io/pipeline: "{\"name\":\"docker-build-oci-ta\",\"bundle\":\"latest\"}"
+ git-provider: github
+ git-provider-url: "https://github.com"
+ mintmaker.appstudio.redhat.com/disabled: {{.mintmakerDisabled}}
+ spec:
+ source:
+ git:
+ url: "https://github.com/securesign/rekor-monitor"
+ dockerfileUrl: Dockerfile.rekor-monitor.rh
+ revision: {{.branch}}
+ application: {{.application}}{{.nameSuffix}}
+ componentName: rekor-monitor
+ - apiVersion: appstudio.redhat.com/v1alpha1
+ kind: ImageRepository
+ metadata:
+ name: rekor-monitor{{.nameSuffix}}
+ annotations:
+ image-controller.appstudio.redhat.com/update-component-image: "true"
+ labels:
+ appstudio.redhat.com/application: {{.application}}{{.nameSuffix}}
+ appstudio.redhat.com/component: rekor-monitor{{.nameSuffix}}
+ spec:
+ image:
+ name: rhtas-tenant/rekor-monitor
+ visibility: public
+ notifications:
+ - config:
+ url: "https://bombino.api.redhat.com/v1/sbom/quay/push"
+ event: repo_push
+ method: webhook
+ title: SBOM-event-to-Bombino
+ project: rekor-monitor
+ variables:
+ - name: version
+ description: "A version number for a new development stream"
+ - name: branch
+ defaultValue: main
+ description: "Git branch"
+ - name: nameSuffix
+ defaultValue: "-{{hyphenize .version}}"
+ description: "A suffix which will be added to K8s resource name"
+ - name: application
+ defaultValue: rekor-monitor
+ description: "The application name"
+ - name: mintmakerDisabled
+ defaultValue: "false"
+ description: "Whether to disable mintmaker annotation on the Component"
@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/segment-backup-job-template
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: ProjectDevelopmentStreamTemplate
+ metadata:
+ name: segment-backup-job-template
+ namespace: rhtas-tenant
+ labels:
+ build.rhtas.com/ec: registry-rhtas
+ build.rhtas.com/type: component
+ spec:
+ resources:
+ - apiVersion: appstudio.redhat.com/v1alpha1
+ kind: Application
+ metadata:
+ name: {{.application}}{{.nameSuffix}}
+ annotations:
+ application.thumbnail: 5
+ spec:
+ displayName: "{{.application}} ({{.version}})"
+ - apiVersion: appstudio.redhat.com/v1beta2
+ kind: IntegrationTestScenario
+ metadata:
+ name: {{.application}}{{.nameSuffix}}-enterprise-contract
+ annotations:
+ test.appstudio.openshift.io/kind: enterprise-contract
+ spec:
+ application: {{.application}}{{.nameSuffix}}
+ params:
+ - name: POLICY_CONFIGURATION
+ value: rhtap-releng-tenant/registry-rhtas
+ resolverRef:
+ params:
+ - name: url
+ value: "https://github.com/konflux-ci/build-definitions"
+ - name: revision
+ value: main
+ - name: pathInRepo
+ value: pipelines/enterprise-contract.yaml
+ resolver: git
+ resourceKind: pipeline
+ - apiVersion: appstudio.redhat.com/v1alpha1
+ kind: ReleasePlan
+ metadata:
+ name: promote-to-candidate-{{.application}}{{.nameSuffix}}
+ labels:
+ release.appstudio.openshift.io/auto-release: "true"
+ release.appstudio.openshift.io/standing-attribution: "true"
+ spec:
+ application: {{.application}}{{.nameSuffix}}
+ tenantPipeline:
+ params:
+ - name: git-url
+ value: "https://github.com/securesign/releases"
+ - name: code-freeze
+ value: "false"
+ - name: type
+ value: component
+ pipelineRef:
+ params:
+ - name: url
+ value: "https://github.com/securesign/pipelines"
+ - name: revision
+ value: main
+ - name: pathInRepo
+ value: pipelines/promote-to-candidate.yaml
+ resolver: git
+ serviceAccountName: rhtas-build-bot
+ - apiVersion: appstudio.redhat.com/v1alpha1
+ kind: Component
+ metadata:
+ name: segment-backup-job{{.nameSuffix}}
+ annotations:
+ build.appstudio.openshift.io/pipeline: "{\"name\":\"docker-build-oci-ta\",\"bundle\":\"latest\"}"
+ git-provider: github
+ git-provider-url: "https://github.com"
+ mintmaker.appstudio.redhat.com/disabled: {{.mintmakerDisabled}}
+ spec:
+ source:
+ git:
+ url: "https://github.com/securesign/segment-backup-job"
+ dockerfileUrl: Dockerfile.segment-backup-job.rh
+ revision: {{.branch}}
+ application: {{.application}}{{.nameSuffix}}
+ componentName: segment-backup-job
+ - apiVersion: appstudio.redhat.com/v1alpha1
+ kind: ImageRepository
+ metadata:
+ name: segment-backup-job{{.nameSuffix}}
+ annotations:
+ image-controller.appstudio.redhat.com/update-component-image: "true"
+ labels:
+ appstudio.redhat.com/application: {{.application}}{{.nameSuffix}}
+ appstudio.redhat.com/component: segment-backup-job{{.nameSuffix}}
+ spec:
+ image:
+ name: rhtas-tenant/segment-backup-job
+ visibility: public
+ notifications:
+ - config:
+ url: "https://bombino.api.redhat.com/v1/sbom/quay/push"
+ event: repo_push
+ method: webhook
+ title: SBOM-event-to-Bombino
+ project: segment-backup-job
+ variables:
+ - name: version
+ description: "A version number for a new development stream"
+ - name: branch
+ defaultValue: main
+ description: "Git branch"
+ - name: nameSuffix
+ defaultValue: "-{{hyphenize .version}}"
+ description: "A suffix which will be added to K8s resource name"
+ - name: application
+ defaultValue: segment-backup-job
+ description: "The application name"
+ - name: mintmakerDisabled
+ defaultValue: "false"
+ description: "Whether to disable mintmaker annotation on the Component"
@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/tas-components-template
! + one document added:
+ ---
+ apiVersion: projctl.konflux.dev/v1beta1
+ kind: ProjectDevelopmentStreamTemplate
+ metadata:
+ name: tas-components-template
+ namespace: rhtas-tenant
+ labels:
+ build.rhtas.com/ec: registry-rhtas
+ build.rhtas.com/type: component
+ spec:
+ resources:
+ - apiVersion: appstudio.redhat.com/v1alpha1
+ kind: Application
+ metadata:
+ name: {{.application}}{{.nameSuffix}}
+ annotations:
+ application.thumbnail: 5
+ spec:
+ displayName: "{{.application}} ({{.version}})"
+ - apiVersion: appstudio.redhat.com/v1beta2
+ kind: IntegrationTestScenario
+ metadata:
+ name: {{.application}}{{.nameSuffix}}-enterprise-contract
+ annotations:
+ test.appstudio.openshift.io/kind: enterprise-contract
+ spec:
+ application: {{.application}}{{.nameSuffix}}
+ params:
+ - name: POLICY_CONFIGURATION
+ value: rhtap-releng-tenant/registry-rhtas
+ resolverRef:
+ params:
+ - name: url
+ value: "https://github.com/konflux-ci/build-definitions"
+ - name: revision
+ value: main
+ - name: pathInRepo
+ value: pipelines/enterprise-contract.yaml
+ resolver: git
+ resourceKind: pipeline
+ - apiVersion: appstudio.redhat.com/v1alpha1
+ kind: ReleasePlan
... (diff truncated, showing first 500 lines)📦 Artifacts: base-output.yaml, head-output.yaml, dyff-output.txt |
konflux-configs/base/project/overlay/tas-components/patch/certificate-transparency-go.yaml
Outdated
Show resolved
Hide resolved
osmman
left a comment
There was a problem hiding this comment.
The konflux-configs/base/stream/overlay/ directory is orphaned and can be safely deleted. It's not referenced anywhere in the codebase (only rhtas/overlay is used via base/stream/kustomization.yaml), and its kustomization files reference non-existent resources like rhtas-operator-stream.yaml and patch/mintmaker.yaml. All active stream configuration lives in konflux-configs/base/stream/rhtas/overlay/.
4583966 to
aa1d55c
Compare
801062e to
fc52ac5
Compare
konflux-configs/base/project/overlay/tas-components/patch/trillian-createtree.yaml
Show resolved
Hide resolved
fc52ac5 to
f5ee492
Compare
Signed-off-by: Kevin Conner <kconner@redhat.com>
feat: Add support for rekor-monitor and segment-backup-job
PR Compliance Guide 🔍Below is a summary of compliance checks for this PR:
Compliance status legend🟢 - Fully Compliant🟡 - Partial Compliant 🔴 - Not Compliant ⚪ - Requires Further Human Verification 🏷️ - Compliance label |
||||||||||||||||||||||||
PR Code Suggestions ✨Explore these optional code suggestions:
|
|||||||||||||||||
User description
Tas Components side of the Konflux Re-org, This pr is in draft whilst we repair the Snapshot automation tooling for Tas-Tools, Once we repaired we should be able to comfortably merge this Pr.
PR Type
Enhancement
Description
Add three new Konflux projects: rekor-monitor, segment-backup-job, tas-components
Define project overlays with kustomization, templates, and component patches
Create development streams for new projects with configurable variables
Exclude segment-backup-job from main stream and rekor-monitor from v1-2 stream
Diagram Walkthrough
File Walkthrough
18 files
Register three new project overlaysDefine rekor-monitor project kustomization structureDefine rekor-monitor project metadataDefine rekor-monitor development stream templateDefine segment-backup-job project kustomization structureDefine segment-backup-job project metadataDefine segment-backup-job development stream templateDefine tas-components project with eleven component patchesDefine tas-components project metadataDefine tas-components development stream templateRegister three new development stream resourcesCreate rekor-monitor development stream instanceCreate segment-backup-job development stream instanceCreate tas-components development stream instanceAdd patch to exclude segment-backup-job from mainExclude segment-backup-job stream from main overlayAdd patch to exclude rekor-monitor from v1-2Exclude rekor-monitor stream from v1-2 overlay13 files
Add rekor-monitor component and image repositoryAdd segment-backup-job component and image repositoryAdd backfill-redis component and image repositoryAdd certificate-transparency-go component and image repositoryAdd fulcio-server component and image repositoryAdd rekor-search component and image repositoryAdd rekor-server component and image repositoryAdd timestamp-authority component and image repositoryAdd trillian createtree component and image repositoryAdd trillian database component and image repositoryAdd trillian logserver component and image repositoryAdd trillian logsigner component and image repositoryAdd trillian redis component and image repository1 files
Remove trailing whitespace from kustomization file