Skip to content

Commit 8e8e21d

Browse files
fix: update values schema to adhere k8s naming (#1850)
Co-authored-by: jeho <[email protected]>
1 parent d77351d commit 8e8e21d

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

values-schema.yaml

+16-20
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ definitions:
256256
$ref: '#/definitions/k8sContext'
257257
description: Optional. Must be set for development mode and must point to an existing context in KUBECONFIG.
258258
name:
259-
$ref: '#/definitions/clusterName'
259+
$ref: '#/definitions/idName'
260260
description: Short name that will be used in construction of cluster domain and messaging.
261261
owner:
262262
$ref: '#/definitions/idName'
@@ -267,9 +267,6 @@ definitions:
267267
required:
268268
- name
269269
- provider
270-
clusterName:
271-
$ref: '#/definitions/wordCharacterPattern'
272-
type: string
273270
containerSpecNoSec:
274271
properties:
275272
image:
@@ -314,7 +311,7 @@ definitions:
314311
description: PV backups
315312
properties:
316313
name:
317-
$ref: '#/definitions/wordCharacterPattern'
314+
$ref: '#/definitions/idName'
318315
ttl:
319316
$ref: '#/definitions/backupTtl'
320317
schedule:
@@ -621,7 +618,7 @@ definitions:
621618
type: object
622619
properties:
623620
name:
624-
type: string
621+
$ref: '#/definitions/idName'
625622
title: Network Policy name
626623
description: 'A unique name for the network policy'
627624
ruleType:
@@ -656,7 +653,7 @@ definitions:
656653
title: Selector label value
657654
description: 'The value of the Pod selector label'
658655
fromNamespace:
659-
type: string
656+
$ref: '#/definitions/idName'
660657
title: Namespace name
661658
description: 'The name of the namespace'
662659
required:
@@ -1030,9 +1027,8 @@ definitions:
10301027
description: Points to the backing k8s service (only used when 'svc' is set).
10311028
ingressClassName:
10321029
description: Ingress class name
1033-
type: string
1030+
$ref: '#/definitions/idName'
10341031
default: platform
1035-
pattern: '^[a-z0-9]([-a-z0-9]*[a-z0-9])+$'
10361032
svc:
10371033
$ref: '#/definitions/idName'
10381034
description: When given a backing k8s service is expected to be deployed with this name, which will be exposed through this team service.
@@ -1051,7 +1047,7 @@ definitions:
10511047
type: string
10521048
tlsSecretName:
10531049
description: Kubernetes secret name of type TLS (not required if the tlsPass flag is set to true).
1054-
type: string
1050+
$ref: '#/definitions/idName'
10551051
type:
10561052
nullable: true
10571053
default: public
@@ -1247,11 +1243,11 @@ definitions:
12471243
properties:
12481244
name:
12491245
description: Name must match mount name.
1250-
$ref: '#/definitions/wordCharacterPattern'
1246+
$ref: '#/definitions/idName'
12511247
configMap:
12521248
properties:
12531249
name:
1254-
$ref: '#/definitions/wordCharacterPattern'
1250+
$ref: '#/definitions/idName'
12551251
type: array
12561252
wordCharacterPattern:
12571253
type: string
@@ -1263,7 +1259,7 @@ definitions:
12631259
properties:
12641260
name:
12651261
description: Name of the project
1266-
$ref: '#/definitions/wordCharacterPattern'
1262+
$ref: '#/definitions/idName'
12671263
required:
12681264
- name
12691265
policies:
@@ -1274,7 +1270,7 @@ definitions:
12741270
properties:
12751271
name:
12761272
description: Name of the image
1277-
$ref: '#/definitions/wordCharacterPattern'
1273+
$ref: '#/definitions/idName'
12781274
tag:
12791275
description: Image tag
12801276
$ref: '#/definitions/imageTag'
@@ -1291,7 +1287,7 @@ definitions:
12911287
description: Select to scan source
12921288
secretName:
12931289
description: The name of the secret with the credentials of the external private Git repository
1294-
type: string
1290+
$ref: '#/definitions/idName'
12951291
mode:
12961292
properties:
12971293
docker:
@@ -1350,9 +1346,9 @@ definitions:
13501346
description: Define location of code to build
13511347
properties:
13521348
name:
1353-
type: string
1349+
$ref: '#/definitions/idName'
13541350
namespace:
1355-
type: string
1351+
$ref: '#/definitions/idName'
13561352
immutable:
13571353
description: 'Immutable, if set to true, ensures that data stored in the Secret cannot be updated (only object metadata can be modified).'
13581354
type: boolean
@@ -1383,7 +1379,7 @@ definitions:
13831379
description: Define location of the application's manifests or chart
13841380
properties:
13851381
name:
1386-
$ref: '#/definitions/wordCharacterPattern'
1382+
$ref: '#/definitions/idName'
13871383
url:
13881384
description: URL to either Helm or Git repository
13891385
$ref: '#/definitions/url'
@@ -1415,7 +1411,7 @@ definitions:
14151411
default: ''
14161412
namespace:
14171413
description: Workload namespace. Applicable only for team-admin. Default value is 'team-<team_id>'
1418-
$ref: '#/definitions/domain'
1414+
$ref: '#/definitions/idName'
14191415
imageUpdateStrategy:
14201416
description: Automatically update the image. Only supported wit Helm charts in local Gitea repository and images stored in Harbor.
14211417
title: Auto Image Updater
@@ -1604,7 +1600,7 @@ properties:
16041600
description: |
16051601
The name of a custom secret in the istio-system namespace that contains a trusted certificate and private key.
16061602
To be used with issuer externally-managed-tls-secret.
1607-
type: string
1603+
$ref: '#/definitions/idName'
16081604
customRootCA:
16091605
x-secret: ''
16101606
type: string

0 commit comments

Comments
 (0)