Merge pull request #178 from vmanley/release-v4.1.0

feat: prepare v4.1.0 release
redhat-developer · Feb 8, 2023 · a153f19 · a153f19
2 parents e212e19 + eb8e260
commit a153f19
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Current Operator version
-VERSION ?= 4.0.4
+VERSION ?= 4.1.0
 # Previous Operator version
-PREV_VERSION ?= 3.0.16
+PREV_VERSION ?= 4.0.4
 # 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.0.4
+  name: observability-operator.v4.1.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -323,25 +323,25 @@ spec:
                 - --enable-leader-election
                 command:
                 - /manager
-                image: quay.io/rhoas/observability-operator:v4.0.4
+                image: quay.io/rhoas/observability-operator:v4.1.0
                 imagePullPolicy: IfNotPresent
-                name: manager
                 livenessProbe:
                   httpGet:
                     path: /healthz
                     port: 8081
                   initialDelaySeconds: 15
                   periodSeconds: 20
+                name: manager
+                ports:
+                - containerPort: 9443
+                  name: webhook-server
+                  protocol: TCP
                 readinessProbe:
                   httpGet:
                     path: /readyz
                     port: 8081
                   initialDelaySeconds: 5
                   periodSeconds: 10
-                ports:
-                - containerPort: 9443
-                  name: webhook-server
-                  protocol: TCP
                 resources:
                   limits:
                     cpu: 100m
@@ -413,14 +413,8 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: observability-operator.v3.0.15
-    skips:
-    - observability-operator.v3.0.16
-    - observability-operator.v4.0.0
-    - observability-operator.v4.0.1
-    - observability-operator.v4.0.2
-    - observability-operator.v4.0.3
-  version: 4.0.4
+  replaces: observability-operator.v4.0.4
+  version: 4.1.0
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git a/bundle/manifests/observability.redhat.com_observabilities.yaml b/bundle/manifests/observability.redhat.com_observabilities.yaml
@@ -632,6 +632,8 @@ spec:
                         type: object
                     type: object
                     x-kubernetes-map-type: atomic
+                  grafanaInitImage:
+                    type: string
                   grafanaOperatorResourceRequirement:
                     description: ResourceRequirements describes the compute resource requirements.
                     properties:
@@ -1681,6 +1683,8 @@ spec:
                 type: integer
               migrated:
                 type: boolean
+              resourcesRoute:
+                type: string
               stage:
                 type: string
               stageStatus:

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.0.4
+  newTag: v4.1.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.v3.0.15
-  version: 4.0.4
+  replaces: observability-operator.v4.0.4
+  version: 4.1.0