From ac8ef5240fc381ef70cdad88c02dbaa749a0571f Mon Sep 17 00:00:00 2001 From: tchughesiv Date: Mon, 21 Sep 2020 09:30:04 -0500 Subject: [PATCH] move admin user/pwd to statusDescriptors Signed-off-by: tchughesiv --- ...-operator.7.9.0.clusterserviceversion.yaml | 30 +++++++++---------- ...-operator.7.9.0.clusterserviceversion.yaml | 22 +++++++------- tools/csv-gen/csv-gen.go | 24 +++++++-------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/deploy/olm-catalog/dev/7.9.0/manifests/businessautomation-operator.7.9.0.clusterserviceversion.yaml b/deploy/olm-catalog/dev/7.9.0/manifests/businessautomation-operator.7.9.0.clusterserviceversion.yaml index 91eb5266f..de6f1f776 100644 --- a/deploy/olm-catalog/dev/7.9.0/manifests/businessautomation-operator.7.9.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/dev/7.9.0/manifests/businessautomation-operator.7.9.0.clusterserviceversion.yaml @@ -7,7 +7,7 @@ metadata: categories: Integration & Delivery certified: "false" containerImage: quay.io/kiegroup/kie-cloud-operator:7.9.0 - createdAt: "2020-09-18 13:58:00" + createdAt: "2020-09-21 09:27:22" description: Deploys and manages Red Hat Process Automation Manager and Red Hat Decision Manager environments. operators.openshift.io/infrastructure-features: '["Disconnected"]' repository: https://github.com/kiegroup/kie-cloud-operator @@ -17,7 +17,7 @@ metadata: operator-businessautomation: "true" operatorframework.io/arch.amd64: supported operatorframework.io/os.linux: supported - name: businessautomation-operator.7.9.0-dev-zgt7h8cxlm + name: businessautomation-operator.7.9.0-dev-fd4nzs45sm namespace: placeholder spec: apiservicedefinitions: {} @@ -62,16 +62,6 @@ spec: name: "" version: v1 specDescriptors: - - description: The admin user for BC console. - displayName: Business/Decision Central Admin User (defaults to 'adminUser') - path: commonConfig.adminUser - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:password - - description: The admin password for BC console. - displayName: Business/Decision Central Admin Password (defaults to 'RedHat') - path: commonConfig.adminPassword - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:password - description: Set true to enable automatic micro version product upgrades, it is disabled by default. displayName: Enable Upgrades path: upgrades.enabled @@ -93,6 +83,16 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:label statusDescriptors: + - description: The admin user for BC console. + displayName: Business/Decision Central Admin User + path: applied.commonConfig.adminUser + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:password + - description: The admin password for BC console. + displayName: Business/Decision Central Admin Password + path: applied.commonConfig.adminPassword + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:password - description: Product version installed. displayName: Version path: version @@ -443,7 +443,7 @@ spec: - operator labels: alm-owner-businessautomation: businessautomation-operator - operated-by: businessautomation-operator.7.9.0-dev-zgt7h8cxlm + operated-by: businessautomation-operator.7.9.0-dev-fd4nzs45sm links: - name: Product Page url: https://access.redhat.com/products/red-hat-process-automation-manager @@ -546,5 +546,5 @@ spec: selector: matchLabels: alm-owner-businessautomation: businessautomation-operator - operated-by: businessautomation-operator.7.9.0-dev-zgt7h8cxlm - version: 7.9.0+zgt7h8cxlm + operated-by: businessautomation-operator.7.9.0-dev-fd4nzs45sm + version: 7.9.0+fd4nzs45sm diff --git a/deploy/olm-catalog/prod/7.9.0/manifests/businessautomation-operator.7.9.0.clusterserviceversion.yaml b/deploy/olm-catalog/prod/7.9.0/manifests/businessautomation-operator.7.9.0.clusterserviceversion.yaml index 6e24f2ef2..faac3cfcd 100644 --- a/deploy/olm-catalog/prod/7.9.0/manifests/businessautomation-operator.7.9.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/prod/7.9.0/manifests/businessautomation-operator.7.9.0.clusterserviceversion.yaml @@ -7,7 +7,7 @@ metadata: categories: Integration & Delivery certified: "true" containerImage: registry.redhat.io/rhpam-7/rhpam-rhel8-operator:7.9.0 - createdAt: "2020-09-18 13:58:00" + createdAt: "2020-09-21 09:27:22" description: Deploys and manages Red Hat Process Automation Manager and Red Hat Decision Manager environments. operators.openshift.io/infrastructure-features: '["Disconnected"]' repository: https://github.com/kiegroup/kie-cloud-operator @@ -62,16 +62,6 @@ spec: name: "" version: v1 specDescriptors: - - description: The admin user for BC console. - displayName: Business/Decision Central Admin User (defaults to 'adminUser') - path: commonConfig.adminUser - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:password - - description: The admin password for BC console. - displayName: Business/Decision Central Admin Password (defaults to 'RedHat') - path: commonConfig.adminPassword - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:password - description: Set true to enable automatic micro version product upgrades, it is disabled by default. displayName: Enable Upgrades path: upgrades.enabled @@ -93,6 +83,16 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:label statusDescriptors: + - description: The admin user for BC console. + displayName: Business/Decision Central Admin User + path: applied.commonConfig.adminUser + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:password + - description: The admin password for BC console. + displayName: Business/Decision Central Admin Password + path: applied.commonConfig.adminPassword + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:password - description: Product version installed. displayName: Version path: version diff --git a/tools/csv-gen/csv-gen.go b/tools/csv-gen/csv-gen.go index 9f41499ff..c6e80a8f7 100644 --- a/tools/csv-gen/csv-gen.go +++ b/tools/csv-gen/csv-gen.go @@ -233,18 +233,6 @@ func main() { }, }, SpecDescriptors: []csvv1.SpecDescriptor{ - { - Description: "The admin user for BC console.", - DisplayName: "Business/Decision Central Admin User (defaults to '" + constants.DefaultAdminUser + "')", - Path: "commonConfig.adminUser", - XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:password"}, - }, - { - Description: "The admin password for BC console.", - DisplayName: "Business/Decision Central Admin Password (defaults to '" + constants.DefaultPassword + "')", - Path: "commonConfig.adminPassword", - XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:password"}, - }, { Description: "Set true to enable automatic micro version product upgrades, it is disabled by default.", DisplayName: "Enable Upgrades", @@ -271,6 +259,18 @@ func main() { }, }, StatusDescriptors: []csvv1.StatusDescriptor{ + { + Description: "The admin user for BC console.", + DisplayName: "Business/Decision Central Admin User", + Path: "applied.commonConfig.adminUser", + XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:password"}, + }, + { + Description: "The admin password for BC console.", + DisplayName: "Business/Decision Central Admin Password", + Path: "applied.commonConfig.adminPassword", + XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:password"}, + }, { Description: "Product version installed.", DisplayName: "Version",