Skip to content

Commit 34a8ecd

Browse files
komishJonathan S. Katz
authored andcommitted
remove specDescriptors[].value from CSV
The value field was used to render default values in the OLM UI but this was not their intent and it prevents installation in 4.3+ openshift clusters. Using alm-examples to imply default hints to the UI is the best path until CRD/v1 is used and defaulting can be integrated at the CRD level.
1 parent c4c2ddf commit 34a8ecd

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

installers/olm/postgresoperator.crd.descriptions.yaml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,72 +11,61 @@
1111
- { kind: Service, version: v1 }
1212
specDescriptors:
1313
- path: ccpimage
14-
value: "crunchy-postgres-ha"
1514
displayName: PostgreSQL Image
1615
description: The Crunchy PostgreSQL image to use. Possible values are "crunchy-postgres-ha" and "crunchy-postgres-gis-ha"
1716
x-descriptors:
1817
- 'urn:alm:descriptor:com.tectonic.ui:text'
1918
- path: ccpimagetag
20-
value: "${CCP_IMAGE_TAG}"
2119
displayName: PostgreSQL Image Tag
2220
description: The tag of the PostgreSQL image to use. Example is "${CCP_IMAGE_TAG}"
2321
x-descriptors:
2422
- 'urn:alm:descriptor:com.tectonic.ui:text'
2523
- path: clustername
26-
value: "hippo"
2724
displayName: PostgreSQL Cluster name
2825
description: The name that is assigned to this specific PostgreSQL cluster
2926
x-descriptors:
3027
- 'urn:alm:descriptor:com.tectonic.ui:text'
3128
- path: database
32-
value: "hippo"
3329
displayName: Initial PostgreSQL database name
3430
description: The name of the initial database to be created inside of the PostgreSQL cluster, e.g. "hippo"
3531
x-descriptors:
3632
- 'urn:alm:descriptor:com.tectonic.ui:text'
3733
- path: exporterport
38-
value: 9187
3934
displayName: PostgreSQL Monitor Port
4035
description: The port to use for the PostgreSQL metrics exporter used for cluster monitoring, e.g. "9187"
4136
x-descriptors:
4237
- 'urn:alm:descriptor:com.tectonic.ui:number'
4338
- path: name
44-
value: "hippo"
4539
displayName: PostgreSQL CRD name
4640
description: The name of the CRD entry. Should match the PostgreSQL Cluster name
4741
x-descriptors:
4842
- 'urn:alm:descriptor:com.tectonic.ui:text'
4943
- path: pgbadgerport
50-
value: 10000
5144
displayName: pgBadger Port
5245
description: The port to use for the pgBadger PostgreSQL query analysis service, e.g. "10000"
5346
x-descriptors:
5447
- 'urn:alm:descriptor:com.tectonic.ui:number'
5548
- path: port
56-
value: 5432
5749
displayName: PostgreSQL Port
5850
description: The port to use for the PostgreSQL cluster, e.g. "5432"
5951
x-descriptors:
6052
- 'urn:alm:descriptor:com.tectonic.ui:number'
6153

6254
- path: rootsecretname
63-
value: "hippo-postgres-secret"
6455
displayName: PostgreSQL superuser credentials
6556
description: The name of the Secret that contains the PostgreSQL superuser credentials
6657
x-descriptors:
67-
- 'urn:alm:descriptor:com.tectonic.ui:text'
58+
- 'urn:alm:descriptor:io.kubernetes:Secret'
6859
- path: primarysecretname
69-
value: "hippo-primaryuser-secret"
7060
displayName: PostgreSQL support service credentials
7161
description: The name of the Secret that contains the credentials used for managing cluster instance authentication, e.g. connections for replicas
7262
x-descriptors:
73-
- 'urn:alm:descriptor:com.tectonic.ui:text'
63+
- 'urn:alm:descriptor:io.kubernetes:Secret'
7464
- path: usersecretname
75-
value: "hippo-testuser-secret"
7665
displayName: PostgreSQL user credentials
7766
description: The name of the Secret that contains the PostgreSQL user credentials for logging into the PostgreSQL cluster
7867
x-descriptors:
79-
- 'urn:alm:descriptor:com.tectonic.ui:text'
68+
- 'urn:alm:descriptor:io.kubernetes:Secret'
8069

8170
# `operator-sdk scorecard` expects this field to have a descriptor.
8271
- path: PrimaryStorage
@@ -85,7 +74,6 @@
8574
x-descriptors:
8675
- 'urn:alm:descriptor:com.tectonic.ui:fieldGroup:PrimaryStorage'
8776
- path: PrimaryStorage.name
88-
value: "hippo"
8977
displayName: PostgreSQL Primary Storage Name
9078
description: Contains the name of the PostgreSQL cluster to associate with this storage. Should match the Cluster name
9179
x-descriptors:
@@ -98,30 +86,26 @@
9886
- 'urn:alm:descriptor:com.tectonic.ui:fieldGroup:PrimaryStorage'
9987
- 'urn:alm:descriptor:io.kubernetes:StorageClass'
10088
- path: PrimaryStorage.accessmode
101-
value: "ReadWriteOnce"
10289
displayName: PostgreSQL Primary StorageClass Access Mode
10390
description: The access mode for the storage class, e.g. "ReadWriteOnce"
10491
x-descriptors:
10592
- 'urn:alm:descriptor:com.tectonic.ui:fieldGroup:PrimaryStorage'
10693
- 'urn:alm:descriptor:com.tectonic.ui:select:ReadWriteOnce'
10794
- 'urn:alm:descriptor:com.tectonic.ui:select:ReadWriteMany'
10895
- path: PrimaryStorage.size
109-
value: "1G"
11096
displayName: PostgreSQL Primary Data PVC Size
11197
description: The size of the PVC that will store the data for the primary PostgreSQL instance, e.g. "1G"
11298
x-descriptors:
11399
- 'urn:alm:descriptor:com.tectonic.ui:fieldGroup:PrimaryStorage'
114100
- 'urn:alm:descriptor:com.tectonic.ui:text'
115101

116102
- path: status
117-
value: ""
118103
displayName: Deprecated
119104
description: Deprecated
120105
x-descriptors:
121106
- 'urn:alm:descriptor:com.tectonic.ui:text'
122107
- 'urn:alm:descriptor:com.tectonic.ui:advanced'
123108
- path: userlabels
124-
value: "{}"
125109
displayName: User defined labels
126110
description: A set of labels that help the PostgreSQL Operator manage a PostgreSQL cluster
127111
x-descriptors:

0 commit comments

Comments
 (0)