From b3fd8b57d9a5495cc54b6c62cba58be5185c1659 Mon Sep 17 00:00:00 2001 From: tchughesiv Date: Thu, 31 Dec 2020 15:58:34 -0600 Subject: [PATCH] switch to build version csv Signed-off-by: tchughesiv --- README.md | 7 +- ...erator.7.9.1-1.clusterserviceversion.yaml} | 196 ++++++++--------- .../manifests/kieapp.crd.yaml | 0 .../metadata/annotations.yaml | 0 ...erator.7.9.1-1.clusterserviceversion.yaml} | 202 +++++++++--------- .../manifests/kieapp.crd.yaml | 0 .../metadata/annotations.yaml | 0 getversion.go | 8 +- go.sum | 28 +++ hack/go-build-bundle.sh | 12 +- hack/go-csv.sh | 5 +- pkg/controller/kieapp/deploy_ui_test.go | 8 +- tools/csv-gen/csv-gen.go | 4 +- version/version.go | 4 + 14 files changed, 257 insertions(+), 217 deletions(-) rename deploy/olm-catalog/dev/{7.9.1/manifests/businessautomation-operator.7.9.1.clusterserviceversion.yaml => 7.9.1-1/manifests/businessautomation-operator.7.9.1-1.clusterserviceversion.yaml} (66%) rename deploy/olm-catalog/dev/{7.9.1 => 7.9.1-1}/manifests/kieapp.crd.yaml (100%) rename deploy/olm-catalog/dev/{7.9.1 => 7.9.1-1}/metadata/annotations.yaml (100%) rename deploy/olm-catalog/prod/{7.9.1/manifests/businessautomation-operator.7.9.1.clusterserviceversion.yaml => 7.9.1-1/manifests/businessautomation-operator.7.9.1-1.clusterserviceversion.yaml} (65%) rename deploy/olm-catalog/prod/{7.9.1 => 7.9.1-1}/manifests/kieapp.crd.yaml (100%) rename deploy/olm-catalog/prod/{7.9.1 => 7.9.1-1}/metadata/annotations.yaml (100%) diff --git a/README.md b/README.md index 2989b3b4c..ecebeff38 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,13 @@ To install this operator on OpenShift 4 for end-to-end testing, make sure you ha If pushing to another quay repository, replace _kiegroup_ with your username or other namespace. Also note that the push command does not overwrite an existing repository, and it needs to be deleted before a new version can be built and uploaded. Once the bundle has been uploaded, create an [Operator Source](https://github.com/operator-framework/community-operators/blob/master/docs/testing-operators.md#linking-the-quay-application-repository-to-your-openshift-40-cluster) to load your operator bundle in OpenShift. **Create your own index image** + +Requires [opm](https://github.com/operator-framework/operator-registry/releases) v1.15.3+ - + ```bash $ make bundle-dev USERNAME=tchughesiv -VERSION=$(go run getversion.go) +VERSION=$(go run getversion.go -csv) IMAGE=quay.io/${USERNAME}/rhpam-operator-bundle BUNDLE=${IMAGE}:${VERSION} @@ -39,7 +42,7 @@ $ docker push ${BUNDLE} BUNDLE_DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' ${BUNDLE}) INDEX_VERSION=v4.6 INDEX_IMAGE=quay.io/${USERNAME}/ba-operator-index:${INDEX_VERSION} -INDEX_FROM=${INDEX_IMAGE}_$(go run getversion.go --prior) +INDEX_FROM=${INDEX_IMAGE}_$(go run getversion.go -csvPrior) INDEX_TO=${INDEX_IMAGE}_${VERSION} $ opm index add -c docker --bundles ${BUNDLE_DIGEST} --from-index ${INDEX_FROM} --tag ${INDEX_TO} diff --git a/deploy/olm-catalog/dev/7.9.1/manifests/businessautomation-operator.7.9.1.clusterserviceversion.yaml b/deploy/olm-catalog/dev/7.9.1-1/manifests/businessautomation-operator.7.9.1-1.clusterserviceversion.yaml similarity index 66% rename from deploy/olm-catalog/dev/7.9.1/manifests/businessautomation-operator.7.9.1.clusterserviceversion.yaml rename to deploy/olm-catalog/dev/7.9.1-1/manifests/businessautomation-operator.7.9.1-1.clusterserviceversion.yaml index 0a67d6fb9..6bb5e6f92 100644 --- a/deploy/olm-catalog/dev/7.9.1/manifests/businessautomation-operator.7.9.1.clusterserviceversion.yaml +++ b/deploy/olm-catalog/dev/7.9.1-1/manifests/businessautomation-operator.7.9.1-1.clusterserviceversion.yaml @@ -7,7 +7,7 @@ metadata: categories: Integration & Delivery certified: "false" containerImage: quay.io/kiegroup/kie-cloud-operator:7.9.1 - createdAt: "2020-12-14 11:28:54" + createdAt: "2021-01-04 10:53:34" 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.1-dev-fvwlmvzt7v + name: businessautomation-operator.7.9.1-1-dev-q8xb7n5mcz namespace: placeholder spec: apiservicedefinitions: {} @@ -169,105 +169,105 @@ spec: - name: DEBUG value: "false" - name: DM_KIESERVER_IMAGE_7.9.1 - value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:6c4e37ce3de9640d37db4ea1b82ae79e5817e2341bc1b5d7ef5cbf7eb3086207 + value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.9.1 - name: DM_CONTROLLER_IMAGE_7.9.1 - value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:361393690e298b8d2d15e96bb464546cc6a007bfb7b4fa36d91cd497fde147a0 + value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.9.1 - name: DM_DC_IMAGE_7.9.1 - value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:e9550ef4f107a62a31f06fa24f21899d7ebb2098f197d29f3386132705661510 + value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.9.1 - name: PAM_KIESERVER_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:58e23f50e4d4840a611bcc4b854ace8158d6ae235b76855a10a35d6e6df1b8b2 + value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.9.1 - name: PAM_CONTROLLER_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:080f0748eb4444a1bc7834ccc969d97f9bd10d18628b8785715251e41a3d3e20 + value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.9.1 - name: PAM_BC_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:6ec1f875f3015a32578575c0f265f0b2c6c9bea7b5fff74a719528ae26ce5b11 + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.9.1 - name: PAM_BC_MONITORING_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:a116e234d413a918215f5677f4cb3e8e25463e7b26c27c3204f73472405acf6f + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.9.1 - name: PAM_SMARTROUTER_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:bdcb6232619b2763aca7b18b7e3669d21e8e41c302ad52f2f8d1ab400dacfb41 + value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.9.1 - name: PAM_PROCESS_MIGRATION_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:5e82b4e071ba00377614dc3c863a42a4466c6bbdb341ed8eb20a7b9d2ffe219e + value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.9.1 - name: OSE_CLI_IMAGE_7.9.1 - value: registry.redhat.io/openshift3/ose-cli@sha256:8f9732773d3d4fb940f9660f01f3a681d3c7ea61e06a26853cfc14a5140165b9 + value: registry.redhat.io/openshift3/ose-cli:v3.11 - name: MYSQL_PROXY_IMAGE_7.9.1 - value: registry.redhat.io/rhscl/mysql-80-rhel7@sha256:b4a2380dfae26c771af2f868dbfe17c367772ea813b88a9683875c3c05b9bbde + value: registry.redhat.io/rhscl/mysql-80-rhel7:latest - name: POSTGRESQL_PROXY_IMAGE_7.9.1 - value: registry.redhat.io/rhscl/postgresql-10-rhel7@sha256:fda379b18033c7122f60b81760396f4c8c3009cfcad5c5028474f478b40d2647 + value: registry.redhat.io/rhscl/postgresql-10-rhel7:latest - name: DATAGRID_IMAGE_7.9.1 - value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift@sha256:da558fa9ad7c357ed794eb549ac12a799eab97951f2e3cbc9501e413a348119a + value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.6 - name: BROKER_IMAGE_7.9.1 - value: registry.redhat.io/amq7/amq-broker@sha256:6ce6da749ca37e3a53fdf3a1b05f06cf0705c50400b4510345b6a1bdbb990e96 + value: registry.redhat.io/amq7/amq-broker:7.7 - name: DM_KIESERVER_IMAGE_7.9.0 - value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:c9ee12321e0ef9dd6447e3acf1b0c8e9a81c266dd1ccb3a586ca113a1e114020 + value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.9.0 - name: DM_CONTROLLER_IMAGE_7.9.0 - value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:fd2aa2048d914d8071e12e6c3d18868e9818557990679fda0b4125984c651455 + value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.9.0 - name: DM_DC_IMAGE_7.9.0 - value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:16c8ca66d50829e0ed7d16c8e9bf5e0d2d42d1ffc3037877c676d1f093c461b7 + value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.9.0 - name: PAM_KIESERVER_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:a636cb2c183ce14d7985dfc1efb0d4ad636c0ff6c07a8246d7e38c4092fe561e + value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.9.0 - name: PAM_CONTROLLER_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:af6344e06af50b883d791cd1f1de6f8e465916370c74ad1e8d9b56345d01d48d + value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.9.0 - name: PAM_BC_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:41192dcac95c7ec30af876f4de01c93d7ad093a1dbc07a9eec20efa1b95e1c90 + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.9.0 - name: PAM_BC_MONITORING_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:7c5487fb8839d1c36d53556670423a879bd9825f6ee72e895235ac27cdb232a6 + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.9.0 - name: PAM_SMARTROUTER_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:52882d1b4548de4d2f4c481fd33f523130dd6636bb97b0824a81ac520f5b4edf + value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.9.0 - name: PAM_PROCESS_MIGRATION_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:57404e93f2fb3cc120a4df534b326975bec8e57752a5832fe391768dfbaa9a2e + value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.9.0 - name: OSE_CLI_IMAGE_7.9.0 - value: registry.redhat.io/openshift3/ose-cli@sha256:8f9732773d3d4fb940f9660f01f3a681d3c7ea61e06a26853cfc14a5140165b9 + value: registry.redhat.io/openshift3/ose-cli:v3.11 - name: MYSQL_PROXY_IMAGE_7.9.0 - value: registry.redhat.io/rhscl/mysql-80-rhel7@sha256:b4a2380dfae26c771af2f868dbfe17c367772ea813b88a9683875c3c05b9bbde + value: registry.redhat.io/rhscl/mysql-80-rhel7:latest - name: POSTGRESQL_PROXY_IMAGE_7.9.0 - value: registry.redhat.io/rhscl/postgresql-10-rhel7@sha256:fda379b18033c7122f60b81760396f4c8c3009cfcad5c5028474f478b40d2647 + value: registry.redhat.io/rhscl/postgresql-10-rhel7:latest - name: DATAGRID_IMAGE_7.9.0 - value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift@sha256:da558fa9ad7c357ed794eb549ac12a799eab97951f2e3cbc9501e413a348119a + value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.6 - name: BROKER_IMAGE_7.9.0 - value: registry.redhat.io/amq7/amq-broker@sha256:6ce6da749ca37e3a53fdf3a1b05f06cf0705c50400b4510345b6a1bdbb990e96 + value: registry.redhat.io/amq7/amq-broker:7.7 - name: DM_KIESERVER_IMAGE_7.8.1 - value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:f21ff782e61fb7956f696ba158dab161c59b230a45ebe50aa151b7f3a9823ddd + value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.8.1 - name: DM_CONTROLLER_IMAGE_7.8.1 - value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:c11dd63fa0d484306e0ee6ddbac062a766445d90c101ba96cf7dcd6a870d50a9 + value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.8.1 - name: DM_DC_IMAGE_7.8.1 - value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:848c10073bce10629132e901b54ce4d04d70c3bb068cc6c360882c599696a20c + value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.8.1 - name: PAM_KIESERVER_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:5d70a505d5850e8a845133a17dc9301a3a800c580681483958ebdce349d84f19 + value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.8.1 - name: PAM_CONTROLLER_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:6a489c8b858d14aea7360ab286e61ebfd099f626f17c62e5771d131c18a8fbf0 + value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.8.1 - name: PAM_BC_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:6e9aec3a774c446e367947963e5521cb9495899cd16b438ad5f202f399f218bf + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.8.1 - name: PAM_BC_MONITORING_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:e7f1d525f8eb9c10288f677d9e2698b0a4ee44122136e8ad0547e5546950f666 + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.8.1 - name: PAM_SMARTROUTER_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:fdfe21601cf39892ea8df099d09047c3cfdd48944a7751b5af4a3da0c41ac8d6 + value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.8.1 - name: PAM_PROCESS_MIGRATION_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:677e32d5ebec1f8169c37826563a89cc8bfd13686d52d80084226748732ac8f7 + value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.8.1 - name: OSE_CLI_IMAGE_7.8.1 - value: registry.redhat.io/openshift3/ose-cli@sha256:8f9732773d3d4fb940f9660f01f3a681d3c7ea61e06a26853cfc14a5140165b9 + value: registry.redhat.io/openshift3/ose-cli:v3.11 - name: MYSQL_PROXY_IMAGE_7.8.1 - value: registry.redhat.io/rhscl/mysql-80-rhel7@sha256:b4a2380dfae26c771af2f868dbfe17c367772ea813b88a9683875c3c05b9bbde + value: registry.redhat.io/rhscl/mysql-80-rhel7:latest - name: POSTGRESQL_PROXY_IMAGE_7.8.1 - value: registry.redhat.io/rhscl/postgresql-10-rhel7@sha256:fda379b18033c7122f60b81760396f4c8c3009cfcad5c5028474f478b40d2647 + value: registry.redhat.io/rhscl/postgresql-10-rhel7:latest - name: DATAGRID_IMAGE_7.8.1 - value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift@sha256:3375ec169d274278da56d1401c5c1285f7d2812ea0bde2ac9ad9652b69f80893 + value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.5 - name: BROKER_IMAGE_7.8.1 - value: registry.redhat.io/amq7/amq-broker@sha256:7e81fec6e8fcb760829ab73512d1abf4da93e6e3bca42a12f517f793b34d6709 + value: registry.redhat.io/amq7/amq-broker:7.6 - name: OAUTH_PROXY_IMAGE_LATEST - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0088d7e77a812f95788ceb1e7346fac0fe66753598674c9f3b4e3621f382c1fa + value: registry.redhat.io/openshift4/ose-oauth-proxy:latest - name: OAUTH_PROXY_IMAGE_4.6 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0088d7e77a812f95788ceb1e7346fac0fe66753598674c9f3b4e3621f382c1fa + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.6 - name: OAUTH_PROXY_IMAGE_4.5 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:7c17e480cff1dbc805ee3dc389acfd02fafc12894cac2b36e07f95e82f2e06f1 + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.5 - name: OAUTH_PROXY_IMAGE_4.4 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0777db164629ea5e91f7540bc7dca9e4ecacadb98a478909ba02b73219658b21 + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.4 - name: OAUTH_PROXY_IMAGE_4.3 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:15f27e01677044b93854ed3696daf22a4232126da6dc591c6759ed1a5c32995e + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.3 - name: OAUTH_PROXY_IMAGE_4.2 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:acf0e6508033273bed6dd1bbe0b33accc492b894fd601d00dd8df195311486d7 + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.2 - name: OAUTH_PROXY_IMAGE_4.1 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:43fde141b6670727a1771fa52cd125b366275786b4be0a0a0c57005fd6e0c912 + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.1 - name: OAUTH_PROXY_IMAGE_3 - value: registry.redhat.io/openshift3/oauth-proxy@sha256:63fd46d0bae020745338a29d5def10ca8ce43ccb15bb0a33258e5745c3523ace + value: registry.redhat.io/openshift3/oauth-proxy:latest image: quay.io/kiegroup/kie-cloud-operator:7.9.1 imagePullPolicy: Always name: business-automation-operator @@ -435,7 +435,7 @@ spec: - operator labels: alm-owner-businessautomation: businessautomation-operator - operated-by: businessautomation-operator.7.9.1-dev-fvwlmvzt7v + operated-by: businessautomation-operator.7.9.1-1-dev-q8xb7n5mcz links: - name: Product Page url: https://access.redhat.com/products/red-hat-process-automation-manager @@ -450,95 +450,95 @@ spec: relatedImages: - image: quay.io/kiegroup/kie-cloud-operator:7.9.1 name: kie-cloud-operator - - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:6c4e37ce3de9640d37db4ea1b82ae79e5817e2341bc1b5d7ef5cbf7eb3086207 + - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.9.1 name: rhdm-kieserver-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:361393690e298b8d2d15e96bb464546cc6a007bfb7b4fa36d91cd497fde147a0 + - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.9.1 name: rhdm-controller-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:e9550ef4f107a62a31f06fa24f21899d7ebb2098f197d29f3386132705661510 + - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.9.1 name: rhdm-decisioncentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:58e23f50e4d4840a611bcc4b854ace8158d6ae235b76855a10a35d6e6df1b8b2 + - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.9.1 name: rhpam-kieserver-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:080f0748eb4444a1bc7834ccc969d97f9bd10d18628b8785715251e41a3d3e20 + - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.9.1 name: rhpam-controller-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:6ec1f875f3015a32578575c0f265f0b2c6c9bea7b5fff74a719528ae26ce5b11 + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.9.1 name: rhpam-businesscentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:a116e234d413a918215f5677f4cb3e8e25463e7b26c27c3204f73472405acf6f + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.9.1 name: rhpam-businesscentral-monitoring-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:bdcb6232619b2763aca7b18b7e3669d21e8e41c302ad52f2f8d1ab400dacfb41 + - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.9.1 name: rhpam-smartrouter-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:5e82b4e071ba00377614dc3c863a42a4466c6bbdb341ed8eb20a7b9d2ffe219e + - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.9.1 name: rhpam-process-migration-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:c9ee12321e0ef9dd6447e3acf1b0c8e9a81c266dd1ccb3a586ca113a1e114020 + - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.9.0 name: rhdm-kieserver-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:fd2aa2048d914d8071e12e6c3d18868e9818557990679fda0b4125984c651455 + - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.9.0 name: rhdm-controller-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:16c8ca66d50829e0ed7d16c8e9bf5e0d2d42d1ffc3037877c676d1f093c461b7 + - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.9.0 name: rhdm-decisioncentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:a636cb2c183ce14d7985dfc1efb0d4ad636c0ff6c07a8246d7e38c4092fe561e + - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.9.0 name: rhpam-kieserver-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:af6344e06af50b883d791cd1f1de6f8e465916370c74ad1e8d9b56345d01d48d + - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.9.0 name: rhpam-controller-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:41192dcac95c7ec30af876f4de01c93d7ad093a1dbc07a9eec20efa1b95e1c90 + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.9.0 name: rhpam-businesscentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:7c5487fb8839d1c36d53556670423a879bd9825f6ee72e895235ac27cdb232a6 + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.9.0 name: rhpam-businesscentral-monitoring-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:52882d1b4548de4d2f4c481fd33f523130dd6636bb97b0824a81ac520f5b4edf + - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.9.0 name: rhpam-smartrouter-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:57404e93f2fb3cc120a4df534b326975bec8e57752a5832fe391768dfbaa9a2e + - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.9.0 name: rhpam-process-migration-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:f21ff782e61fb7956f696ba158dab161c59b230a45ebe50aa151b7f3a9823ddd + - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.8.1 name: rhdm-kieserver-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:c11dd63fa0d484306e0ee6ddbac062a766445d90c101ba96cf7dcd6a870d50a9 + - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.8.1 name: rhdm-controller-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:848c10073bce10629132e901b54ce4d04d70c3bb068cc6c360882c599696a20c + - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.8.1 name: rhdm-decisioncentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:5d70a505d5850e8a845133a17dc9301a3a800c580681483958ebdce349d84f19 + - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.8.1 name: rhpam-kieserver-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:6a489c8b858d14aea7360ab286e61ebfd099f626f17c62e5771d131c18a8fbf0 + - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.8.1 name: rhpam-controller-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:6e9aec3a774c446e367947963e5521cb9495899cd16b438ad5f202f399f218bf + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.8.1 name: rhpam-businesscentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:e7f1d525f8eb9c10288f677d9e2698b0a4ee44122136e8ad0547e5546950f666 + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.8.1 name: rhpam-businesscentral-monitoring-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:fdfe21601cf39892ea8df099d09047c3cfdd48944a7751b5af4a3da0c41ac8d6 + - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.8.1 name: rhpam-smartrouter-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:677e32d5ebec1f8169c37826563a89cc8bfd13686d52d80084226748732ac8f7 + - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.8.1 name: rhpam-process-migration-rhel8 - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0088d7e77a812f95788ceb1e7346fac0fe66753598674c9f3b4e3621f382c1fa + - image: registry.redhat.io/openshift4/ose-oauth-proxy:latest name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0088d7e77a812f95788ceb1e7346fac0fe66753598674c9f3b4e3621f382c1fa + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.6 name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:7c17e480cff1dbc805ee3dc389acfd02fafc12894cac2b36e07f95e82f2e06f1 + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.5 name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0777db164629ea5e91f7540bc7dca9e4ecacadb98a478909ba02b73219658b21 + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.4 name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:15f27e01677044b93854ed3696daf22a4232126da6dc591c6759ed1a5c32995e + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.3 name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:acf0e6508033273bed6dd1bbe0b33accc492b894fd601d00dd8df195311486d7 + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.2 name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:43fde141b6670727a1771fa52cd125b366275786b4be0a0a0c57005fd6e0c912 + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.1 name: ose-oauth-proxy - - image: registry.redhat.io/openshift3/oauth-proxy@sha256:63fd46d0bae020745338a29d5def10ca8ce43ccb15bb0a33258e5745c3523ace + - image: registry.redhat.io/openshift3/oauth-proxy:latest name: oauth-proxy - - image: registry.redhat.io/openshift3/ose-cli@sha256:8f9732773d3d4fb940f9660f01f3a681d3c7ea61e06a26853cfc14a5140165b9 + - image: registry.redhat.io/openshift3/ose-cli:v3.11 name: ose-cli - - image: registry.redhat.io/rhscl/mysql-57-rhel7@sha256:9a781abe7581cc141e14a7e404ec34125b3e89c008b14f4e7b41e094fd3049fe + - image: registry.redhat.io/rhscl/mysql-57-rhel7:latest name: mysql-57-rhel7 - - image: registry.redhat.io/rhscl/mysql-80-rhel7@sha256:b4a2380dfae26c771af2f868dbfe17c367772ea813b88a9683875c3c05b9bbde + - image: registry.redhat.io/rhscl/mysql-80-rhel7:latest name: mysql-80-rhel7 - - image: registry.redhat.io/rhscl/postgresql-10-rhel7@sha256:fda379b18033c7122f60b81760396f4c8c3009cfcad5c5028474f478b40d2647 + - image: registry.redhat.io/rhscl/postgresql-10-rhel7:latest name: postgresql-10-rhel7 - - image: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift@sha256:3375ec169d274278da56d1401c5c1285f7d2812ea0bde2ac9ad9652b69f80893 + - image: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.5 name: datagrid73-openshift - - image: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift@sha256:da558fa9ad7c357ed794eb549ac12a799eab97951f2e3cbc9501e413a348119a + - image: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.6 name: datagrid73-openshift - - image: registry.redhat.io/amq7/amq-broker@sha256:7e81fec6e8fcb760829ab73512d1abf4da93e6e3bca42a12f517f793b34d6709 + - image: registry.redhat.io/amq7/amq-broker:7.6 name: amq-broker - - image: registry.redhat.io/amq7/amq-broker@sha256:6ce6da749ca37e3a53fdf3a1b05f06cf0705c50400b4510345b6a1bdbb990e96 + - image: registry.redhat.io/amq7/amq-broker:7.7 name: amq-broker replaces: businessautomation-operator.7.9.0-2 selector: matchLabels: alm-owner-businessautomation: businessautomation-operator - operated-by: businessautomation-operator.7.9.1-dev-fvwlmvzt7v - version: 7.9.1+fvwlmvzt7v + operated-by: businessautomation-operator.7.9.1-1-dev-q8xb7n5mcz + version: 7.9.1-1+q8xb7n5mcz diff --git a/deploy/olm-catalog/dev/7.9.1/manifests/kieapp.crd.yaml b/deploy/olm-catalog/dev/7.9.1-1/manifests/kieapp.crd.yaml similarity index 100% rename from deploy/olm-catalog/dev/7.9.1/manifests/kieapp.crd.yaml rename to deploy/olm-catalog/dev/7.9.1-1/manifests/kieapp.crd.yaml diff --git a/deploy/olm-catalog/dev/7.9.1/metadata/annotations.yaml b/deploy/olm-catalog/dev/7.9.1-1/metadata/annotations.yaml similarity index 100% rename from deploy/olm-catalog/dev/7.9.1/metadata/annotations.yaml rename to deploy/olm-catalog/dev/7.9.1-1/metadata/annotations.yaml diff --git a/deploy/olm-catalog/prod/7.9.1/manifests/businessautomation-operator.7.9.1.clusterserviceversion.yaml b/deploy/olm-catalog/prod/7.9.1-1/manifests/businessautomation-operator.7.9.1-1.clusterserviceversion.yaml similarity index 65% rename from deploy/olm-catalog/prod/7.9.1/manifests/businessautomation-operator.7.9.1.clusterserviceversion.yaml rename to deploy/olm-catalog/prod/7.9.1-1/manifests/businessautomation-operator.7.9.1-1.clusterserviceversion.yaml index 1e2b63402..22a5cbf6f 100644 --- a/deploy/olm-catalog/prod/7.9.1/manifests/businessautomation-operator.7.9.1.clusterserviceversion.yaml +++ b/deploy/olm-catalog/prod/7.9.1-1/manifests/businessautomation-operator.7.9.1-1.clusterserviceversion.yaml @@ -6,8 +6,8 @@ metadata: capabilities: Seamless Upgrades categories: Integration & Delivery certified: "true" - containerImage: registry.redhat.io/rhpam-7/rhpam-rhel8-operator@sha256:bb7dc014287f067fd6490d5a96ab54cadabe54e48d54b4524741b75333e8e9ee - createdAt: "2020-12-14 11:30:25" + containerImage: registry.redhat.io/rhpam-7/rhpam-rhel8-operator:7.9.1 + createdAt: "2021-01-04 10:53:34" 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.1 + name: businessautomation-operator.7.9.1-1 namespace: placeholder spec: apiservicedefinitions: {} @@ -169,106 +169,106 @@ spec: - name: DEBUG value: "false" - name: DM_KIESERVER_IMAGE_7.9.1 - value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:6c4e37ce3de9640d37db4ea1b82ae79e5817e2341bc1b5d7ef5cbf7eb3086207 + value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.9.1 - name: DM_CONTROLLER_IMAGE_7.9.1 - value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:361393690e298b8d2d15e96bb464546cc6a007bfb7b4fa36d91cd497fde147a0 + value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.9.1 - name: DM_DC_IMAGE_7.9.1 - value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:e9550ef4f107a62a31f06fa24f21899d7ebb2098f197d29f3386132705661510 + value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.9.1 - name: PAM_KIESERVER_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:58e23f50e4d4840a611bcc4b854ace8158d6ae235b76855a10a35d6e6df1b8b2 + value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.9.1 - name: PAM_CONTROLLER_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:080f0748eb4444a1bc7834ccc969d97f9bd10d18628b8785715251e41a3d3e20 + value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.9.1 - name: PAM_BC_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:6ec1f875f3015a32578575c0f265f0b2c6c9bea7b5fff74a719528ae26ce5b11 + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.9.1 - name: PAM_BC_MONITORING_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:a116e234d413a918215f5677f4cb3e8e25463e7b26c27c3204f73472405acf6f + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.9.1 - name: PAM_SMARTROUTER_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:bdcb6232619b2763aca7b18b7e3669d21e8e41c302ad52f2f8d1ab400dacfb41 + value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.9.1 - name: PAM_PROCESS_MIGRATION_IMAGE_7.9.1 - value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:5e82b4e071ba00377614dc3c863a42a4466c6bbdb341ed8eb20a7b9d2ffe219e + value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.9.1 - name: OSE_CLI_IMAGE_7.9.1 - value: registry.redhat.io/openshift3/ose-cli@sha256:8f9732773d3d4fb940f9660f01f3a681d3c7ea61e06a26853cfc14a5140165b9 + value: registry.redhat.io/openshift3/ose-cli:v3.11 - name: MYSQL_PROXY_IMAGE_7.9.1 - value: registry.redhat.io/rhscl/mysql-80-rhel7@sha256:b4a2380dfae26c771af2f868dbfe17c367772ea813b88a9683875c3c05b9bbde + value: registry.redhat.io/rhscl/mysql-80-rhel7:latest - name: POSTGRESQL_PROXY_IMAGE_7.9.1 - value: registry.redhat.io/rhscl/postgresql-10-rhel7@sha256:fda379b18033c7122f60b81760396f4c8c3009cfcad5c5028474f478b40d2647 + value: registry.redhat.io/rhscl/postgresql-10-rhel7:latest - name: DATAGRID_IMAGE_7.9.1 - value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift@sha256:da558fa9ad7c357ed794eb549ac12a799eab97951f2e3cbc9501e413a348119a + value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.6 - name: BROKER_IMAGE_7.9.1 - value: registry.redhat.io/amq7/amq-broker@sha256:6ce6da749ca37e3a53fdf3a1b05f06cf0705c50400b4510345b6a1bdbb990e96 + value: registry.redhat.io/amq7/amq-broker:7.7 - name: DM_KIESERVER_IMAGE_7.9.0 - value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:c9ee12321e0ef9dd6447e3acf1b0c8e9a81c266dd1ccb3a586ca113a1e114020 + value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.9.0 - name: DM_CONTROLLER_IMAGE_7.9.0 - value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:fd2aa2048d914d8071e12e6c3d18868e9818557990679fda0b4125984c651455 + value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.9.0 - name: DM_DC_IMAGE_7.9.0 - value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:16c8ca66d50829e0ed7d16c8e9bf5e0d2d42d1ffc3037877c676d1f093c461b7 + value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.9.0 - name: PAM_KIESERVER_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:a636cb2c183ce14d7985dfc1efb0d4ad636c0ff6c07a8246d7e38c4092fe561e + value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.9.0 - name: PAM_CONTROLLER_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:af6344e06af50b883d791cd1f1de6f8e465916370c74ad1e8d9b56345d01d48d + value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.9.0 - name: PAM_BC_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:41192dcac95c7ec30af876f4de01c93d7ad093a1dbc07a9eec20efa1b95e1c90 + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.9.0 - name: PAM_BC_MONITORING_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:7c5487fb8839d1c36d53556670423a879bd9825f6ee72e895235ac27cdb232a6 + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.9.0 - name: PAM_SMARTROUTER_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:52882d1b4548de4d2f4c481fd33f523130dd6636bb97b0824a81ac520f5b4edf + value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.9.0 - name: PAM_PROCESS_MIGRATION_IMAGE_7.9.0 - value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:57404e93f2fb3cc120a4df534b326975bec8e57752a5832fe391768dfbaa9a2e + value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.9.0 - name: OSE_CLI_IMAGE_7.9.0 - value: registry.redhat.io/openshift3/ose-cli@sha256:8f9732773d3d4fb940f9660f01f3a681d3c7ea61e06a26853cfc14a5140165b9 + value: registry.redhat.io/openshift3/ose-cli:v3.11 - name: MYSQL_PROXY_IMAGE_7.9.0 - value: registry.redhat.io/rhscl/mysql-80-rhel7@sha256:b4a2380dfae26c771af2f868dbfe17c367772ea813b88a9683875c3c05b9bbde + value: registry.redhat.io/rhscl/mysql-80-rhel7:latest - name: POSTGRESQL_PROXY_IMAGE_7.9.0 - value: registry.redhat.io/rhscl/postgresql-10-rhel7@sha256:fda379b18033c7122f60b81760396f4c8c3009cfcad5c5028474f478b40d2647 + value: registry.redhat.io/rhscl/postgresql-10-rhel7:latest - name: DATAGRID_IMAGE_7.9.0 - value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift@sha256:da558fa9ad7c357ed794eb549ac12a799eab97951f2e3cbc9501e413a348119a + value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.6 - name: BROKER_IMAGE_7.9.0 - value: registry.redhat.io/amq7/amq-broker@sha256:6ce6da749ca37e3a53fdf3a1b05f06cf0705c50400b4510345b6a1bdbb990e96 + value: registry.redhat.io/amq7/amq-broker:7.7 - name: DM_KIESERVER_IMAGE_7.8.1 - value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:f21ff782e61fb7956f696ba158dab161c59b230a45ebe50aa151b7f3a9823ddd + value: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.8.1 - name: DM_CONTROLLER_IMAGE_7.8.1 - value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:c11dd63fa0d484306e0ee6ddbac062a766445d90c101ba96cf7dcd6a870d50a9 + value: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.8.1 - name: DM_DC_IMAGE_7.8.1 - value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:848c10073bce10629132e901b54ce4d04d70c3bb068cc6c360882c599696a20c + value: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.8.1 - name: PAM_KIESERVER_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:5d70a505d5850e8a845133a17dc9301a3a800c580681483958ebdce349d84f19 + value: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.8.1 - name: PAM_CONTROLLER_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:6a489c8b858d14aea7360ab286e61ebfd099f626f17c62e5771d131c18a8fbf0 + value: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.8.1 - name: PAM_BC_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:6e9aec3a774c446e367947963e5521cb9495899cd16b438ad5f202f399f218bf + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.8.1 - name: PAM_BC_MONITORING_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:e7f1d525f8eb9c10288f677d9e2698b0a4ee44122136e8ad0547e5546950f666 + value: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.8.1 - name: PAM_SMARTROUTER_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:fdfe21601cf39892ea8df099d09047c3cfdd48944a7751b5af4a3da0c41ac8d6 + value: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.8.1 - name: PAM_PROCESS_MIGRATION_IMAGE_7.8.1 - value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:677e32d5ebec1f8169c37826563a89cc8bfd13686d52d80084226748732ac8f7 + value: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.8.1 - name: OSE_CLI_IMAGE_7.8.1 - value: registry.redhat.io/openshift3/ose-cli@sha256:8f9732773d3d4fb940f9660f01f3a681d3c7ea61e06a26853cfc14a5140165b9 + value: registry.redhat.io/openshift3/ose-cli:v3.11 - name: MYSQL_PROXY_IMAGE_7.8.1 - value: registry.redhat.io/rhscl/mysql-80-rhel7@sha256:b4a2380dfae26c771af2f868dbfe17c367772ea813b88a9683875c3c05b9bbde + value: registry.redhat.io/rhscl/mysql-80-rhel7:latest - name: POSTGRESQL_PROXY_IMAGE_7.8.1 - value: registry.redhat.io/rhscl/postgresql-10-rhel7@sha256:fda379b18033c7122f60b81760396f4c8c3009cfcad5c5028474f478b40d2647 + value: registry.redhat.io/rhscl/postgresql-10-rhel7:latest - name: DATAGRID_IMAGE_7.8.1 - value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift@sha256:3375ec169d274278da56d1401c5c1285f7d2812ea0bde2ac9ad9652b69f80893 + value: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.5 - name: BROKER_IMAGE_7.8.1 - value: registry.redhat.io/amq7/amq-broker@sha256:7e81fec6e8fcb760829ab73512d1abf4da93e6e3bca42a12f517f793b34d6709 + value: registry.redhat.io/amq7/amq-broker:7.6 - name: OAUTH_PROXY_IMAGE_LATEST - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0088d7e77a812f95788ceb1e7346fac0fe66753598674c9f3b4e3621f382c1fa + value: registry.redhat.io/openshift4/ose-oauth-proxy:latest - name: OAUTH_PROXY_IMAGE_4.6 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0088d7e77a812f95788ceb1e7346fac0fe66753598674c9f3b4e3621f382c1fa + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.6 - name: OAUTH_PROXY_IMAGE_4.5 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:7c17e480cff1dbc805ee3dc389acfd02fafc12894cac2b36e07f95e82f2e06f1 + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.5 - name: OAUTH_PROXY_IMAGE_4.4 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0777db164629ea5e91f7540bc7dca9e4ecacadb98a478909ba02b73219658b21 + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.4 - name: OAUTH_PROXY_IMAGE_4.3 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:15f27e01677044b93854ed3696daf22a4232126da6dc591c6759ed1a5c32995e + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.3 - name: OAUTH_PROXY_IMAGE_4.2 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:acf0e6508033273bed6dd1bbe0b33accc492b894fd601d00dd8df195311486d7 + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.2 - name: OAUTH_PROXY_IMAGE_4.1 - value: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:43fde141b6670727a1771fa52cd125b366275786b4be0a0a0c57005fd6e0c912 + value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.1 - name: OAUTH_PROXY_IMAGE_3 - value: registry.redhat.io/openshift3/oauth-proxy@sha256:63fd46d0bae020745338a29d5def10ca8ce43ccb15bb0a33258e5745c3523ace - image: registry.redhat.io/rhpam-7/rhpam-rhel8-operator@sha256:bb7dc014287f067fd6490d5a96ab54cadabe54e48d54b4524741b75333e8e9ee + value: registry.redhat.io/openshift3/oauth-proxy:latest + image: registry.redhat.io/rhpam-7/rhpam-rhel8-operator:7.9.1 imagePullPolicy: Always name: business-automation-operator resources: {} @@ -435,7 +435,7 @@ spec: - operator labels: alm-owner-businessautomation: businessautomation-operator - operated-by: businessautomation-operator.7.9.1 + operated-by: businessautomation-operator.7.9.1-1 links: - name: Product Page url: https://access.redhat.com/products/red-hat-process-automation-manager @@ -448,97 +448,97 @@ spec: provider: name: Red Hat relatedImages: - - image: registry.redhat.io/rhpam-7/rhpam-rhel8-operator@sha256:bb7dc014287f067fd6490d5a96ab54cadabe54e48d54b4524741b75333e8e9ee + - image: registry.redhat.io/rhpam-7/rhpam-rhel8-operator:7.9.1 name: rhpam-rhel8-operator - - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:6c4e37ce3de9640d37db4ea1b82ae79e5817e2341bc1b5d7ef5cbf7eb3086207 + - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.9.1 name: rhdm-kieserver-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:361393690e298b8d2d15e96bb464546cc6a007bfb7b4fa36d91cd497fde147a0 + - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.9.1 name: rhdm-controller-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:e9550ef4f107a62a31f06fa24f21899d7ebb2098f197d29f3386132705661510 + - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.9.1 name: rhdm-decisioncentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:58e23f50e4d4840a611bcc4b854ace8158d6ae235b76855a10a35d6e6df1b8b2 + - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.9.1 name: rhpam-kieserver-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:080f0748eb4444a1bc7834ccc969d97f9bd10d18628b8785715251e41a3d3e20 + - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.9.1 name: rhpam-controller-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:6ec1f875f3015a32578575c0f265f0b2c6c9bea7b5fff74a719528ae26ce5b11 + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.9.1 name: rhpam-businesscentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:a116e234d413a918215f5677f4cb3e8e25463e7b26c27c3204f73472405acf6f + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.9.1 name: rhpam-businesscentral-monitoring-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:bdcb6232619b2763aca7b18b7e3669d21e8e41c302ad52f2f8d1ab400dacfb41 + - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.9.1 name: rhpam-smartrouter-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:5e82b4e071ba00377614dc3c863a42a4466c6bbdb341ed8eb20a7b9d2ffe219e + - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.9.1 name: rhpam-process-migration-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:c9ee12321e0ef9dd6447e3acf1b0c8e9a81c266dd1ccb3a586ca113a1e114020 + - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.9.0 name: rhdm-kieserver-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:fd2aa2048d914d8071e12e6c3d18868e9818557990679fda0b4125984c651455 + - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.9.0 name: rhdm-controller-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:16c8ca66d50829e0ed7d16c8e9bf5e0d2d42d1ffc3037877c676d1f093c461b7 + - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.9.0 name: rhdm-decisioncentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:a636cb2c183ce14d7985dfc1efb0d4ad636c0ff6c07a8246d7e38c4092fe561e + - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.9.0 name: rhpam-kieserver-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:af6344e06af50b883d791cd1f1de6f8e465916370c74ad1e8d9b56345d01d48d + - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.9.0 name: rhpam-controller-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:41192dcac95c7ec30af876f4de01c93d7ad093a1dbc07a9eec20efa1b95e1c90 + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.9.0 name: rhpam-businesscentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:7c5487fb8839d1c36d53556670423a879bd9825f6ee72e895235ac27cdb232a6 + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.9.0 name: rhpam-businesscentral-monitoring-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:52882d1b4548de4d2f4c481fd33f523130dd6636bb97b0824a81ac520f5b4edf + - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.9.0 name: rhpam-smartrouter-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:57404e93f2fb3cc120a4df534b326975bec8e57752a5832fe391768dfbaa9a2e + - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.9.0 name: rhpam-process-migration-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8@sha256:f21ff782e61fb7956f696ba158dab161c59b230a45ebe50aa151b7f3a9823ddd + - image: registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.8.1 name: rhdm-kieserver-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8@sha256:c11dd63fa0d484306e0ee6ddbac062a766445d90c101ba96cf7dcd6a870d50a9 + - image: registry.redhat.io/rhdm-7/rhdm-controller-rhel8:7.8.1 name: rhdm-controller-rhel8 - - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8@sha256:848c10073bce10629132e901b54ce4d04d70c3bb068cc6c360882c599696a20c + - image: registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.8.1 name: rhdm-decisioncentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8@sha256:5d70a505d5850e8a845133a17dc9301a3a800c580681483958ebdce349d84f19 + - image: registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.8.1 name: rhpam-kieserver-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8@sha256:6a489c8b858d14aea7360ab286e61ebfd099f626f17c62e5771d131c18a8fbf0 + - image: registry.redhat.io/rhpam-7/rhpam-controller-rhel8:7.8.1 name: rhpam-controller-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8@sha256:6e9aec3a774c446e367947963e5521cb9495899cd16b438ad5f202f399f218bf + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.8.1 name: rhpam-businesscentral-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8@sha256:e7f1d525f8eb9c10288f677d9e2698b0a4ee44122136e8ad0547e5546950f666 + - image: registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.8.1 name: rhpam-businesscentral-monitoring-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8@sha256:fdfe21601cf39892ea8df099d09047c3cfdd48944a7751b5af4a3da0c41ac8d6 + - image: registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.8.1 name: rhpam-smartrouter-rhel8 - - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8@sha256:677e32d5ebec1f8169c37826563a89cc8bfd13686d52d80084226748732ac8f7 + - image: registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8:7.8.1 name: rhpam-process-migration-rhel8 - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0088d7e77a812f95788ceb1e7346fac0fe66753598674c9f3b4e3621f382c1fa + - image: registry.redhat.io/openshift4/ose-oauth-proxy:latest name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0088d7e77a812f95788ceb1e7346fac0fe66753598674c9f3b4e3621f382c1fa + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.6 name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:7c17e480cff1dbc805ee3dc389acfd02fafc12894cac2b36e07f95e82f2e06f1 + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.5 name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:0777db164629ea5e91f7540bc7dca9e4ecacadb98a478909ba02b73219658b21 + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.4 name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:15f27e01677044b93854ed3696daf22a4232126da6dc591c6759ed1a5c32995e + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.3 name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:acf0e6508033273bed6dd1bbe0b33accc492b894fd601d00dd8df195311486d7 + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.2 name: ose-oauth-proxy - - image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:43fde141b6670727a1771fa52cd125b366275786b4be0a0a0c57005fd6e0c912 + - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.1 name: ose-oauth-proxy - - image: registry.redhat.io/openshift3/oauth-proxy@sha256:63fd46d0bae020745338a29d5def10ca8ce43ccb15bb0a33258e5745c3523ace + - image: registry.redhat.io/openshift3/oauth-proxy:latest name: oauth-proxy - - image: registry.redhat.io/openshift3/ose-cli@sha256:8f9732773d3d4fb940f9660f01f3a681d3c7ea61e06a26853cfc14a5140165b9 + - image: registry.redhat.io/openshift3/ose-cli:v3.11 name: ose-cli - - image: registry.redhat.io/rhscl/mysql-57-rhel7@sha256:9a781abe7581cc141e14a7e404ec34125b3e89c008b14f4e7b41e094fd3049fe + - image: registry.redhat.io/rhscl/mysql-57-rhel7:latest name: mysql-57-rhel7 - - image: registry.redhat.io/rhscl/mysql-80-rhel7@sha256:b4a2380dfae26c771af2f868dbfe17c367772ea813b88a9683875c3c05b9bbde + - image: registry.redhat.io/rhscl/mysql-80-rhel7:latest name: mysql-80-rhel7 - - image: registry.redhat.io/rhscl/postgresql-10-rhel7@sha256:fda379b18033c7122f60b81760396f4c8c3009cfcad5c5028474f478b40d2647 + - image: registry.redhat.io/rhscl/postgresql-10-rhel7:latest name: postgresql-10-rhel7 - - image: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift@sha256:3375ec169d274278da56d1401c5c1285f7d2812ea0bde2ac9ad9652b69f80893 + - image: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.5 name: datagrid73-openshift - - image: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift@sha256:da558fa9ad7c357ed794eb549ac12a799eab97951f2e3cbc9501e413a348119a + - image: registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.6 name: datagrid73-openshift - - image: registry.redhat.io/amq7/amq-broker@sha256:7e81fec6e8fcb760829ab73512d1abf4da93e6e3bca42a12f517f793b34d6709 + - image: registry.redhat.io/amq7/amq-broker:7.6 name: amq-broker - - image: registry.redhat.io/amq7/amq-broker@sha256:6ce6da749ca37e3a53fdf3a1b05f06cf0705c50400b4510345b6a1bdbb990e96 + - image: registry.redhat.io/amq7/amq-broker:7.7 name: amq-broker replaces: businessautomation-operator.7.9.0-2 selector: matchLabels: alm-owner-businessautomation: businessautomation-operator - operated-by: businessautomation-operator.7.9.1 - version: 7.9.1 + operated-by: businessautomation-operator.7.9.1-1 + version: 7.9.1-1 diff --git a/deploy/olm-catalog/prod/7.9.1/manifests/kieapp.crd.yaml b/deploy/olm-catalog/prod/7.9.1-1/manifests/kieapp.crd.yaml similarity index 100% rename from deploy/olm-catalog/prod/7.9.1/manifests/kieapp.crd.yaml rename to deploy/olm-catalog/prod/7.9.1-1/manifests/kieapp.crd.yaml diff --git a/deploy/olm-catalog/prod/7.9.1/metadata/annotations.yaml b/deploy/olm-catalog/prod/7.9.1-1/metadata/annotations.yaml similarity index 100% rename from deploy/olm-catalog/prod/7.9.1/metadata/annotations.yaml rename to deploy/olm-catalog/prod/7.9.1-1/metadata/annotations.yaml diff --git a/getversion.go b/getversion.go index 0527e4dd0..20f804665 100644 --- a/getversion.go +++ b/getversion.go @@ -8,13 +8,19 @@ import ( ) var ( - prior = flag.Bool("prior", false, "get prior product version") + prior = flag.Bool("prior", false, "get prior product version") + csv = flag.Bool("csv", false, "get csv version") + csvPrior = flag.Bool("csvPrior", false, "get prior csv version") ) func main() { flag.Parse() if *prior { fmt.Println(version.PriorVersion) + } else if *csv { + fmt.Println(version.CsvVersion) + } else if *csvPrior { + fmt.Println(version.CsvPriorVersion) } else { fmt.Println(version.Version) } diff --git a/go.sum b/go.sum index da5888d8d..c56b1c7de 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,7 @@ github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9mo github.com/Azure/azure-sdk-for-go v23.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v36.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest v13.3.2+incompatible h1:VxzPyuhtnlBOzc4IWCZHqpyH2d+QMLQEuy3wREyY4oc= github.com/Azure/go-autorest v13.3.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= @@ -63,6 +64,7 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -71,8 +73,10 @@ github.com/Masterminds/sprig/v3 v3.1.0/go.mod h1:ONGMf7UfYGAbMXCZmQLy8x3lCDIPrEZ github.com/Masterminds/squirrel v1.2.0/go.mod h1:yaPeOnPG5ZRwL9oKdTsO/prlkPbXWZlRVMQ/gGlzIuA= github.com/Masterminds/vcs v1.13.1/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6trr62pF5DucadTWGdEB4mEyvzi0e2nbcmcyA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= +github.com/Microsoft/hcsshim v0.8.9 h1:VrfodqvztU8YSOvygU+DN1BGaSGxmrNfqOv5oOuX2Bk= github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= @@ -108,6 +112,7 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2c github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6 h1:uZuxRZCz65cG1o6K/xUqImNcYKtmk9ylqaH0itMSvzA= github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -174,17 +179,21 @@ github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMe github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f h1:tSNMc+rJDfmYntojat8lljbt1mgKNpTxUZJsSzJ9Y1s= github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= github.com/containerd/containerd v1.2.7/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.2 h1:ForxmXkA6tPIvffbrDAcPUIB32QgXkt2XFj+F0UxetA= github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY= +github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb h1:nXPkFq8X1a9ycY3GYQpFNxHh3j2JgY7zDZfq2EXMIzk= github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= +github.com/containerd/ttrpc v1.0.1 h1:IfVOxKbjyBn9maoye2JN95pgGYOmPkQVqxtOu7rtNIc= github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= @@ -233,6 +242,7 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dgryski/go-sip13 v0.0.0-20190329191031-25c5027a8c7b/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dhui/dktest v0.3.0/go.mod h1:cyzIUfGsBEbZ6BT7tnXqAShHSXCZhSNmFl70sZ7c1yc= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= +github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492 h1:FwssHbCDJD025h+BchanCwE1Q8fyMgqDr2mOQAWOLGw= github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20171011171712-7484e51bf6af/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= @@ -242,12 +252,15 @@ github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc github.com/docker/docker v0.7.3-0.20190103212154-2b7e084dc98b/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v0.7.3-0.20190817195342-4760db040282/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce h1:KXS1Jg+ddGcWA8e1N7cupxaHHZhit5rB9tfDU+mfjyY= github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= +github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= @@ -255,6 +268,7 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4= github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -493,6 +507,7 @@ github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5 github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang-migrate/migrate/v4 v4.6.2 h1:LDDOHo/q1W5UDj6PbkxdCv7lv9yunyZHXvxuwDkGo3k= github.com/golang-migrate/migrate/v4 v4.6.2/go.mod h1:JYi6reN3+Z734VZ0akNuyOJNcrg45ZL7LDBMW3WGJL0= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= @@ -780,6 +795,7 @@ github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v1.12.0 h1:u/x3mp++qUxvYfulZ4HKOvVO0JWhk7HtE8lWhbGz/Do= github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= @@ -829,6 +845,7 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mozilla/tls-observatory v0.0.0-20180409132520-8791a200eb40/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/mozillazg/go-cos v0.13.0/go.mod h1:Zp6DvvXn0RUOXGJ2chmWt2bLEqRAnJnS3DnAZsJsoaE= @@ -893,6 +910,7 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 h1:yN8BPXVwMBAm3Cuvh1L5XE8XpvYRMdsVLd82ILprhUU= github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y= github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= @@ -910,9 +928,11 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/operator-framework/api v0.3.12 h1:In6bSbDr5zVOb5ats7TBMnl1h0hCIjkAxXkh+MXFJps= github.com/operator-framework/api v0.3.12/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q= +github.com/operator-framework/operator-registry v1.13.4 h1:GH7essHnVRP4kYgAWYV9obsS0Cnaj/KjT3BmQXmKAOE= github.com/operator-framework/operator-registry v1.13.4/go.mod h1:YhnIzOVjRU2ZwZtzt+fjcjW8ujJaSFynBEu7QVKaSdU= github.com/operator-framework/operator-sdk v0.19.2 h1:Rs5uSxOABT2Czr9mTnfuNQzKA/S39iup+vy4QI++kL0= github.com/operator-framework/operator-sdk v0.19.2/go.mod h1:PYifrohZkSUnO/+J4w9BSrJWNJkrXB+DQTogOwuU+qM= +github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= @@ -1166,6 +1186,7 @@ go.elastic.co/fastjson v1.0.0/go.mod h1:PmeUOMMtLHQr9ZS9J9owrAVg0FkaZDRZJEFTTGHt go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8= @@ -1181,6 +1202,7 @@ go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= @@ -1505,6 +1527,7 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200701001935-0939c5918c31 h1:Of4QP8bfRqzDROen6+s2j/p0jCPgzvQRd9nHiactfn4= google.golang.org/genproto v0.0.0-20200701001935-0939c5918c31/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= @@ -1521,6 +1544,7 @@ google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRn google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.30.0 h1:M5a8xTlYTxwMn5ZFkwhRabsygDY5G8TYLyQDBxJNAxE= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200709232328-d8193ee9cc3e/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -1602,6 +1626,7 @@ k8s.io/apiextensions-apiserver v0.19.0/go.mod h1:znfQxNpjqz/ZehvbfMg5N6fvBJW5Lqu k8s.io/apimachinery v0.19.0 h1:gjKnAda/HZp5k4xQYjL0K/Yb66IvNqjthCb03QlKpaQ= k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apiserver v0.0.0-20191122221311-9d521947b1e1/go.mod h1:RbsZY5zzBIWnz4KbctZsTVjwIuOpTp4Z8oCgFHN4kZQ= +k8s.io/apiserver v0.19.0 h1:jLhrL06wGAADbLUUQm8glSLnAGP6c7y5R3p19grkBoY= k8s.io/apiserver v0.19.0/go.mod h1:XvzqavYj73931x7FLtyagh8WibHpePJ1QwWrSJs2CLk= k8s.io/autoscaler v0.0.0-20190607113959-1b4f1855cb8e/go.mod h1:QEXezc9uKPT91dwqhSJq3GNI3B1HxFRQHiku9kmrsSA= k8s.io/cli-runtime v0.18.0/go.mod h1:1eXfmBsIJosjn9LjEBUd2WVPoPAY9XGTqTFcPMIBsUQ= @@ -1614,6 +1639,7 @@ k8s.io/code-generator v0.19.0/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZ k8s.io/component-base v0.0.0-20191122220729-2684fb322cb9/go.mod h1:NFuUusy/X4Tk21m21tcNUihnmp4OI7lXU7/xA+rYXkc= k8s.io/component-base v0.18.0/go.mod h1:u3BCg0z1uskkzrnAKFzulmYaEpZF7XC9Pf/uFyb1v2c= k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM= +k8s.io/component-base v0.19.0 h1:OueXf1q3RW7NlLlUCj2Dimwt7E1ys6ZqRnq53l2YuoE= k8s.io/component-base v0.19.0/go.mod h1:dKsY8BxkA+9dZIAh2aWJLL/UdASFDNtGYTCItL4LM7Y= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -1641,6 +1667,7 @@ k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H k8s.io/kube-state-metrics v1.7.2 h1:6vdtgXrrRRMSgnyDmgua+qvgCYv954JNfxXAtDkeLVQ= k8s.io/kube-state-metrics v1.7.2/go.mod h1:U2Y6DRi07sS85rmVPmBFlmv+2peBcL8IWGjM+IjYA/E= k8s.io/kubectl v0.18.0/go.mod h1:LOkWx9Z5DXMEg5KtOjHhRiC1fqJPLyCr3KtQgEolCkU= +k8s.io/kubectl v0.18.2 h1:9jnGSOC2DDVZmMUTMi0D1aed438mfQcgqa5TAzVjA1k= k8s.io/kubectl v0.18.2/go.mod h1:OdgFa3AlsPKRpFFYE7ICTwulXOcMGXHTc+UKhHKvrb4= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/metrics v0.18.0/go.mod h1:8aYTW18koXqjLVKL7Ds05RPMX9ipJZI3mywYvBOxXd4= @@ -1657,6 +1684,7 @@ k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9 h1:rusRLrDhjBp6aYtl9sGEvQJr6faoHoDLd0YcUBTZguI= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0= sigs.k8s.io/controller-runtime v0.6.0 h1:Fzna3DY7c4BIP6KwfSlrfnj20DJ+SeMBK8HSFvOk9NM= sigs.k8s.io/controller-runtime v0.6.0/go.mod h1:CpYf5pdNY/B352A1TFLAS2JVSlnGQ5O2cftPHndTroo= diff --git a/hack/go-build-bundle.sh b/hack/go-build-bundle.sh index d9d28683f..a2e369543 100755 --- a/hack/go-build-bundle.sh +++ b/hack/go-build-bundle.sh @@ -17,18 +17,18 @@ fi echo ${CFLAGS} -VERSION=$(go run getversion.go) +CSVVERSION=$(go run getversion.go -csv) OLMDIR=deploy/olm-catalog/prod BUNDLE_NAME=rhpam-7/${BUNDLE} -CSV=businessautomation-operator.${VERSION}.clusterserviceversion.yaml +CSV=businessautomation-operator.${CSVVERSION}.clusterserviceversion.yaml if [[ ${DEV} == true ]]; then OLMDIR=deploy/olm-catalog/dev BUNDLE_NAME=quay.io/tchughesiv/${BUNDLE} fi -VERDIR=${OLMDIR}/${VERSION} +VERDIR=${OLMDIR}/${CSVVERSION} CRD=kieapp.crd.yaml -if (( $(echo "${VERSION} 7.9.0" | awk '{print ($1 < $2)}') )); then +if (( $(echo "${CSVVERSION} 7.9.0" | awk '{print ($1 < $2)}') )); then CRD=kieapp.crd.v1beta1.yaml fi ANNO=annotations.yaml @@ -51,7 +51,7 @@ cekit-cache add --md5 ${MD5_ANNO} ${ANNO_PATH} cekit -v --descriptor image-bundle.yaml --redhat build \ --overrides '{name: '${BUNDLE_NAME}'}' \ - --overrides '{version: '${VERSION}'}' \ + --overrides '{version: '${CSVVERSION}'}' \ --overrides '{ artifacts: [ {name: '${CSV}', path: '${CSV_PATH}', md5: '${MD5_CSV}', dest: '/manifests'}, @@ -65,7 +65,7 @@ artifacts: [ {"container": { "operator_manifests": - {"enable_digest_pinning": false, "enable_repo_replacements": false, "enable_registry_replacements": false, "manifests_dir": 'modules/olm-catalog/${VERSION}/manifests'}, + {"enable_digest_pinning": false, "enable_repo_replacements": false, "enable_registry_replacements": false, "manifests_dir": 'modules/olm-catalog/${CSVVERSION}/manifests'}, "platforms": {"only": ["x86_64"]} } diff --git a/hack/go-csv.sh b/hack/go-csv.sh index 8099e9ff8..6837ddc28 100755 --- a/hack/go-csv.sh +++ b/hack/go-csv.sh @@ -1,10 +1,9 @@ #!/bin/sh source ./hack/go-mod-env.sh -VERSION=$(go run getversion.go) +VERSION=$(go run getversion.go -csv) -#go run ./tools/csv-gen/csv-gen.go -go run ./tools/csv-gen/csv-gen.go -replaces 7.9.0-2 +go run ./tools/csv-gen/csv-gen.go operator-sdk bundle validate deploy/olm-catalog/dev/${VERSION} operator-sdk bundle validate deploy/olm-catalog/prod/${VERSION} diff --git a/pkg/controller/kieapp/deploy_ui_test.go b/pkg/controller/kieapp/deploy_ui_test.go index e0e8ebbdb..2275220d5 100644 --- a/pkg/controller/kieapp/deploy_ui_test.go +++ b/pkg/controller/kieapp/deploy_ui_test.go @@ -26,8 +26,8 @@ import ( ) func TestUpdateLink(t *testing.T) { - box := packr.New("CSV", "../../../deploy/olm-catalog/prod/"+version.Version+"/manifests") - bytes, err := box.Find("businessautomation-operator." + version.Version + ".clusterserviceversion.yaml") + box := packr.New("CSV", "../../../deploy/olm-catalog/prod/"+version.CsvVersion+"/manifests") + bytes, err := box.Find("businessautomation-operator." + version.CsvVersion + ".clusterserviceversion.yaml") assert.Nil(t, err, "Error reading CSV file") csv := &operators.ClusterServiceVersion{} err = yaml.Unmarshal(bytes, csv) @@ -37,8 +37,8 @@ func TestUpdateLink(t *testing.T) { } func TestUpdateExistingLink(t *testing.T) { - box := packr.New("CSV", "../../../deploy/olm-catalog/prod/"+version.Version+"/manifests") - bytes, err := box.Find("businessautomation-operator." + version.Version + ".clusterserviceversion.yaml") + box := packr.New("CSV", "../../../deploy/olm-catalog/prod/"+version.CsvVersion+"/manifests") + bytes, err := box.Find("businessautomation-operator." + version.CsvVersion + ".clusterserviceversion.yaml") assert.Nil(t, err, "Error reading CSV file") csv := &operators.ClusterServiceVersion{} err = yaml.Unmarshal(bytes, csv) diff --git a/tools/csv-gen/csv-gen.go b/tools/csv-gen/csv-gen.go index 72305f5e6..380782eb1 100644 --- a/tools/csv-gen/csv-gen.go +++ b/tools/csv-gen/csv-gen.go @@ -69,8 +69,8 @@ var ( ) var ( - ver = flag.String("version", version.Version, "set CSV version") - replaces = flag.String("replaces", version.PriorVersion, "set CSV version to replace") + ver = flag.String("version", version.CsvVersion, "set CSV version") + replaces = flag.String("replaces", version.CsvPriorVersion, "set CSV version to replace") ) type csvSetting struct { diff --git a/version/version.go b/version/version.go index d6ac54e80..86035e680 100644 --- a/version/version.go +++ b/version/version.go @@ -7,6 +7,10 @@ import ( var ( // Version - current version Version = constants.CurrentVersion + // CsvVersion - csv release + CsvVersion = Version + "-1" // PriorVersion - prior version PriorVersion = constants.PriorVersion1 + // CsvPriorVersion - prior csv release + CsvPriorVersion = PriorVersion + "-2" )