chore: update operator-sdk v1.31.0

Signed-off-by: Mario Fernandez <mariofer@redhat.com>
rhobs · Sep 18, 2023 · b3c9115 · b3c9115
1 parent b6b11bb
commit b3c9115
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/.github/tools b/.github/tools
@@ -4,7 +4,7 @@ golangci-lint v1.52.2
 controller-gen v0.11.3
 kustomize v4.5.2
 oc v4.8.11
-operator-sdk v1.24.0
+operator-sdk v1.31.0
 opm v1.26.1
 promq v0.0.1
 crdoc v0.5.2

diff --git a/Makefile b/Makefile
@@ -183,9 +183,11 @@ BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
 endif
 BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 
-
 .PHONY: bundle
-bundle: $(KUSTOMIZE) $(OPERATOR_SDK) generate
+bundle:  $(kustomize) $(operator_sdk) generate bundle-generate bundle-ignore-createdAt
+
+.PHONY: bundle-generate
+bundle-generate:
 	$(KUSTOMIZE) build deploy/olm | tee tmp/pre-bundle.yaml |  \
 	 	$(OPERATOR_SDK) generate bundle \
 			--overwrite \
@@ -208,6 +210,10 @@ bundle-image: bundle ## Build the bundle image.
 bundle-push: ## Build the bundle image.
 	$(CONTAINER_RUNTIME) push $(PUSH_OPTIONS) $(BUNDLE_IMG)
 
+.PHONY: bundle-ignore-createdAt
+bundle-ignore-createdAt:
+	git diff --quiet -I'^    createdAt: ' bundle && git checkout bundle || true
+
 # The image tag given to the resulting catalog image
 CATALOG_IMG_BASE ?= $(IMAGE_BASE)-catalog
 CATALOG_IMG ?= $(CATALOG_IMG_BASE):$(VERSION)

diff --git a/Makefile.tools b/Makefile.tools
@@ -14,7 +14,7 @@ KUSTOMIZE=$(TOOLS_DIR)/kustomize
 KUSTOMIZE_VERSION= v4.5.2
 
 OPERATOR_SDK = $(TOOLS_DIR)/operator-sdk
-OPERATOR_SDK_VERSION = v1.24.0
+OPERATOR_SDK_VERSION = v1.31.0
 
 OPM=$(TOOLS_DIR)/opm
 OPM_VERSION = v1.26.1

diff --git a/bundle/manifests/observability-operator.clusterserviceversion.yaml b/bundle/manifests/observability-operator.clusterserviceversion.yaml
@@ -42,9 +42,10 @@ metadata:
     categories: Monitoring
     certified: "false"
     containerImage: observability-operator:0.0.25
+    createdAt: "2023-09-18T14:38:15Z"
     description: A Go based Kubernetes operator to setup and manage highly available
       Monitoring Stack using Prometheus, Alertmanager and Thanos Querier.
-    operators.operatorframework.io/builder: operator-sdk-v1.24.0
+    operators.operatorframework.io/builder: operator-sdk-v1.31.0
     operators.operatorframework.io/internal-objects: |-
       [
         "prometheuses.monitoring.rhobs", "alertmanagers.monitoring.rhobs",

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -6,7 +6,7 @@ annotations:
   operators.operatorframework.io.bundle.package.v1: observability-operator
   operators.operatorframework.io.bundle.channels.v1: development
   operators.operatorframework.io.bundle.channel.default.v1: development
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.24.0
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: unknown
 

diff --git a/go.sum b/go.sum
@@ -627,6 +627,7 @@ github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
 github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=