Skip to content

Commit f1e415a

Browse files
thepetkthepetk
committed
Make templates rolling demo compatible
1 parent 98a8625 commit f1e415a

File tree

7 files changed

+46
-19
lines changed

7 files changed

+46
-19
lines changed

‎skeleton/template.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ spec:
7171
title: Include ArgoCD App Label?
7272
type: boolean
7373
description: Indicates whether to include a user provided ArgoCD Application Label to set
74+
default: true
7475
modelServer:
7576
# SED_LLM_SERVER_START
7677
title: Model Server
@@ -168,6 +169,7 @@ spec:
168169
title: ArgoCD Application Label
169170
type: string
170171
description: Define the label RHDH will use to identify the ArgoCD Applications
172+
default: rolling-demo
171173
modelServer:
172174
oneOf:
173175
# SED_EXISTING_START
@@ -387,6 +389,7 @@ spec:
387389
default: GitHub
388390
repoOwner:
389391
title: Repository Owner
392+
default: ai-rolling-demo
390393
type: string
391394
ui:help: The organization, user or project that this repo will belong to
392395
repoName:
@@ -446,6 +449,7 @@ spec:
446449
ui:help: "You can also provide the on-prem registry host, example: quay-tv2pb.apps.cluster-tv2pb.sandbox1194.opentlc.com"
447450
imageOrg:
448451
title: Image Organization
452+
default: rhdhpai-rolling-demo
449453
type: string
450454
description: The organization, user or project that this repo will belong to
451455
imageName:
@@ -784,7 +788,7 @@ spec:
784788
# name set in rhdh config
785789
argoInstance: ${{ parameters.argoInstance }}
786790
namespace: ${{ parameters.argoNS }}
787-
labelValue: ${{ parameters.argoAppLabel if parameters.includeArgoLabel else '' }}
791+
labelValue: rolling-demo
788792
repoUrl: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops.git
789793
path: './app-of-apps'
790794
# SED_APP_SUPPORT_START

‎templates/audio-to-text/template.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
title: ArgoCD Namespace
5454
type: string
5555
description: The target namespace of the ArgoCD deployment
56-
default: ai-rhdh
56+
default: openshift-gitops
5757
maxLength: 63
5858
argoInstance:
5959
title: ArgoCD Instance
@@ -71,6 +71,7 @@ spec:
7171
title: Include ArgoCD App Label?
7272
type: boolean
7373
description: Indicates whether to include a user provided ArgoCD Application Label to set
74+
default: true
7475
modelServer:
7576
# SED_ASR_MODEL_SERVER_START
7677
title: Model Server
@@ -114,6 +115,7 @@ spec:
114115
title: ArgoCD Application Label
115116
type: string
116117
description: Define the label RHDH will use to identify the ArgoCD Applications
118+
default: rolling-demo
117119
modelServer:
118120
oneOf:
119121
# SED_EXISTING_START
@@ -190,6 +192,7 @@ spec:
190192
default: GitHub
191193
repoOwner:
192194
title: Repository Owner
195+
default: ai-rolling-demo
193196
type: string
194197
ui:help: The organization, user or project that this repo will belong to
195198
repoName:
@@ -249,6 +252,7 @@ spec:
249252
ui:help: "You can also provide the on-prem registry host, example: quay-tv2pb.apps.cluster-tv2pb.sandbox1194.opentlc.com"
250253
imageOrg:
251254
title: Image Organization
255+
default: rhdhpai-rolling-demo
252256
type: string
253257
description: The organization, user or project that this repo will belong to
254258
imageName:
@@ -404,7 +408,7 @@ spec:
404408
appName: ${{ parameters.name }}-gitops # for now just use the component name, since it's single component app
405409
description: This is GitOps manifest for ${{ parameters.name }}
406410
namespace: ${{ parameters.remoteClusterDeploymentNamespace if parameters.deployArgoCDApplicationOnRemoteCluster else parameters.namespace }}
407-
rhdhNamespace: ai-rhdh
411+
rhdhNamespace: rolling-demo-ns
408412
# example: github.com?owner=<owner>&repo=<srcRepo>, the gitops repo name will be <srcRepo>-gitops
409413
repoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops
410414
srcRepoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}
@@ -549,7 +553,7 @@ spec:
549553
# name set in rhdh config
550554
argoInstance: ${{ parameters.argoInstance }}
551555
namespace: ${{ parameters.argoNS }}
552-
labelValue: ${{ parameters.argoAppLabel if parameters.includeArgoLabel else '' }}
556+
labelValue: rolling-demo
553557
repoUrl: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops.git
554558
path: './app-of-apps'
555559
# SED_APP_SUPPORT_START

‎templates/chatbot/template.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
title: ArgoCD Namespace
5454
type: string
5555
description: The target namespace of the ArgoCD deployment
56-
default: ai-rhdh
56+
default: openshift-gitops
5757
maxLength: 63
5858
argoInstance:
5959
title: ArgoCD Instance
@@ -71,6 +71,7 @@ spec:
7171
title: Include ArgoCD App Label?
7272
type: boolean
7373
description: Indicates whether to include a user provided ArgoCD Application Label to set
74+
default: true
7475
modelServer:
7576
# SED_LLM_SERVER_START
7677
title: Model Server
@@ -122,6 +123,7 @@ spec:
122123
title: ArgoCD Application Label
123124
type: string
124125
description: Define the label RHDH will use to identify the ArgoCD Applications
126+
default: rolling-demo
125127
modelServer:
126128
oneOf:
127129
# SED_EXISTING_START
@@ -222,6 +224,7 @@ spec:
222224
default: GitHub
223225
repoOwner:
224226
title: Repository Owner
227+
default: ai-rolling-demo
225228
type: string
226229
ui:help: The organization, user or project that this repo will belong to
227230
repoName:
@@ -281,6 +284,7 @@ spec:
281284
ui:help: "You can also provide the on-prem registry host, example: quay-tv2pb.apps.cluster-tv2pb.sandbox1194.opentlc.com"
282285
imageOrg:
283286
title: Image Organization
287+
default: rhdhpai-rolling-demo
284288
type: string
285289
description: The organization, user or project that this repo will belong to
286290
imageName:
@@ -436,7 +440,7 @@ spec:
436440
appName: ${{ parameters.name }}-gitops # for now just use the component name, since it's single component app
437441
description: This is GitOps manifest for ${{ parameters.name }}
438442
namespace: ${{ parameters.remoteClusterDeploymentNamespace if parameters.deployArgoCDApplicationOnRemoteCluster else parameters.namespace }}
439-
rhdhNamespace: ai-rhdh
443+
rhdhNamespace: rolling-demo-ns
440444
# example: github.com?owner=<owner>&repo=<srcRepo>, the gitops repo name will be <srcRepo>-gitops
441445
repoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops
442446
srcRepoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}
@@ -589,7 +593,7 @@ spec:
589593
# name set in rhdh config
590594
argoInstance: ${{ parameters.argoInstance }}
591595
namespace: ${{ parameters.argoNS }}
592-
labelValue: ${{ parameters.argoAppLabel if parameters.includeArgoLabel else '' }}
596+
labelValue: rolling-demo
593597
repoUrl: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops.git
594598
path: './app-of-apps'
595599
# SED_APP_SUPPORT_START

‎templates/codegen/template.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
title: ArgoCD Namespace
5454
type: string
5555
description: The target namespace of the ArgoCD deployment
56-
default: ai-rhdh
56+
default: openshift-gitops
5757
maxLength: 63
5858
argoInstance:
5959
title: ArgoCD Instance
@@ -71,6 +71,7 @@ spec:
7171
title: Include ArgoCD App Label?
7272
type: boolean
7373
description: Indicates whether to include a user provided ArgoCD Application Label to set
74+
default: true
7475
modelServer:
7576
# SED_LLM_SERVER_START
7677
title: Model Server
@@ -122,6 +123,7 @@ spec:
122123
title: ArgoCD Application Label
123124
type: string
124125
description: Define the label RHDH will use to identify the ArgoCD Applications
126+
default: rolling-demo
125127
modelServer:
126128
oneOf:
127129
# SED_EXISTING_START
@@ -222,6 +224,7 @@ spec:
222224
default: GitHub
223225
repoOwner:
224226
title: Repository Owner
227+
default: ai-rolling-demo
225228
type: string
226229
ui:help: The organization, user or project that this repo will belong to
227230
repoName:
@@ -281,6 +284,7 @@ spec:
281284
ui:help: "You can also provide the on-prem registry host, example: quay-tv2pb.apps.cluster-tv2pb.sandbox1194.opentlc.com"
282285
imageOrg:
283286
title: Image Organization
287+
default: rhdhpai-rolling-demo
284288
type: string
285289
description: The organization, user or project that this repo will belong to
286290
imageName:
@@ -436,7 +440,7 @@ spec:
436440
appName: ${{ parameters.name }}-gitops # for now just use the component name, since it's single component app
437441
description: This is GitOps manifest for ${{ parameters.name }}
438442
namespace: ${{ parameters.remoteClusterDeploymentNamespace if parameters.deployArgoCDApplicationOnRemoteCluster else parameters.namespace }}
439-
rhdhNamespace: ai-rhdh
443+
rhdhNamespace: rolling-demo-ns
440444
# example: github.com?owner=<owner>&repo=<srcRepo>, the gitops repo name will be <srcRepo>-gitops
441445
repoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops
442446
srcRepoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}
@@ -589,7 +593,7 @@ spec:
589593
# name set in rhdh config
590594
argoInstance: ${{ parameters.argoInstance }}
591595
namespace: ${{ parameters.argoNS }}
592-
labelValue: ${{ parameters.argoAppLabel if parameters.includeArgoLabel else '' }}
596+
labelValue: rolling-demo
593597
repoUrl: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops.git
594598
path: './app-of-apps'
595599
# SED_APP_SUPPORT_START

‎templates/model-server/template.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
title: ArgoCD Namespace
5454
type: string
5555
description: The target namespace of the ArgoCD deployment
56-
default: ai-rhdh
56+
default: openshift-gitops
5757
maxLength: 63
5858
argoInstance:
5959
title: ArgoCD Instance
@@ -71,6 +71,7 @@ spec:
7171
title: Include ArgoCD App Label?
7272
type: boolean
7373
description: Indicates whether to include a user provided ArgoCD Application Label to set
74+
default: true
7475
modelServer:
7576
# SED_LLM_SERVER_START
7677
title: Model Server
@@ -98,6 +99,7 @@ spec:
9899
title: ArgoCD Application Label
99100
type: string
100101
description: Define the label RHDH will use to identify the ArgoCD Applications
102+
default: rolling-demo
101103
modelServer:
102104
oneOf:
103105
# SED_LLM_SERVER_START
@@ -131,6 +133,7 @@ spec:
131133
default: GitHub
132134
repoOwner:
133135
title: Repository Owner
136+
default: ai-rolling-demo
134137
type: string
135138
ui:help: The organization, user or project that this repo will belong to
136139
repoName:
@@ -223,7 +226,7 @@ spec:
223226
appName: ${{ parameters.name }}-gitops # for now just use the component name, since it's single component app
224227
description: This is GitOps manifest for ${{ parameters.name }}
225228
namespace: ${{ parameters.remoteClusterDeploymentNamespace if parameters.deployArgoCDApplicationOnRemoteCluster else parameters.namespace }}
226-
rhdhNamespace: ai-rhdh
229+
rhdhNamespace: rolling-demo-ns
227230
# example: github.com?owner=<owner>&repo=<srcRepo>, the gitops repo name will be <srcRepo>-gitops
228231
repoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops
229232
srcRepoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}
@@ -358,7 +361,7 @@ spec:
358361
# name set in rhdh config
359362
argoInstance: ${{ parameters.argoInstance }}
360363
namespace: ${{ parameters.argoNS }}
361-
labelValue: ${{ parameters.argoAppLabel if parameters.includeArgoLabel else '' }}
364+
labelValue: rolling-demo
362365
repoUrl: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops.git
363366
path: './app-of-apps'
364367

‎templates/object-detection/template.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
title: ArgoCD Namespace
5454
type: string
5555
description: The target namespace of the ArgoCD deployment
56-
default: ai-rhdh
56+
default: openshift-gitops
5757
maxLength: 63
5858
argoInstance:
5959
title: ArgoCD Instance
@@ -71,6 +71,7 @@ spec:
7171
title: Include ArgoCD App Label?
7272
type: boolean
7373
description: Indicates whether to include a user provided ArgoCD Application Label to set
74+
default: true
7475
modelServer:
7576
# SED_DETR_MODEL_SERVER_START
7677
title: Model Server
@@ -114,6 +115,7 @@ spec:
114115
title: ArgoCD Application Label
115116
type: string
116117
description: Define the label RHDH will use to identify the ArgoCD Applications
118+
default: rolling-demo
117119
modelServer:
118120
oneOf:
119121
# SED_EXISTING_START
@@ -190,6 +192,7 @@ spec:
190192
default: GitHub
191193
repoOwner:
192194
title: Repository Owner
195+
default: ai-rolling-demo
193196
type: string
194197
ui:help: The organization, user or project that this repo will belong to
195198
repoName:
@@ -249,6 +252,7 @@ spec:
249252
ui:help: "You can also provide the on-prem registry host, example: quay-tv2pb.apps.cluster-tv2pb.sandbox1194.opentlc.com"
250253
imageOrg:
251254
title: Image Organization
255+
default: rhdhpai-rolling-demo
252256
type: string
253257
description: The organization, user or project that this repo will belong to
254258
imageName:
@@ -404,7 +408,7 @@ spec:
404408
appName: ${{ parameters.name }}-gitops # for now just use the component name, since it's single component app
405409
description: This is GitOps manifest for ${{ parameters.name }}
406410
namespace: ${{ parameters.remoteClusterDeploymentNamespace if parameters.deployArgoCDApplicationOnRemoteCluster else parameters.namespace }}
407-
rhdhNamespace: ai-rhdh
411+
rhdhNamespace: rolling-demo-ns
408412
# example: github.com?owner=<owner>&repo=<srcRepo>, the gitops repo name will be <srcRepo>-gitops
409413
repoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops
410414
srcRepoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}
@@ -549,7 +553,7 @@ spec:
549553
# name set in rhdh config
550554
argoInstance: ${{ parameters.argoInstance }}
551555
namespace: ${{ parameters.argoNS }}
552-
labelValue: ${{ parameters.argoAppLabel if parameters.includeArgoLabel else '' }}
556+
labelValue: rolling-demo
553557
repoUrl: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops.git
554558
path: './app-of-apps'
555559
# SED_APP_SUPPORT_START

‎templates/rag/template.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
title: ArgoCD Namespace
5454
type: string
5555
description: The target namespace of the ArgoCD deployment
56-
default: ai-rhdh
56+
default: openshift-gitops
5757
maxLength: 63
5858
argoInstance:
5959
title: ArgoCD Instance
@@ -71,6 +71,7 @@ spec:
7171
title: Include ArgoCD App Label?
7272
type: boolean
7373
description: Indicates whether to include a user provided ArgoCD Application Label to set
74+
default: true
7475
modelServer:
7576
# SED_LLM_SERVER_START
7677
title: Model Server
@@ -122,6 +123,7 @@ spec:
122123
title: ArgoCD Application Label
123124
type: string
124125
description: Define the label RHDH will use to identify the ArgoCD Applications
126+
default: rolling-demo
125127
modelServer:
126128
oneOf:
127129
# SED_EXISTING_START
@@ -222,6 +224,7 @@ spec:
222224
default: GitHub
223225
repoOwner:
224226
title: Repository Owner
227+
default: ai-rolling-demo
225228
type: string
226229
ui:help: The organization, user or project that this repo will belong to
227230
repoName:
@@ -281,6 +284,7 @@ spec:
281284
ui:help: "You can also provide the on-prem registry host, example: quay-tv2pb.apps.cluster-tv2pb.sandbox1194.opentlc.com"
282285
imageOrg:
283286
title: Image Organization
287+
default: rhdhpai-rolling-demo
284288
type: string
285289
description: The organization, user or project that this repo will belong to
286290
imageName:
@@ -436,7 +440,7 @@ spec:
436440
appName: ${{ parameters.name }}-gitops # for now just use the component name, since it's single component app
437441
description: This is GitOps manifest for ${{ parameters.name }}
438442
namespace: ${{ parameters.remoteClusterDeploymentNamespace if parameters.deployArgoCDApplicationOnRemoteCluster else parameters.namespace }}
439-
rhdhNamespace: ai-rhdh
443+
rhdhNamespace: rolling-demo-ns
440444
# example: github.com?owner=<owner>&repo=<srcRepo>, the gitops repo name will be <srcRepo>-gitops
441445
repoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops
442446
srcRepoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}
@@ -593,7 +597,7 @@ spec:
593597
# name set in rhdh config
594598
argoInstance: ${{ parameters.argoInstance }}
595599
namespace: ${{ parameters.argoNS }}
596-
labelValue: ${{ parameters.argoAppLabel if parameters.includeArgoLabel else '' }}
600+
labelValue: rolling-demo
597601
repoUrl: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops.git
598602
path: './app-of-apps'
599603
# SED_APP_SUPPORT_START

0 commit comments

Comments
 (0)