Merge pull request #282 from austincunningham/release-v0.35.2

MGDAPI-3315 release v0.35.2 plus rbac changes

Makefile

@@ -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.35.0
-VERSION=0.35.1
+PREV_VERSION=0.35.1
+VERSION=0.35.2
 COMPILE_TARGET=./tmp/_output/bin/$(IMAGE_NAME)
 UPGRADE ?= true
 CHANNEL ?= rhmi
 
-PREVIOUS_OPERATOR_VERSIONS="0.35.0,0.34.0,0.33.0,0.32.1,0.32.0,0.31.0,0.30.0,0.29.0,0.28.0,0.27.1,0.27.0,0.26.0,0.25.0,0.24.1,0.24.0,0.23.0"
+PREVIOUS_OPERATOR_VERSIONS="0.35.1,0.35.0,0.34.0,0.33.0,0.32.1,0.32.0,0.31.0,0.30.0,0.29.0,0.28.0,0.27.1,0.27.0,0.26.0,0.25.0,0.24.1,0.24.0,0.23.0"
 
 SHELL=/bin/bash
 

config/manifests/bases/cloud-resource-operator.clusterserviceversion.yaml

@@ -4,10 +4,10 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
-    containerImage: quay.io/integreatly/cloud-resource-operator:v0.35.1
+    containerImage: quay.io/integreatly/cloud-resource-operator:v0.35.2
     operators.operatorframework.io/builder: operator-sdk-v1.2.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
-  name: cloud-resource-operator.v0.35.1
+  name: cloud-resource-operator.v0.35.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -62,4 +62,4 @@ spec:
   maturity: alpha
   provider:
     name: Integreatly
-  version: 0.35.1
+  version: 0.35.2

config/rbac/role.yaml

@@ -22,6 +22,16 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - integreatly.org
+  resources:
+  - postgres
+  - postgressnapshots
+  - redis
+  - redissnapshots
+  verbs:
+  - list
+  - watch
 - apiGroups:
   - monitoring.coreos.com
   resources:

controllers/postgres/postgres_controller.go

@@ -104,6 +104,7 @@ func (r *PostgresReconciler) SetupWithManager(mgr ctrl.Manager) error {
 // +kubebuilder:rbac:groups="config.openshift.io",resources=infrastructures;networks,verbs=get;list;watch
 // +kubebuilder:rbac:groups="",resources=persistentvolumes;configmaps,verbs="*"
 // +kubebuilder:rbac:groups="monitoring.coreos.com",resources=prometheusrules,verbs="*"
+// +kubebuilder:rbac:groups=integreatly.org,resources=postgres;postgressnapshots;redis;redissnapshots,verbs=list;watch
 
 // Role permissions
 

packagemanifests/0.35.2/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

packagemanifests/0.35.2/integreatly.org_blobstorages.yaml

@@ -0,0 +1,92 @@
+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:
+                description: ApplyImmediately is only available to Postgres cr, for
+                  blobstorage and redis cr's currently does nothing
+                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
+              version:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

packagemanifests/0.35.2/integreatly.org_postgres.yaml

@@ -0,0 +1,92 @@
+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:
+                description: ApplyImmediately is only available to Postgres cr, for
+                  blobstorage and redis cr's currently does nothing
+                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
+              version:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

packagemanifests/0.35.2/integreatly.org_postgressnapshots.yaml

@@ -0,0 +1,65 @@
+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: []