Skip to content

Commit

Permalink
Merge pull request #622 from KevFan/MGDAPI-5078
Browse files Browse the repository at this point in the history
MGDAPI-5078 - release: 0.43.0
  • Loading branch information
openshift-merge-robot authored Jan 19, 2023
2 parents 0294038 + eb4e5f5 commit caafba3
Show file tree
Hide file tree
Showing 17 changed files with 919 additions and 13 deletions.
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ IMAGE_REG ?= quay.io
IMAGE_ORG ?= integreatly
IMAGE_NAME ?= cloud-resource-operator
OPERATOR_IMG = $(IMAGE_REG)/$(IMAGE_ORG)/$(IMAGE_NAME):v$(VERSION)
CONTAINER_PLATFORM ?= linux/amd64
MANIFEST_NAME ?= cloud-resources
NAMESPACE=cloud-resource-operator
PREV_VERSION=0.41.0
VERSION=0.42.0
PREV_VERSION=0.42.0
VERSION=0.43.0
COMPILE_TARGET=./tmp/_output/bin/$(IMAGE_NAME)
UPGRADE ?= true
CHANNEL ?= rhmi
Expand Down Expand Up @@ -141,7 +142,7 @@ test/unit:
.PHONY: image/build
image/build: build
echo "build image ${OPERATOR_IMG}"
docker build -t ${OPERATOR_IMG} .
docker build --platform=$(CONTAINER_PLATFORM) -t ${OPERATOR_IMG} .

.PHONY: image/push
image/push: image/build
Expand Down Expand Up @@ -238,7 +239,7 @@ release/prepare: gen/csv image/push create/olm/bundle
.PHONY: image/build/pipelines
image/build/pipelines: build
echo "build image ${OPERATOR_IMG}"
sudo podman build --ulimit nofile=65535:65535 . -t ${OPERATOR_IMG}
sudo podman build --platform=$(CONTAINER_PLATFORM) --ulimit nofile=65535:65535 . -t ${OPERATOR_IMG}
sudo podman save ${OPERATOR_IMG} | sudo -u jenkins podman load

.PHONY: image/push/pipelines
Expand Down
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.

98 changes: 98 additions & 0 deletions bundles/0.43.0/manifests/integreatly.org_blobstorages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
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:
description: ApplyImmediately is only available to Postgres cr, for
blobstorage and redis cr's currently does nothing
type: boolean
maintenanceWindow:
type: boolean
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
size:
description: Size allows defining the node size. It is only available
to Redis CR. Blobstorage and Postgres CR's currently does nothing
type: string
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
version:
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: null
storedVersions: null
98 changes: 98 additions & 0 deletions bundles/0.43.0/manifests/integreatly.org_postgres.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
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:
description: ApplyImmediately is only available to Postgres cr, for
blobstorage and redis cr's currently does nothing
type: boolean
maintenanceWindow:
type: boolean
secretRef:
properties:
name:
type: string
namespace:
type: string
required:
- name
type: object
size:
description: Size allows defining the node size. It is only available
to Redis CR. Blobstorage and Postgres CR's currently does nothing
type: string
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
version:
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: null
storedVersions: null
65 changes: 65 additions & 0 deletions bundles/0.43.0/manifests/integreatly.org_postgressnapshots.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
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: null
storedVersions: null
Loading

0 comments on commit caafba3

Please sign in to comment.