feat: switch to 0.60.0-rhobs1 PO fork

* feat: switch to 0.60.0-rhobs1 PO fork

The commit replaces all references to prometheus-operator/prometheus-operator
in code with rhobs/obo-prometheus-operator and switches to using 0.60.0
version for PO

* chore: upgrade operator-sdk to 1.24.0
* chore: make bundle
* ci: use olm file-based catalog for running bundle
* ci: remove macos generate checks
* fix: reconciler error now include details about the resource

Previously, when reconcilation failed, the error included no details
about the resource that failed to patch or delete and which reconciler
(updater or deleter) tried to reconcile the resource. This commit fixes
it by including these information in the error.

Signed-off-by: Sunil Thaha <sthaha@redhat.com>

.github/e2e-tests-olm/action.yaml

@@ -71,16 +71,11 @@ runs:
         kubectl create -k deploy/crds/kubernetes
         kubectl wait --for=condition=Established crds --all --timeout=300s
 
-        # NOTE: workaround for https://github.com/rhobs/observability-operator/issues/170
-        # use of --index-image below is a workaround for an OLM registry bug:
-        # https://github.com/operator-framework/operator-registry/issues/984
-
         ./tmp/bin/operator-sdk run bundle \
           local-registry:30000/observability-operator-bundle:0.0.0-ci \
           --install-mode AllNamespaces \
           --namespace operators \
-          --skip-tls \
-          --index-image=quay.io/operator-framework/opm:v1.23.0
+          --skip-tls
 
         kubectl rollout status deployment observability-operator -n operators
 

.github/env

@@ -1 +1 @@
-go-version=1.17
+go-version=1.18

.github/tools

@@ -4,7 +4,7 @@ golangci-lint v1.45.2
 controller-gen v0.9.2
 kustomize v4.5.2
 oc v4.8.11
-operator-sdk v1.23.0
+operator-sdk v1.24.0
 opm v1.26.1
 promq v0.0.1
 crdoc v0.5.2

.github/workflows/pr-checks.yaml

@@ -47,12 +47,7 @@ jobs:
         run: make lint-jsonnet
 
   generate:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os:
-          - macos-latest
-          - ubuntu-latest
+    runs-on: ubuntu-latest
     name: Generate and format
     steps:
       - uses: actions/checkout@v2

Makefile

@@ -68,7 +68,7 @@ docs: $(CRDOC)
 .PHONY: generate-prom-op-crds
 generate-prom-operator-crds: $(CONTROLLER_GEN)
 	$(CONTROLLER_GEN) crd \
-		paths=github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/... \
+		paths=github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/... \
 		output:dir=. \
 		output:crd:dir=./deploy/crds/kubernetes
 

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.23.0
+OPERATOR_SDK_VERSION = v1.24.0
 
 OPM=$(TOOLS_DIR)/opm
 OPM_VERSION = v1.26.1
@@ -88,7 +88,11 @@ $(KUSTOMIZE) kustomize: $(TOOLS_DIR)
 $(OPERATOR_SDK) operator-sdk: $(TOOLS_DIR)
 	@{ \
 		set -ex ;\
-		[[ -f $(OPERATOR_SDK) ]] && exit 0 ;\
+		[[ -f $(OPERATOR_SDK) ]] && \
+		[[ "$(shell $(OPERATOR_SDK) version | awk '{print $$3}' | tr -d ,)" == $(OPERATOR_SDK_VERSION) ]] && { \
+			echo "operator-sdk up to date" ;\
+			exit 0 ;\
+		} ;\
 		OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
 		curl -sSLo $(OPERATOR_SDK) https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$${OS}_$${ARCH} ;\
 		chmod +x $(OPERATOR_SDK) ;\

build/Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.17 as builder
+FROM golang:1.18 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests