Remove all crunchy-postgres-exporter stuff. Try fixing github action test failure.

Author: dsessler7

.github/workflows/test.yaml

@@ -34,7 +34,7 @@ jobs:
       - uses: actions/setup-go@v3
         with: { go-version: 1.x }
       - run: go mod download
-      - run: ENVTEST_K8S_VERSION="${KUBERNETES#default}" make check-envtest
+      - run: ENVTEST_K8S_VERSION="${KUBERNETES#default}" QUERIES_CONFIG_DIR="${QUERIES_CONFIG_DIR}" make check-envtest
         env:
           KUBERNETES: "${{ matrix.kubernetes }}"
           GO_TEST: go test --coverprofile 'envtest.coverage' --coverpkg ./internal/...
@@ -69,7 +69,7 @@ jobs:
             registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.19-3
             registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.8-3
 
-      - run: make createnamespaces check-envtest-existing
+      - run: QUERIES_CONFIG_DIR="${QUERIES_CONFIG_DIR}" make createnamespaces check-envtest-existing
         env:
           PGO_TEST_TIMEOUT_SCALE: 1.2
           GO_TEST: go test --coverprofile 'envtest-existing.coverage' --coverpkg ./internal/...

Makefile

@@ -5,22 +5,8 @@ PGO_IMAGE_DESCRIPTION ?= $(PGO_IMAGE_SUMMARY)
 PGO_IMAGE_URL ?= https://www.crunchydata.com/products/crunchy-postgresql-for-kubernetes
 PGO_IMAGE_PREFIX ?= localhost
 
-CRUNCHY_POSTGRES_EXPORTER_IMAGE_NAME ?= crunchy-postgres-exporter
-CRUNCHY_POSTGRES_EXPORTER_MAINTAINER ?= $(PGO_IMAGE_MAINTAINER)
-CRUNCHY_POSTGRES_EXPORTER_SUMMARY ?= Metrics exporter for PostgreSQL
-CRUNCHY_POSTGRES_EXPORTER_DESCRIPTION ?= \
-	When run with the crunchy-postgres family of containers, crunchy-postgres-exporter reads the PostgreSQL data directory \
-	and has a SQL interface to a database to allow for metrics collection.
-CRUNCHY_POSTGRES_EXPORTER_URL ?= https://www.crunchydata.com/products/crunchy-postgresql-for-kubernetes
-CRUNCHY_POSTGRES_EXPORTER_IMAGE_PREFIX ?= $(PGO_IMAGE_PREFIX)
-CRUNCHY_POSTGRES_EXPORTER_PG_VERSION ?= 15
-CRUNCHY_POSTGRES_EXPORTER_PG_FULL_VERSION ?= 15.3
-
 PGMONITOR_DIR ?= hack/tools/pgmonitor
 PGMONITOR_VERSION ?= v4.8.1
-POSTGRES_EXPORTER_VERSION ?= 0.12.1
-POSTGRES_EXPORTER_ARCHITECTURE ?= amd64
-POSTGRES_EXPORTER_URL ?= https://github.com/prometheus-community/postgres_exporter/releases/download/v${POSTGRES_EXPORTER_VERSION}/postgres_exporter-${POSTGRES_EXPORTER_VERSION}.linux-${POSTGRES_EXPORTER_ARCHITECTURE}.tar.gz
 QUERIES_CONFIG_DIR ?= hack/tools/queries
 
 # Buildah's "build" used to be "bud". Use the alias to be compatible for a while.
@@ -59,12 +45,10 @@ help: ## Display this help.
 .PHONY: all
 all: ## Build all images
 all: build-postgres-operator-image
-all: build-crunchy-postgres-exporter-image
 
 .PHONY: setup
 setup: ## Run Setup needed to build images
 setup: get-pgmonitor
-setup: get-postgres-exporter
 
 .PHONY: get-pgmonitor
 get-pgmonitor:
@@ -75,13 +59,6 @@ get-pgmonitor:
 	cp -r '$(PGMONITOR_DIR)/postgres_exporter/common/.' '${QUERIES_CONFIG_DIR}'
 	cp '$(PGMONITOR_DIR)/postgres_exporter/linux/queries_backrest.yml' '${QUERIES_CONFIG_DIR}'
 
-.PHONY: get-postgres-exporter
-get-postgres-exporter:
-	[ ! -e hack/tools/postgres_exporter.tar.gz ] || (rm hack/tools/postgres_exporter.tar.gz && echo "Deleting old exporter tar")
-	wget -O hack/tools/postgres_exporter.tar.gz '$(POSTGRES_EXPORTER_URL)'
-	[ ! -e hack/bin/postgres_exporter ] || (rm -r hack/bin/postgres_exporter && echo "Deleting old exporter binary")
-	tar -xzf hack/tools/postgres_exporter.tar.gz -C hack/tools/ && mv hack/tools/postgres_exporter-${POSTGRES_EXPORTER_VERSION}.linux-${POSTGRES_EXPORTER_ARCHITECTURE} hack/bin/postgres_exporter
-
 .PHONY: clean
 clean: ## Clean resources
 clean: clean-deprecated
@@ -96,7 +73,6 @@ clean: clean-deprecated
 	[ ! -d hack/tools/pgmonitor ] || rm -rf hack/tools/pgmonitor
 	[ ! -n "$$(ls hack/tools)" ] || rm -r hack/tools/*
 	[ ! -d hack/.kube ] || rm -r hack/.kube
-	[ ! -d hack/bin/postgres_exporter ] || rm -r hack/bin/postgres_exporter
 
 .PHONY: clean-deprecated
 clean-deprecated: ## Clean deprecated resources
@@ -112,8 +88,10 @@ clean-deprecated: ## Clean deprecated resources
 	@# keys used to be generated before install
 	[ ! -d conf/pgo-backrest-repo ] || rm -r conf/pgo-backrest-repo
 	[ ! -d conf/postgres-operator ] || rm -r conf/postgres-operator
-	@# crunchy-postgres-exporter used to use scripts stored in bin/crunchy-postgres-exporter
+	@# crunchy-postgres-exporter used to live in this repo
 	[ ! -d bin/crunchy-postgres-exporter ] || rm -r bin/crunchy-postgres-exporter
+	[ ! -d build/crunchy-postgres-exporter ] || rm -r build/crunchy-postgres-exporter
+
 
 ##@ Deployment
 .PHONY: createnamespaces
@@ -169,44 +147,6 @@ build-postgres-operator: ## Build the postgres-operator binary
 		-o bin/postgres-operator ./cmd/postgres-operator
 
 ##@ Build - Images
-.PHONY: build-crunchy-postgres-exporter-image
-build-crunchy-postgres-exporter-image: ## Build the crunchy-postgres-exporter image
-build-crunchy-postgres-exporter-image: CRUNCHY_POSTGRES_EXPORTER_IMAGE_REVISION := $(shell git rev-parse HEAD)
-build-crunchy-postgres-exporter-image: CRUNCHY_POSTGRES_EXPORTER_IMAGE_TIMESTAMP := $(shell date -u +%FT%TZ)
-build-crunchy-postgres-exporter-image: build/crunchy-postgres-exporter/Dockerfile
-	$(if $(shell (echo 'buildah version 1.24'; $(word 1,$(BUILDAH_BUILD)) --version) | sort -Vc 2>&1), \
-		$(warning WARNING: old buildah does not invalidate its cache for changed labels: \
-			https://github.com/containers/buildah/issues/3517))
-	$(if $(IMAGE_TAG),,	$(error missing IMAGE_TAG))
-	$(strip $(BUILDAH_BUILD)) \
-		--tag $(BUILDAH_TRANSPORT)$(CRUNCHY_POSTGRES_EXPORTER_IMAGE_PREFIX)/$(CRUNCHY_POSTGRES_EXPORTER_IMAGE_NAME):$(IMAGE_TAG) \
-		--label name='$(CRUNCHY_POSTGRES_EXPORTER_IMAGE_NAME)' \
-		--label build-date='$(CRUNCHY_POSTGRES_EXPORTER_IMAGE_TIMESTAMP)' \
-		--label description='$(CRUNCHY_POSTGRES_EXPORTER_DESCRIPTION)' \
-		--label maintainer='$(CRUNCHY_POSTGRES_EXPORTER_MAINTAINER)' \
-		--label summary='$(CRUNCHY_POSTGRES_EXPORTER_SUMMARY)' \
-		--label url='$(CRUNCHY_POSTGRES_EXPORTER_URL)' \
-		--label vcs-ref='$(CRUNCHY_POSTGRES_EXPORTER_IMAGE_REVISION)' \
-		--label vendor='$(CRUNCHY_POSTGRES_EXPORTER_MAINTAINER)' \
-		--label postgres.version.major='$(CRUNCHY_POSTGRES_EXPORTER_PG_VERSION)' \
-		--label postgres.version='$(CRUNCHY_POSTGRES_EXPORTER_PG_FULL_VERSION)' \
-		--label io.k8s.display-name='$(CRUNCHY_POSTGRES_EXPORTER_IMAGE_NAME)' \
-		--label io.k8s.description='$(CRUNCHY_POSTGRES_EXPORTER_DESCRIPTION)' \
-		--label io.openshift.tags="postgresql,postgres,monitoring,database,crunchy" \
-		--annotation org.opencontainers.image.authors='$(CRUNCHY_POSTGRES_EXPORTER_MAINTAINER)' \
-		--annotation org.opencontainers.image.vendor='$(CRUNCHY_POSTGRES_EXPORTER_MAINTAINER)' \
-		--annotation org.opencontainers.image.created='$(CRUNCHY_POSTGRES_EXPORTER_IMAGE_TIMESTAMP)' \
-		--annotation org.opencontainers.image.description='$(CRUNCHY_POSTGRES_EXPORTER_DESCRIPTION)' \
-		--annotation org.opencontainers.image.revision='$(CRUNCHY_POSTGRES_EXPORTER_IMAGE_REVISION)' \
-		--annotation org.opencontainers.image.title='$(CRUNCHY_POSTGRES_EXPORTER_SUMMARY)' \
-		--annotation org.opencontainers.image.url='$(CRUNCHY_POSTGRES_EXPORTER_URL)' \
-		$(if $(PGO_VERSION),$(strip \
-			--label release='$(PGO_VERSION)' \
-			--label version='$(PGO_VERSION)' \
-			--annotation org.opencontainers.image.version='$(PGO_VERSION)' \
-		)) \
-		--file $< --format docker --layers .
-
 .PHONY: build-postgres-operator-image
 build-postgres-operator-image: ## Build the postgres-operator image
 build-postgres-operator-image: PGO_IMAGE_REVISION := $(shell git rev-parse HEAD)
@@ -377,14 +317,3 @@ release-postgres-operator-image-labels:
 	$(if $(PGO_IMAGE_NAME),,       	$(error missing PGO_IMAGE_NAME))
 	$(if $(PGO_IMAGE_SUMMARY),,    	$(error missing PGO_IMAGE_SUMMARY))
 	$(if $(PGO_VERSION),,			$(error missing PGO_VERSION))
-
-.PHONY: release-crunchy-postgres-exporter-image release-crunchy-postgres-exporter-image-labels
-release-crunchy-postgres-exporter-image: ## Build the postgres-operator image and all its prerequisites
-release-crunchy-postgres-exporter-image: release-crunchy-postgres-exporter-image-labels
-release-crunchy-postgres-exporter-image: build-crunchy-postgres-exporter-image
-release-crunchy-postgres-exporter-image-labels:
-	$(if $(CRUNCHY_POSTGRES_EXPORTER_DESCRIPTION),,	$(error missing CRUNCHY_POSTGRES_EXPORTER_DESCRIPTION))
-	$(if $(CRUNCHY_POSTGRES_EXPORTER_MAINTAINER),, 	$(error missing CRUNCHY_POSTGRES_EXPORTER_MAINTAINER))
-	$(if $(CRUNCHY_POSTGRES_EXPORTER_IMAGE_NAME),,  $(error missing CRUNCHY_POSTGRES_EXPORTER_IMAGE_NAME))
-	$(if $(CRUNCHY_POSTGRES_EXPORTER_SUMMARY),,    	$(error missing CRUNCHY_POSTGRES_EXPORTER_SUMMARY))
-	$(if $(PGO_VERSION),,                           $(error missing PGO_VERSION))