Cherry-pick pgpool_exporter bugfix

Dockerfile

@@ -19,21 +19,24 @@ FROM --platform=linux/amd64 golang:1.17-alpine as go_utils
 RUN apk add --no-cache git make build-base python3 curl
 WORKDIR /src
 
-# sigh: https://github.com/influxdata/telegraf/pull/10097
-ADD https://134632-33258973-gh.circle-artifacts.com/0/build/dist/telegraf-1.21.0~38129d23_static_linux_amd64.tar.gz ./telegraf.tgz
-RUN tar xf telegraf.tgz
+# building from source until a release includes https://github.com/influxdata/telegraf/pull/10097
+RUN git clone https://github.com/influxdata/telegraf.git
 
 # using our fork until/unless https://github.com/subfuzion/envtpl/pull/11 lands
 RUN git clone https://github.com/odenio/envtpl
 
 # using our fork until/unless https://github.com/pgpool/pgpool2_exporter/pull/11 lands
 RUN git clone https://github.com/odenio/pgpool2_exporter.git
 
+WORKDIR /src/telegraf
+RUN git checkout 697855c98b38a81bbe7dead59355f5740875448a
+RUN make all
+
 WORKDIR /src/envtpl
 RUN go install ./cmd/envtpl/...
 
 WORKDIR /src/pgpool2_exporter
-RUN git checkout all-fixes
+RUN git checkout 0b12a3c2dfdacadccabb24a5226a8531deff63ba
 RUN go install ./pgpool2_exporter.go
 
 FROM --platform=linux/amd64 alpine:${ALPINE_VERSION}
@@ -61,7 +64,7 @@ ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin
 
 COPY --from=go_utils /go/bin/envtpl /bin/envtpl
 COPY --from=go_utils /go/bin/pgpool2_exporter /bin/pgpool2_exporter
-COPY --from=go_utils /src/telegraf-1.21.0/usr/bin/telegraf /bin/telegraf
+COPY --from=go_utils /src/telegraf/telegraf /bin/telegraf
 
 RUN mkdir /etc/templates
 COPY conf/*.conf /etc/templates/

README.md

@@ -58,7 +58,7 @@ helm repo update
 ```sh
 export RELEASE_NAME=my-pgpool-service # a name (you will need 1 installed chart for each primary DB)
 export NAMESPACE=my-k8s-namespace     # a kubernetes namespace
-export CHART_VERSION=1.0.4            # a chart version: https://github.com/odenio/pgpool-cloudsql/releases
+export CHART_VERSION=1.0.5            # a chart version: https://github.com/odenio/pgpool-cloudsql/releases
 export VALUES_FILE=./my_values.yaml   # your values file
 
 helm install \
@@ -100,7 +100,7 @@ Parameter | Description | Default
 --- | --- | ---
 `deploy.replicaCount` | Number of pod replicas to deploy | `1`
 `deploy.repository` | Docker image repository of the runtime image | `odentech/pgpool-cloudsql`
-`deploy.tag` | Docker image tag of the runtime image | `1.0.4`
+`deploy.tag` | Docker image tag of the runtime image | `1.0.5`
 `deploy.affinity` | Kubernetes [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) spec applied to the deployment pods | `{}`
 `deploy.tolerations` | Kubernetes [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) spec applied to the deployment pods | `{}`
 `deploy.podDisruptionBudget.maxUnavailable` | Maximum number of pods allowed to be unavailable during an update ([docs](https://kubernetes.io/docs/tasks/run-application/configure-pdb/)) | 1

charts/pgpool-cloudsql/Chart.yaml

@@ -15,7 +15,7 @@ apiVersion: v2
 description: the pgpool-ii connection pooling postgres proxy with automatic discovery of GCP CloudSQL backends
 name: pgpool-cloudsql
 type: application
-version: 1.0.4
+version: 1.0.5
 keywords:
 - postgresql
 - pgpool

charts/pgpool-cloudsql/values.yaml

@@ -15,7 +15,7 @@
 deploy:
   replicaCount: 1
   repository: odentech/pgpool-cloudsql
-  tag: 1.0.4
+  tag: 1.0.5
   affinity: {}
     # # pin tasks to the default node pool
     # nodeAffinity: