Skip to content

Commit 6d1cbbb

Browse files
treddy08treddy08
authored
Merge pull request #6 from redhat-gpte-devopsautomation/master
Merge templates
2 parents 0eae719 + 2ca0e56 commit 6d1cbbb

File tree

9 files changed

+159
-219
lines changed

9 files changed

+159
-219
lines changed

‎scaffolder-templates/gitlab/coolstore/catalog-spring-boot/manifests/helm/build/templates/external-secret-rekor-public-key.yaml

-16
This file was deleted.

‎scaffolder-templates/gitlab/coolstore/catalog-spring-boot/template.yaml

+38-38
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
title: Cluster Id
3737
type: string
3838
description: Id of the cluster
39-
default: .apps.cluster-pp72k.sandbox1540.opentlc.com
39+
default: {{ cluster_subdomain }}
4040
namespace:
4141
title: Namespace
4242
type: string
@@ -77,7 +77,7 @@ spec:
7777
title: Image Host
7878
type: string
7979
description: Host for storing image
80-
default: quay-pp72k.apps.cluster-pp72k.sandbox1540.opentlc.com
80+
default: {{ quay_host }}
8181
image_organization:
8282
title: Organization
8383
type: string
@@ -100,7 +100,7 @@ spec:
100100
title: Repo Host
101101
type: string
102102
description: Your SCM host
103-
default: gitlab-gitlab.apps.cluster-pp72k.sandbox1540.opentlc.com
103+
default: {{ gitlab_host }}
104104
owner:
105105
title: Repo Owner
106106
type: string
@@ -126,30 +126,30 @@ spec:
126126
copyWithoutTemplating:
127127
- .github/workflows/*
128128
values:
129-
component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
130-
description: ${{ parameters.description }}
131-
namespace_raw: ${{ parameters.namespace }}
132-
namespace: ${{ parameters.namespace }}-dev
133-
owner: ${{ user.entity.metadata.name }}
134-
cluster: ${{ parameters.cluster_id }}
135-
host: ${{ parameters.repo.host }}
136-
destination: ${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}
137-
quay_destination: ${{ parameters.image_organization}}/${{ parameters.namespace }}-${{ parameters.application_id }}
129+
component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
130+
description: {{ '${{ parameters.description }}' }}
131+
namespace_raw: {{ '${{ parameters.namespace }}' }}
132+
namespace: {{ '${{ parameters.namespace }}' }}-dev
133+
owner: {{ '${{ user.entity.metadata.name }}' }}
134+
cluster: {{ '${{ parameters.cluster_id }}' }}
135+
host: {{ '${{ parameters.repo.host }}' }}
136+
destination: {{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
137+
quay_destination: {{ '${{ parameters.image_organization}}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
138138
port: 8080
139-
verify_commits: ${{ parameters.repo.verify_commits }}
139+
verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
140140

141141
- id: publish
142142
name: Publish
143143
action: publish:gitlab
144144
input:
145-
repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}"
145+
repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}"
146146
repoVisibility: public
147147

148148
- id: register
149149
name: Register
150150
action: catalog:register
151151
input:
152-
repoContentsUrl: ${{ steps.publish.output.repoContentsUrl }}
152+
repoContentsUrl: {{ '${{ steps.publish.output.repoContentsUrl }}' }}
153153
catalogInfoPath: "/catalog-info.yaml"
154154

155155
- id: template-gitops-deployment
@@ -159,50 +159,50 @@ spec:
159159
url: ./manifests
160160
copyWithoutTemplating: []
161161
values:
162-
component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
163-
description: ${{ parameters.description }}
164-
destination: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
165-
source_repository: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}.git
166-
repository_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
167-
git_owner: ${{ parameters.repo.owner }}
168-
cluster: ${{ parameters.cluster_id }}
169-
namespace: ${{ parameters.namespace }}
170-
image_registry: ${{ parameters.image_registry }}
171-
image_host: ${{ parameters.image_host }}
172-
image_organization: ${{ parameters.image_organization }}
173-
image_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
174-
image_tag: ${{ parameters.image_tag }}
162+
component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
163+
description: {{ '${{ parameters.description }}' }}
164+
destination: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
165+
source_repository: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}.git
166+
repository_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
167+
git_owner: {{ '${{ parameters.repo.owner }}' }}
168+
cluster: {{ '${{ parameters.cluster_id }}' }}
169+
namespace: {{ '${{ parameters.namespace }}' }}
170+
image_registry: {{ '${{ parameters.image_registry }}' }}
171+
image_host: {{ '${{ parameters.image_host }}' }}
172+
image_organization: {{ '${{ parameters.image_organization }}' }}
173+
image_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
174+
image_tag: {{ '${{ parameters.image_tag }}' }}
175175
port: 8080
176-
repository_host: ${{ parameters.repo.host }}
176+
repository_host: {{ '${{ parameters.repo.host }}' }}
177177
deployment_name: quarkus-template
178-
user: ${{ user.entity.metadata.name }}
179-
verify_commits: ${{ parameters.repo.verify_commits }}
178+
user: {{ '${{ user.entity.metadata.name }}' }}
179+
verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
180180
targetPath: ./tenant-gitops
181181

182182
- id: publish-gitops
183183
name: Publishing to Resource Repository
184184
action: publish:gitlab
185185
input:
186-
repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}-gitops"
187-
title: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
188-
description: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
186+
repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops"
187+
title: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
188+
description: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
189189
sourcePath: ./tenant-gitops
190190
repoVisibility: public
191191

192192
- id: create-argocd-resources
193193
name: Create ArgoCD Resources
194194
action: argocd:create-resources
195195
input:
196-
appName: ${{ parameters.namespace }}-${{ parameters.application_id }}-bootstrap
196+
appName: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-bootstrap
197197
argoInstance: main
198198
namespace: janus-argocd
199-
repoUrl: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
199+
repoUrl: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
200200
path: 'argocd/'
201201

202202
output:
203203
links:
204204
- title: Source Code Repository
205-
url: ${{ steps.publish.output.remoteUrl }}
205+
url: {{ '${{ steps.publish.output.remoteUrl }}' }}
206206
- title: Open Component in catalog
207207
icon: catalog
208-
entityRef: ${{ steps.register.output.entityRef }}
208+
entityRef: {{ '${{ steps.register.output.entityRef }}' }}

‎scaffolder-templates/gitlab/coolstore/gateway-vertx/manifests/helm/build/templates/external-secret-rekor-public-key.yaml

-16
This file was deleted.

‎scaffolder-templates/gitlab/coolstore/gateway-vertx/template.yaml

+38-38
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
title: Cluster Id
3737
type: string
3838
description: Id of the cluster
39-
default: .apps.cluster-pp72k.sandbox1540.opentlc.com
39+
default: {{ cluster_subdomain }}
4040
namespace:
4141
title: Namespace
4242
type: string
@@ -77,7 +77,7 @@ spec:
7777
title: Image Host
7878
type: string
7979
description: Host for storing image
80-
default: quay-pp72k.apps.cluster-pp72k.sandbox1540.opentlc.com
80+
default: {{ quay_host }}
8181
image_organization:
8282
title: Organization
8383
type: string
@@ -100,7 +100,7 @@ spec:
100100
title: Repo Host
101101
type: string
102102
description: Your SCM host
103-
default: gitlab-gitlab.apps.cluster-pp72k.sandbox1540.opentlc.com
103+
default: {{ gitlab_host }}
104104
owner:
105105
title: Repo Owner
106106
type: string
@@ -126,30 +126,30 @@ spec:
126126
copyWithoutTemplating:
127127
- .github/workflows/*
128128
values:
129-
component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
130-
description: ${{ parameters.description }}
131-
namespace_raw: ${{ parameters.namespace }}
132-
namespace: ${{ parameters.namespace }}-dev
133-
owner: ${{ user.entity.metadata.name }}
134-
cluster: ${{ parameters.cluster_id }}
135-
host: ${{ parameters.repo.host }}
136-
destination: ${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}
137-
quay_destination: ${{ parameters.image_organization}}/${{ parameters.namespace }}-${{ parameters.application_id }}
129+
component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
130+
description: {{ '${{ parameters.description }}' }}
131+
namespace_raw: {{ '${{ parameters.namespace }}' }}
132+
namespace: {{ '${{ parameters.namespace }}' }}-dev
133+
owner: {{ '${{ user.entity.metadata.name }}' }}
134+
cluster: {{ '${{ parameters.cluster_id }}' }}
135+
host: {{ '${{ parameters.repo.host }}' }}
136+
destination: {{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
137+
quay_destination: {{ '${{ parameters.image_organization}}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
138138
port: 8080
139-
verify_commits: ${{ parameters.repo.verify_commits }}
139+
verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
140140

141141
- id: publish
142142
name: Publish
143143
action: publish:gitlab
144144
input:
145-
repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}"
145+
repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}"
146146
repoVisibility: public
147147

148148
- id: register
149149
name: Register
150150
action: catalog:register
151151
input:
152-
repoContentsUrl: ${{ steps.publish.output.repoContentsUrl }}
152+
repoContentsUrl: {{ '${{ steps.publish.output.repoContentsUrl }}' }}
153153
catalogInfoPath: "/catalog-info.yaml"
154154

155155
- id: template-gitops-deployment
@@ -159,50 +159,50 @@ spec:
159159
url: ./manifests
160160
copyWithoutTemplating: []
161161
values:
162-
component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
163-
description: ${{ parameters.description }}
164-
destination: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
165-
source_repository: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}.git
166-
repository_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
167-
git_owner: ${{ parameters.repo.owner }}
168-
cluster: ${{ parameters.cluster_id }}
169-
namespace: ${{ parameters.namespace }}
170-
image_registry: ${{ parameters.image_registry }}
171-
image_host: ${{ parameters.image_host }}
172-
image_organization: ${{ parameters.image_organization }}
173-
image_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
174-
image_tag: ${{ parameters.image_tag }}
162+
component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
163+
description: {{ '${{ parameters.description }}' }}
164+
destination: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
165+
source_repository: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}.git
166+
repository_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
167+
git_owner: {{ '${{ parameters.repo.owner }}' }}
168+
cluster: {{ '${{ parameters.cluster_id }}' }}
169+
namespace: {{ '${{ parameters.namespace }}' }}
170+
image_registry: {{ '${{ parameters.image_registry }}' }}
171+
image_host: {{ '${{ parameters.image_host }}' }}
172+
image_organization: {{ '${{ parameters.image_organization }}' }}
173+
image_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
174+
image_tag: {{ '${{ parameters.image_tag }}' }}
175175
port: 8080
176-
repository_host: ${{ parameters.repo.host }}
176+
repository_host: {{ '${{ parameters.repo.host }}' }}
177177
deployment_name: quarkus-template
178-
user: ${{ user.entity.metadata.name }}
179-
verify_commits: ${{ parameters.repo.verify_commits }}
178+
user: {{ '${{ user.entity.metadata.name }}' }}
179+
verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
180180
targetPath: ./tenant-gitops
181181

182182
- id: publish-gitops
183183
name: Publishing to Resource Repository
184184
action: publish:gitlab
185185
input:
186-
repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}-gitops"
187-
title: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
188-
description: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
186+
repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops"
187+
title: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
188+
description: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
189189
sourcePath: ./tenant-gitops
190190
repoVisibility: public
191191

192192
- id: create-argocd-resources
193193
name: Create ArgoCD Resources
194194
action: argocd:create-resources
195195
input:
196-
appName: ${{ parameters.namespace }}-${{ parameters.application_id }}-bootstrap
196+
appName: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-bootstrap
197197
argoInstance: main
198198
namespace: janus-argocd
199-
repoUrl: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
199+
repoUrl: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
200200
path: 'argocd/'
201201

202202
output:
203203
links:
204204
- title: Source Code Repository
205-
url: ${{ steps.publish.output.remoteUrl }}
205+
url: {{ '${{ steps.publish.output.remoteUrl }}' }}
206206
- title: Open Component in catalog
207207
icon: catalog
208-
entityRef: ${{ steps.register.output.entityRef }}
208+
entityRef: {{ '${{ steps.register.output.entityRef }}' }}

‎scaffolder-templates/gitlab/coolstore/inventory-quarkus/manifests/helm/build/templates/external-secret-rekor-public-key.yaml

-16
This file was deleted.

0 commit comments

Comments
 (0)