Skip to content

Commit

Permalink
Merge pull request #217 from austincunningham/MGDAPI-1857-version-bump
Browse files Browse the repository at this point in the history
MDGAPI-1857: version bump v0.26.0
  • Loading branch information
openshift-merge-robot authored Jun 11, 2021
2 parents 3e5f3ef + 867db92 commit 58a8b12
Show file tree
Hide file tree
Showing 13 changed files with 740 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ IMAGE_NAME ?= cloud-resource-operator
OPERATOR_IMG = $(IMAGE_REG)/$(IMAGE_ORG)/$(IMAGE_NAME):v$(VERSION)
MANIFEST_NAME ?= cloud-resources
NAMESPACE=cloud-resource-operator
PREV_VERSION=0.24.1
VERSION=0.25.0
PREV_VERSION=0.25.0
VERSION=0.26.0
COMPILE_TARGET=./tmp/_output/bin/$(IMAGE_NAME)
UPGRADE ?= true
CHANNEL ?= rhmi

PREVIOUS_OPERATOR_VERSIONS="0.24.1,0.24.0,0.23.0"
PREVIOUS_OPERATOR_VERSIONS="0.25.0,0.24.1,0.24.0,0.23.0"

SHELL=/bin/bash

Expand Down
2 changes: 1 addition & 1 deletion Update_CRO_rhmi.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ From your CRO branch, navigate to makefile and ensure that:
must contain "0.24.0,0.23.0" - where 0.23.0 is the initial bundle version for CRO.
- Run `make gen/csv` which will generate new manifests.
- Ensure that the IMAGE_REG and IMAGE_ORG matches the desired repositories.
- Create new CRO image by running `make image/build/push` or point to the existing one in the CSV you have created.
- Create new CRO image by running `make image/build` and `make image/push` or point to the existing one in the CSV you have created.
- Ensure that the replaces field is present and replaces previous version.
- Run `make create/olm/bundle` - this will create and push bundles and indices to given repository, as well as validating them.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ metadata:
annotations:
alm-examples: '[]'
capabilities: Basic Install
containerImage: quay.io/integreatly/cloud-resource-operator:v0.25.0
containerImage: quay.io/integreatly/cloud-resource-operator:v0.26.0
operators.operatorframework.io/builder: operator-sdk-v1.2.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
name: cloud-resources.v0.25.0
name: cloud-resources.v0.26.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -63,4 +63,4 @@ spec:
maturity: alpha
provider:
name: Integreatly
version: 0.25.0
version: 0.26.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
name: cloud-resource-operator
name: cloud-resource-operator-metrics
spec:
endpoints:
- path: /metrics
port: http-metrics
selector:
matchLabels:
name: cloud-resource-operator

Large diffs are not rendered by default.

84 changes: 84 additions & 0 deletions packagemanifests/0.26.0/integreatly.org_blobstorages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
creationTimestamp: null
name: blobstorages.integreatly.org
spec:
group: integreatly.org
names:
kind: BlobStorage
listKind: BlobStorageList
plural: blobstorages
singular: blobstorage
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: BlobStorage is the Schema for the blobstorages API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
applyImmediately:
type: boolean
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
skipCreate:
type: boolean
tier:
type: string
type:
type: string
required:
- secretRef
- tier
- type
type: object
status:
properties:
message:
type: string
phase:
type: string
provider:
type: string
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
strategy:
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
84 changes: 84 additions & 0 deletions packagemanifests/0.26.0/integreatly.org_postgres.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
creationTimestamp: null
name: postgres.integreatly.org
spec:
group: integreatly.org
names:
kind: Postgres
listKind: PostgresList
plural: postgres
singular: postgres
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Postgres is the Schema for the postgres API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
applyImmediately:
type: boolean
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
skipCreate:
type: boolean
tier:
type: string
type:
type: string
required:
- secretRef
- tier
- type
type: object
status:
properties:
message:
type: string
phase:
type: string
provider:
type: string
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
strategy:
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
58 changes: 58 additions & 0 deletions packagemanifests/0.26.0/integreatly.org_postgressnapshots.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
creationTimestamp: null
name: postgressnapshots.integreatly.org
spec:
group: integreatly.org
names:
kind: PostgresSnapshot
listKind: PostgresSnapshotList
plural: postgressnapshots
singular: postgressnapshot
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: PostgresSnapshot is the Schema for the postgressnapshots API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: PostgresSnapshotSpec defines the desired state of PostgresSnapshot
properties:
resourceName:
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file Add custom validation using kubebuilder tags: https://book-v1.book.kubebuilder.io/beyond_basics/generating_crd.html'
type: string
required:
- resourceName
type: object
status:
properties:
message:
type: string
phase:
type: string
snapshotID:
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
84 changes: 84 additions & 0 deletions packagemanifests/0.26.0/integreatly.org_redis.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
creationTimestamp: null
name: redis.integreatly.org
spec:
group: integreatly.org
names:
kind: Redis
listKind: RedisList
plural: redis
singular: redis
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Redis is the Schema for the redis API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
applyImmediately:
type: boolean
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
skipCreate:
type: boolean
tier:
type: string
type:
type: string
required:
- secretRef
- tier
- type
type: object
status:
properties:
message:
type: string
phase:
type: string
provider:
type: string
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
strategy:
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading

0 comments on commit 58a8b12

Please sign in to comment.