Skip to content

[Konflux Re Org] Adding Client Server and Create Tree#360

Merged
tommyd450 merged 2 commits intomainfrom
tdalton/ClientServerandCreateTree
Jan 22, 2026
Merged

[Konflux Re Org] Adding Client Server and Create Tree#360
tommyd450 merged 2 commits intomainfrom
tdalton/ClientServerandCreateTree

Conversation

@tommyd450
Copy link
Contributor

@tommyd450 tommyd450 commented Jan 20, 2026

Created this based upon a conversation higlighting that create tree is a central Dep for multiple parts so it made sense to have it be a seperate entity. Client Server too to avoid a recursive depenedency where a snapshot was dependent upon itself.

@github-actions
Copy link

github-actions bot commented Jan 20, 2026

Configuration Diff

10 document(s) impacted:

+ 10 added
- 0 removed
! 0 modified
Diff
@@ (root level) @@
# projctl.konflux.dev/v1beta1/Project/rhtas-tenant/client-server
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: Project
+   metadata:
+     name: client-server
+     namespace: rhtas-tenant
+   spec:
+     description: |
+       Client Server used to serve CLI tooling for RHTAS.
+       
+     displayName: client-server

@@ (root level) @@
# projctl.konflux.dev/v1beta1/Project/rhtas-tenant/create-tree
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: Project
+   metadata:
+     name: create-tree
+     namespace: rhtas-tenant
+   spec:
+     description: |
+       Create tree tooling for rhtas.
+       
+     displayName: create-tree

@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/client-server-main
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: ProjectDevelopmentStream
+   metadata:
+     name: client-server-main
+     namespace: rhtas-tenant
+   spec:
+     project: client-server
+     template:
+       name: client-server-template
+       values:
+       - name: version
+         value: main
+       - name: branch
+         value: main
+       - name: nameSuffix
+         value:

@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/client-server-v1-2
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: ProjectDevelopmentStream
+   metadata:
+     name: client-server-v1-2
+     namespace: rhtas-tenant
+   spec:
+     project: client-server
+     template:
+       name: client-server-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/client-server-v1-3
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: ProjectDevelopmentStream
+   metadata:
+     name: client-server-v1-3
+     namespace: rhtas-tenant
+   spec:
+     project: client-server
+     template:
+       name: client-server-template
+       values:
+       - name: version
+         value: v1.3
+       - name: branch
+         value: release-1.3

@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/create-tree-main
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: ProjectDevelopmentStream
+   metadata:
+     name: create-tree-main
+     namespace: rhtas-tenant
+   spec:
+     project: create-tree
+     template:
+       name: create-tree-template
+       values:
+       - name: version
+         value: main
+       - name: branch
+         value: main
+       - name: nameSuffix
+         value:

@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/create-tree-v1-2
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: ProjectDevelopmentStream
+   metadata:
+     name: create-tree-v1-2
+     namespace: rhtas-tenant
+   spec:
+     project: create-tree
+     template:
+       name: create-tree-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/create-tree-v1-3
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: ProjectDevelopmentStream
+   metadata:
+     name: create-tree-v1-3
+     namespace: rhtas-tenant
+   spec:
+     project: create-tree
+     template:
+       name: create-tree-template
+       values:
+       - name: version
+         value: v1.3
+       - name: branch
+         value: release-1.3

@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/client-server-template
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: ProjectDevelopmentStreamTemplate
+   metadata:
+     name: client-server-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: revision
+             value: RHTAS-build-bot_candidate-images-{{.version}}
+           - 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: client-server{{.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/cosign"
+             dockerfileUrl: Dockerfile.clients.rh
+             revision: {{.branch}}
+         application: {{.application}}{{.nameSuffix}}
+         componentName: client-server
+     - apiVersion: appstudio.redhat.com/v1alpha1
+       kind: ImageRepository
+       metadata:
+         name: client-server{{.nameSuffix}}
+         annotations:
+           image-controller.appstudio.redhat.com/update-component-image: "true"
+         labels:
+           appstudio.redhat.com/application: {{.application}}{{.nameSuffix}}
+           appstudio.redhat.com/component: client-server{{.nameSuffix}}
+       spec:
+         image:
+           name: rhtas-tenant/client-server
+           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: client-server
+     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: client-server
+       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/create-tree-template
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: ProjectDevelopmentStreamTemplate
+   metadata:
+     name: create-tree-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: revision
+             value: RHTAS-build-bot_candidate-images-{{.version}}
+           - 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: create-tree{{.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/trillian"
+             dockerfileUrl: Dockerfile.createtree.rh
+             revision: {{.branch}}
+         application: {{.application}}{{.nameSuffix}}
+         componentName: create-tree
+     - apiVersion: appstudio.redhat.com/v1alpha1
+       kind: ImageRepository
+       metadata:
+         name: create-tree{{.nameSuffix}}
+         annotations:
+           image-controller.appstudio.redhat.com/update-component-image: "true"
+         labels:
+           appstudio.redhat.com/application: {{.application}}{{.nameSuffix}}
+           appstudio.redhat.com/component: create-tree{{.nameSuffix}}
+       spec:
+         image:
+           name: rhtas-tenant/create-tree
+           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: create-tree
+     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: create-tree
+       description: "The application name"
+     - name: mintmakerDisabled
+       defaultValue: "false"
+       description: "Whether to disable mintmaker annotation on the Component"

📦 Artifacts: base-output.yaml, head-output.yaml, dyff-output.txt

@tommyd450
Copy link
Contributor Author

Id like to keep track of this pr as an example for how to create new entries in this CaC section of the repo.

@tommyd450 tommyd450 force-pushed the tdalton/ClientServerandCreateTree branch from b881760 to 0798fe7 Compare January 22, 2026 10:12
@tommyd450 tommyd450 merged commit ad9b1bb into main Jan 22, 2026
4 checks passed
@tommyd450 tommyd450 deleted the tdalton/ClientServerandCreateTree branch January 22, 2026 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants