Skip to content

Import rhtas-console & rhtas-console-ui as code#456

Merged
tommyd450 merged 6 commits into
mainfrom
eli/RhtasConsoleAndConsoleUi
Mar 25, 2026
Merged

Import rhtas-console & rhtas-console-ui as code#456
tommyd450 merged 6 commits into
mainfrom
eli/RhtasConsoleAndConsoleUi

Conversation

@Elijah-Destigni
Copy link
Copy Markdown
Contributor

No description provided.

@tommyd450
Copy link
Copy Markdown
Contributor

rhtas-console and rhtas-console ui should be rolled together into the one directory.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Mar 24, 2026

Configuration Diff

14 document(s) impacted:

+ 3 added
- 7 removed
! 4 modified
Diff
@@ spec.resources @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/cli-stacks-template
! - four list entries removed:
- - apiVersion: appstudio.redhat.com/v1alpha1
-   kind: Component
-   metadata:
-     name: model-transparency-cli-stack{{.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/model-transparency-go"
-         dockerfileUrl: Containerfile.cli-stack.rh
-         revision: {{.branch}}
-     application: {{.application}}{{.nameSuffix}}
-     componentName: model-transparency-cli-stack
- - apiVersion: appstudio.redhat.com/v1alpha1
-   kind: ImageRepository
-   metadata:
-     name: model-transparency-cli-stack{{.nameSuffix}}
-     annotations:
-       image-controller.appstudio.redhat.com/update-component-image: "true"
-     labels:
-       appstudio.redhat.com/application: {{.application}}{{.nameSuffix}}
-       appstudio.redhat.com/component: model-transparency-cli-stack{{.nameSuffix}}
-   spec:
-     image:
-       name: rhtas-tenant/model-transparency-cli-stack
-       visibility: public
-     notifications:
-     - config:
-         url: "https://bombino.api.redhat.com/v1/sbom/quay/push"
-       event: repo_push
-       method: webhook
-       title: SBOM-event-to-Bombino
- - apiVersion: appstudio.redhat.com/v1alpha1
-   kind: Component
-   metadata:
-     name: conforma-cli-stack{{.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/conforma/cli"
-         dockerfileUrl: Dockerfile.cli-stack.rh
-         revision: release-v0.8
-     application: {{.application}}{{.nameSuffix}}
-     componentName: conforma-cli-stack
- - apiVersion: appstudio.redhat.com/v1alpha1
-   kind: ImageRepository
-   metadata:
-     name: conforma-cli-stack{{.nameSuffix}}
-     annotations:
-       image-controller.appstudio.redhat.com/update-component-image: "true"
-     labels:
-       appstudio.redhat.com/application: {{.application}}{{.nameSuffix}}
-       appstudio.redhat.com/component: conforma-cli-stack{{.nameSuffix}}
-   spec:
-     image:
-       name: rhtas-tenant/conforma-cli-stack
-       visibility: public
-     notifications:
-     - config:
-         url: "https://bombino.api.redhat.com/v1/sbom/quay/push"
-       event: repo_push
-       method: webhook
-       title: SBOM-event-to-Bombino

@@ spec.resources.Component.spec.build-nudges-ref @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/model-transparency-go-template
! - one list entry removed:
- - model-transparency-cli-stack{{.nameSuffix}}

@@ spec.resources @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/model-validation-operator-template
! - two list entries removed:
- - apiVersion: appstudio.redhat.com/v1alpha1
-   kind: ImageRepository
-   metadata:
-     name: model-validation-operator-agent{{.nameSuffix}}
-     annotations:
-       image-controller.appstudio.redhat.com/update-component-image: "true"
-     labels:
-       appstudio.redhat.com/application: {{.application}}{{.nameSuffix}}
-       appstudio.redhat.com/component: model-validation-operator-agent{{.nameSuffix}}
-   spec:
-     image:
-       name: rhtas-tenant/model-validation-operator-agent
-       visibility: public
-     notifications:
-     - config:
-         url: "https://bombino.api.redhat.com/v1/sbom/quay/push"
-       event: repo_push
-       method: webhook
-       title: SBOM-event-to-Bombino
- - apiVersion: appstudio.redhat.com/v1alpha1
-   kind: Component
-   metadata:
-     name: model-validation-operator-agent{{.nameSuffix}}
-     annotations:
-       mintmaker.appstudio.redhat.com/disabled: {{.mintmakerDisabled}}
-   spec:
-     source:
-       git:
-         url: "https://github.com/securesign/model-validation-operator"
-         context: ./
-         dockerfileUrl: Dockerfile.model-validation-agent.rh
-         revision: {{.branch}}
-     application: {{.application}}{{.nameSuffix}}
-     componentName: model-validation-operator-agent{{.nameSuffix}}

@@ spec.resources @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/pco-fbc-template
! - one list entry removed:
- - apiVersion: appstudio.redhat.com/v1alpha1
-   kind: ImageRepository
-   metadata:
-     name: {{.application}}{{.nameSuffix}}
-     annotations:
-       image-controller.appstudio.redhat.com/update-component-image: "true"
-     labels:
-       appstudio.redhat.com/application: {{.application}}{{.nameSuffix}}
-       appstudio.redhat.com/component: {{.application}}{{.nameSuffix}}
-   spec:
-     image:
-       name: rhtas-tenant/{{.application}}
-       visibility: public
-     notifications:
-     - config:
-         url: "https://bombino.api.redhat.com/v1/sbom/quay/push"
-       event: repo_push
-       method: webhook
-       title: SBOM-event-to-Bombino

@@ (root level) @@
# appstudio.redhat.com/v1alpha1/Application/rhtas-tenant/rhtas-console
! - one document removed:
- ---
- apiVersion: appstudio.redhat.com/v1alpha1
- kind: Application
- metadata:
-   name: rhtas-console
-   namespace: rhtas-tenant
- spec:
-   displayName: "rhtas-console (main)"

@@ (root level) @@
# appstudio.redhat.com/v1alpha1/Component/rhtas-tenant/rhtas-console
! - one document removed:
- ---
- apiVersion: appstudio.redhat.com/v1alpha1
- kind: Component
- metadata:
-   name: rhtas-console
-   namespace: rhtas-tenant
-   annotations:
-     build.appstudio.openshift.io/pipeline: "{\"name\":\"docker-build-oci-ta\",\"bundle\":\"latest\"}"
-     git-provider: github
-     git-provider-url: "https://github.com"
- spec:
-   source:
-     git:
-       url: "https://github.com/securesign/rhtas-console"
-       dockerfileUrl: Dockerfile.rh
-       revision: main
-   application: rhtas-console
-   componentName: rhtas-console

@@ (root level) @@
# appstudio.redhat.com/v1alpha1/Component/rhtas-tenant/rhtas-console-ui
! - one document removed:
- ---
- apiVersion: appstudio.redhat.com/v1alpha1
- kind: Component
- metadata:
-   name: rhtas-console-ui
-   namespace: rhtas-tenant
-   annotations:
-     build.appstudio.openshift.io/pipeline: "{\"name\":\"docker-build-oci-ta\",\"bundle\":\"latest\"}"
-     git-provider: github
-     git-provider-url: "https://github.com"
- spec:
-   source:
-     git:
-       url: "https://github.com/securesign/rhtas-console-ui/"
-       context: ./
-       dockerfileUrl: Dockerfile
-       revision: main
-   application: rhtas-console
-   componentName: rhtas-console-ui

@@ (root level) @@
# appstudio.redhat.com/v1alpha1/ImageRepository/rhtas-tenant/rhtas-console
! - one document removed:
- ---
- apiVersion: appstudio.redhat.com/v1alpha1
- kind: ImageRepository
- metadata:
-   name: rhtas-console
-   namespace: rhtas-tenant
-   labels:
-     appstudio.redhat.com/application: rhtas-console
-     appstudio.redhat.com/component: rhtas-console
- spec:
-   image:
-     name: rhtas-tenant/rhtas-console
-     visibility: public
-   notifications:
-   - config:
-       url: "https://bombino.api.redhat.com/v1/sbom/quay/push"
-     event: repo_push
-     method: webhook
-     title: SBOM-event-to-Bombino

@@ (root level) @@
# appstudio.redhat.com/v1alpha1/ImageRepository/rhtas-tenant/rhtas-console-ui
! - one document removed:
- ---
- apiVersion: appstudio.redhat.com/v1alpha1
- kind: ImageRepository
- metadata:
-   name: rhtas-console-ui
-   namespace: rhtas-tenant
-   labels:
-     appstudio.redhat.com/application: rhtas-console
-     appstudio.redhat.com/component: rhtas-console-ui
- spec:
-   image:
-     name: rhtas-tenant/rhtas-console-ui
-     visibility: public
-   notifications:
-   - config:
-       url: "https://bombino.api.redhat.com/v1/sbom/quay/push"
-     event: repo_push
-     method: webhook
-     title: SBOM-event-to-Bombino

@@ (root level) @@
# appstudio.redhat.com/v1alpha1/ReleasePlan/rhtas-tenant/promote-to-candidate-rhtas-console
! - one document removed:
- ---
- apiVersion: appstudio.redhat.com/v1alpha1
- kind: ReleasePlan
- metadata:
-   name: promote-to-candidate-rhtas-console
-   namespace: rhtas-tenant
-   labels:
-     release.appstudio.openshift.io/auto-release: "true"
-     release.appstudio.openshift.io/standing-attribution: "true"
- spec:
-   application: rhtas-console
-   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

@@ (root level) @@
# appstudio.redhat.com/v1beta2/IntegrationTestScenario/rhtas-tenant/rhtas-console-enterprise-contract
! - one document removed:
- ---
- apiVersion: appstudio.redhat.com/v1beta2
- kind: IntegrationTestScenario
- metadata:
-   name: rhtas-console-enterprise-contract
-   namespace: rhtas-tenant
-   annotations:
-     test.appstudio.openshift.io/kind: enterprise-contract
- spec:
-   application: rhtas-console
-   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

@@ (root level) @@
# projctl.konflux.dev/v1beta1/Project/rhtas-tenant/rhtas-console
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: Project
+   metadata:
+     name: rhtas-console
+     namespace: rhtas-tenant
+   spec:
+     description: "RHTAS Console is a web application that allows users to manage RHTAS."
+     displayName: "RHTAS Console"

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

@@ (root level) @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/rhtas-console-template
! + one document added:
+   ---
+   apiVersion: projctl.konflux.dev/v1beta1
+   kind: ProjectDevelopmentStreamTemplate
+   metadata:
+     name: rhtas-console-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: rhtas-console{{.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/rhtas-console"
+             dockerfileUrl: Dockerfile.rhtas-console.rh
+             revision: {{.branch}}
+         application: {{.application}}{{.nameSuffix}}
+         componentName: rhtas-console
+     - apiVersion: appstudio.redhat.com/v1alpha1
+       kind: Component
+       metadata:
+         name: rhtas-console-ui{{.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/rhtas-console-ui"
+             dockerfileUrl: Dockerfile.rhtas-console-ui.rh
+             revision: {{.branch}}
+         application: {{.application}}{{.nameSuffix}}
+         componentName: rhtas-console-ui
+     - apiVersion: appstudio.redhat.com/v1alpha1
+       kind: ImageRepository
+       metadata:
+         name: rhtas-console{{.nameSuffix}}
+         annotations:
+           image-controller.appstudio.redhat.com/update-component-image: "true"
+         labels:
+           appstudio.redhat.com/application: {{.application}}{{.nameSuffix}}
+           appstudio.redhat.com/component: rhtas-console{{.nameSuffix}}
+       spec:
+         image:
+           name: rhtas-tenant/rhtas-console
+           visibility: public
+         notifications:
+         - config:
+             url: "https://bombino.api.redhat.com/v1/sbom/quay/push"
+           event: repo_push
+           method: webhook
+           title: SBOM-event-to-Bombino
+     - apiVersion: appstudio.redhat.com/v1alpha1
+       kind: ImageRepository
+       metadata:
+         name: rhtas-console-ui{{.nameSuffix}}
+         annotations:
+           image-controller.appstudio.redhat.com/update-component-image: "true"
+         labels:
+           appstudio.redhat.com/application: {{.application}}{{.nameSuffix}}
+           appstudio.redhat.com/component: rhtas-console-ui{{.nameSuffix}}
+       spec:
+         image:
+           name: rhtas-tenant/rhtas-console-ui
+           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: rhtas-console
+     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: rhtas-console
+       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

@Elijah-Destigni Elijah-Destigni force-pushed the eli/RhtasConsoleAndConsoleUi branch from bbb8948 to baf2a8e Compare March 25, 2026 11:23
@tommyd450 tommyd450 merged commit 22cd138 into main Mar 25, 2026
4 checks passed
@tommyd450 tommyd450 deleted the eli/RhtasConsoleAndConsoleUi branch March 25, 2026 15:31
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