diff --git a/Makefile b/Makefile index 22e7b7b7a..716f4ab09 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ IMAGE_REG=quay.io IMAGE_ORG=integreatly IMAGE_NAME=cloud-resource-operator -IMAGE=quay.io/integreatly/cloud-resource-operator:0.2.0 +IMAGE=quay.io/integreatly/cloud-resource-operator:0.3.0 MANIFEST_NAME=cloud-resources NAMESPACE=cloud-resource-operator -VERSION=0.2.0 +VERSION=0.3.0 COMPILE_TARGET=./tmp/_output/bin/$(IMAGE_NAME) OPERATOR_SDK_VERSION=0.12.0 diff --git a/deploy/olm-catalog/cloud-resources/cloud-resource-operator.clusterserviceversion.yaml b/deploy/olm-catalog/cloud-resources/cloud-resource-operator.clusterserviceversion.yaml index a5e424c5b..32ed3ec9e 100644 --- a/deploy/olm-catalog/cloud-resources/cloud-resource-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/cloud-resources/cloud-resource-operator.clusterserviceversion.yaml @@ -6,11 +6,11 @@ metadata: capabilities: Basic Install categories: Integration & Delivery description: Operator to provision cloud provider resources in an abstracted manner - containerImage: quay.io/integreatly/cloud-resource-operator:0.2.0 + containerImage: quay.io/integreatly/cloud-resource-operator:0.3.0 support: Integreatly createdAt: 2019-10-07 12:34:56 certified: 'false' - name: cloud-resources.v0.2.0 + name: cloud-resources.v0.3.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -115,7 +115,7 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: cloud-resource-operator - image: quay.io/integreatly/cloud-resource-operator:0.2.0 + image: quay.io/integreatly/cloud-resource-operator:0.3.0 imagePullPolicy: Always name: cloud-resource-operator resources: {} @@ -236,4 +236,4 @@ spec: maturity: alpha provider: name: Integreatly - version: 0.2.0 \ No newline at end of file + version: 0.3.0 \ No newline at end of file diff --git a/deploy/olm-catalog/cloud-resources/cloud-resource-operator.package.yaml b/deploy/olm-catalog/cloud-resources/cloud-resource-operator.package.yaml index eee1a4fc7..d165d8d8d 100644 --- a/deploy/olm-catalog/cloud-resources/cloud-resource-operator.package.yaml +++ b/deploy/olm-catalog/cloud-resources/cloud-resource-operator.package.yaml @@ -1,5 +1,5 @@ channels: -- currentCSV: cloud-resources.v0.2.0 +- currentCSV: cloud-resources.v0.3.0 name: integreatly defaultChannel: integreatly packageName: cloud-resources diff --git a/pkg/providers/openshift/provider_postgres.go b/pkg/providers/openshift/provider_postgres.go index c947cb49a..3d6d3b87a 100644 --- a/pkg/providers/openshift/provider_postgres.go +++ b/pkg/providers/openshift/provider_postgres.go @@ -4,10 +4,11 @@ import ( "context" "encoding/json" "fmt" - types2 "github.com/integr8ly/cloud-resource-operator/pkg/apis/integreatly/v1alpha1/types" "strings" "time" + types2 "github.com/integr8ly/cloud-resource-operator/pkg/apis/integreatly/v1alpha1/types" + "k8s.io/client-go/kubernetes" "k8s.io/apimachinery/pkg/types" @@ -443,7 +444,7 @@ func buildDefaultPostgresPodContainers(ps *v1alpha1.Postgres) []v1.Container { return []v1.Container{ { Name: ps.Name, - Image: "registry.redhat.io/rhscl/postgresql-96-rhel7", + Image: "registry.redhat.io/rhscl/postgresql-10-rhel7", Ports: []v1.ContainerPort{ { ContainerPort: int32(defaultPostgresPort), diff --git a/pkg/providers/openshift/provider_redis.go b/pkg/providers/openshift/provider_redis.go index 90a4541cb..504807c2c 100644 --- a/pkg/providers/openshift/provider_redis.go +++ b/pkg/providers/openshift/provider_redis.go @@ -4,10 +4,11 @@ import ( "context" "encoding/json" "fmt" - types2 "github.com/integr8ly/cloud-resource-operator/pkg/apis/integreatly/v1alpha1/types" "strings" "time" + types2 "github.com/integr8ly/cloud-resource-operator/pkg/apis/integreatly/v1alpha1/types" + controllerruntime "sigs.k8s.io/controller-runtime" "github.com/sirupsen/logrus" @@ -329,7 +330,7 @@ func buildDefaultRedisDeployment(r *v1alpha1.Redis) *appsv1.Deployment { }, ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{ - "deployment": redisDCSelectorName, + "deployment": r.Name, }, }, }, @@ -338,7 +339,7 @@ func buildDefaultRedisDeployment(r *v1alpha1.Redis) *appsv1.Deployment { }, Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ - "deployment": redisDCSelectorName, + "deployment": r.Name, }, }, Replicas: int32Ptr(1), @@ -457,7 +458,7 @@ func buildDefaultRedisService(r *v1alpha1.Redis) *apiv1.Service { }, }, Selector: map[string]string{ - "deployment": redisDCSelectorName, + "deployment": r.Name, }, }, } diff --git a/version/version.go b/version/version.go index dd10d2c94..70e55cf63 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version var ( - Version = "0.2.0" + Version = "0.3.0" )