Merge pull request #199 from vmanley/release-v4.2.0

feat: prepare release v4.2.0
redhat-developer · Mar 23, 2023 · acfc37d · acfc37d
2 parents 8fe3a74 + 29780cf
commit acfc37d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Current Operator version
-VERSION ?= 4.1.2
+VERSION ?= 4.2.0
 # Previous Operator version
-PREV_VERSION ?= 4.1.1
+PREV_VERSION ?= 4.1.2
 # Options for 'bundle-build'
 ifneq ($(origin CHANNELS), undefined)
 BUNDLE_CHANNELS := --channels=$(CHANNELS)

diff --git a/bundle/manifests/observability-operator.clusterserviceversion.yaml b/bundle/manifests/observability-operator.clusterserviceversion.yaml
@@ -60,7 +60,7 @@ metadata:
     capabilities: Basic Install
     operators.operatorframework.io/builder: operator-sdk-v1.4.2
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
-  name: observability-operator.v4.1.2
+  name: observability-operator.v4.2.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -323,7 +323,7 @@ spec:
                 - --enable-leader-election
                 command:
                 - /manager
-                image: quay.io/rhoas/observability-operator:v4.1.2
+                image: quay.io/rhoas/observability-operator:v4.2.0
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   httpGet:
@@ -413,8 +413,8 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: observability-operator.v4.1.1
-  version: 4.1.2
+  replaces: observability-operator.v4.1.2
+  version: 4.2.0
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git a/bundle/manifests/observability.redhat.com_observabilities.yaml b/bundle/manifests/observability.redhat.com_observabilities.yaml
@@ -680,6 +680,8 @@ spec:
                     type: object
                   grafanaVersion:
                     type: string
+                  originOauthProxyImage:
+                    type: string
                   overrideSelectors:
                     type: boolean
                   podMonitorLabelSelector:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/rhoas/observability-operator
-  newTag: v4.1.2
+  newTag: v4.2.0
diff --git a/config/manifests/bases/observability-operator.clusterserviceversion.yaml b/config/manifests/bases/observability-operator.clusterserviceversion.yaml
@@ -48,5 +48,5 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: observability-operator.v4.1.1
-  version: 4.1.2
+  replaces: observability-operator.v4.1.2
+  version: 4.2.0