From 6a091c08c38d31f2267201d051d103144683d7bc Mon Sep 17 00:00:00 2001 From: Hui Guang Liu Date: Fri, 11 Dec 2020 15:59:45 +0800 Subject: [PATCH 1/2] onboard vault operator --- ...common-service-operator.clusterserviceversion.yaml | 11 +++++++++++ ...common-service-operator.clusterserviceversion.yaml | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml b/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml index c1ff6652d..cc3830527 100644 --- a/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml +++ b/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml @@ -111,6 +111,10 @@ metadata: elasticStack: {} operandBindInfo: {} operandRequest: {} + - name: ibm-vault-operator + spec: + operandBindInfo: {} + operandRequest: {} csOperandRegistry: |- apiVersion: operator.ibm.com/v1alpha1 kind: OperandRegistry @@ -232,6 +236,13 @@ metadata: scope: public sourceName: opencloud-operators sourceNamespace: openshift-marketplace + - channel: beta + name: ibm-vault-operator + namespace: ibm-common-services + packageName: ibm-vault-operator + scope: public + sourceName: opencloud-operators + sourceNamespace: openshift-marketplace csOperatorSubscription: |- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription diff --git a/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml b/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml index 8a7a1232c..413982748 100644 --- a/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml @@ -94,6 +94,10 @@ metadata: elasticStack: {} operandBindInfo: {} operandRequest: {} + - name: ibm-vault-operator + spec: + operandBindInfo: {} + operandRequest: {} csOperandRegistry: |- apiVersion: operator.ibm.com/v1alpha1 kind: OperandRegistry @@ -215,6 +219,13 @@ metadata: scope: public sourceName: opencloud-operators sourceNamespace: openshift-marketplace + - channel: beta + name: ibm-vault-operator + namespace: ibm-common-services + packageName: ibm-vault-operator + scope: public + sourceName: opencloud-operators + sourceNamespace: openshift-marketplace csOperatorSubscription: |- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription From 21d1d7fed594241b00fb1721e4dbed880a8836a1 Mon Sep 17 00:00:00 2001 From: Hui Guang Liu Date: Fri, 11 Dec 2020 17:27:35 +0800 Subject: [PATCH 2/2] update vault operand config --- .../ibm-common-service-operator.clusterserviceversion.yaml | 2 +- .../ibm-common-service-operator.clusterserviceversion.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml b/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml index cc3830527..2cd1a13a2 100644 --- a/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml +++ b/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml @@ -113,7 +113,7 @@ metadata: operandRequest: {} - name: ibm-vault-operator spec: - operandBindInfo: {} + vaultDeploy: {} operandRequest: {} csOperandRegistry: |- apiVersion: operator.ibm.com/v1alpha1 diff --git a/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml b/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml index 413982748..c891323bc 100644 --- a/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml @@ -96,7 +96,7 @@ metadata: operandRequest: {} - name: ibm-vault-operator spec: - operandBindInfo: {} + vaultDeploy: {} operandRequest: {} csOperandRegistry: |- apiVersion: operator.ibm.com/v1alpha1