Merge pull request #688 from kramaranya/MGDAPI-5859

MGDAPI-5859 - CRO 1.1.1 release
integr8ly · Jul 12, 2023 · f46c0ba · f46c0ba
2 parents 758662e + 4fa93e8
commit f46c0ba
Show file tree

Hide file tree

Showing 16 changed files with 966 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -5,8 +5,8 @@ OPERATOR_IMG = $(IMAGE_REG)/$(IMAGE_ORG)/$(IMAGE_NAME):v$(VERSION)
 CONTAINER_PLATFORM ?= linux/amd64
 MANIFEST_NAME ?= cloud-resources
 NAMESPACE=cloud-resource-operator
-PREV_VERSION=1.0.2
-VERSION=1.1.0
+PREV_VERSION=1.1.0
+VERSION=1.1.1
 COMPILE_TARGET=./tmp/_output/bin/$(IMAGE_NAME)
 UPGRADE ?= true
 CHANNEL ?= rhmi

diff --git a/....1/manifests/cloud-resource-operator-metrics_monitoring.coreos.com_v1_servicemonitor.yaml b/....1/manifests/cloud-resource-operator-metrics_monitoring.coreos.com_v1_servicemonitor.yaml
@@ -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
diff --git a/bundles/1.1.1/manifests/cloud-resource-operator.clusterserviceversion.yaml b/bundles/1.1.1/manifests/cloud-resource-operator.clusterserviceversion.yaml
diff --git a/bundles/1.1.1/manifests/integreatly.org_blobstorages.yaml b/bundles/1.1.1/manifests/integreatly.org_blobstorages.yaml
@@ -0,0 +1,108 @@
+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
+              snapshotFrequency:
+                description: SnapshotFrequency is how frequent a new snapshot is to
+                  be taken. Does not apply to BlobStorage
+                pattern: ^(0|(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?)$
+                type: string
+              snapshotRetention:
+                description: SnapshotRetention is the number of days each snapshot
+                  is to be retained. Does not apply to BlobStorage
+                pattern: ^(0|(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?)$
+                type: string
+              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
diff --git a/bundles/1.1.1/manifests/integreatly.org_postgres.yaml b/bundles/1.1.1/manifests/integreatly.org_postgres.yaml
@@ -0,0 +1,108 @@
+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
+              snapshotFrequency:
+                description: SnapshotFrequency is how frequent a new snapshot is to
+                  be taken. Does not apply to BlobStorage
+                pattern: ^(0|(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?)$
+                type: string
+              snapshotRetention:
+                description: SnapshotRetention is the number of days each snapshot
+                  is to be retained. Does not apply to BlobStorage
+                pattern: ^(0|(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?)$
+                type: string
+              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
diff --git a/bundles/1.1.1/manifests/integreatly.org_postgressnapshots.yaml b/bundles/1.1.1/manifests/integreatly.org_postgressnapshots.yaml
@@ -0,0 +1,69 @@
+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: ResourceName is the identification given to a resource
+                  by a cloud provider
+                type: string
+              skipDelete:
+                description: SkipDelete informs the reconciler to not delete the snapshot
+                  from the cloud provider
+                type: boolean
+            required:
+            - resourceName
+            type: object
+          status:
+            properties:
+              message:
+                type: string
+              phase:
+                type: string
+              snapshotID:
+                type: string
+              strategy:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: null
+  storedVersions: null