alihan/odo
1
0
Fork 0
mirror of https://github.com/redhat-developer/odo.git synced 2025-10-19 03:06:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change API & Operator version for Serice Binding Operator (#4484)

Browse Source 
* Change API & Operator version for Serice Binding Operator

This is to be compatible with SBO 0.5.0

* Remove startingCSV info from Operator setup script

This will lead to installation of latest available version of the
Operator
This commit is contained in:
Dharmit Shah
2021-03-04 19:39:22 +05:30
committed by GitHub
parent 2f7f4a0906
commit 5d914523de
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.sum
View File

@@ -573,6 +573,7 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
@@ -868,6 +869,7 @@ github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/profile v1.3.0/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

2
pkg/kclient/operators.go
View File

@@ -21,7 +21,7 @@ const (
// IsServiceBindingSupported checks if resource of type service binding request present on the cluster
func (c *Client) IsServiceBindingSupported() (bool, error) {
return c.IsResourceSupported("operators.coreos.com", "v1alpha1", "servicebindings")
return c.IsResourceSupported("binding.operators.coreos.com", "v1alpha1", "servicebindings")
}
// IsCSVSupported checks if resource of type service binding request present on the cluster

2
pkg/odo/cli/component/common_link.go
View File

@@ -25,7 +25,7 @@ import (
var (
// Hardcoded variables since we can't install SBO on k8s using OLM
// (https://github.com/redhat-developer/service-binding-operator/issues/536)
serviceBindingGroup = "operators.coreos.com"
serviceBindingGroup = "binding.operators.coreos.com"
serviceBindingVersion = "v1alpha1"
serviceBindingKind = "ServiceBinding"
serviceBindingResource = "servicebindings"

2
scripts/configure-cluster/common/setup-operators.sh
View File

@@ -15,7 +15,6 @@ install_etcd_operator(){
name: etcd
source: community-operators
sourceNamespace: openshift-marketplace
startingCSV: etcdoperator.v0.9.4-clusterwide
EOF
}
@@ -34,7 +33,6 @@ install_service_binding_operator(){
name: rh-service-binding-operator
source: redhat-operators
sourceNamespace: openshift-marketplace
startingCSV: service-binding-operator.v0.3.0
EOF
}