[prometheus-couchdb-exporter] fix Chart.yaml - remove engine: gotpl (#…

…3319) Signed-off-by: junya koyama <[email protected]> Co-authored-by: MH <[email protected]>
prometheus-community · May 11, 2023 · 88ecb24 · 88ecb24
1 parent 62d39ce
commit 88ecb24
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 24 deletions.
diff --git a/charts/prometheus-couchdb-exporter/Chart.yaml b/charts/prometheus-couchdb-exporter/Chart.yaml
@@ -1,14 +1,13 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart to export the metrics from couchdb in Prometheus format.
 name: prometheus-couchdb-exporter
 home: https://github.com/gesellix/couchdb-prometheus-exporter
-version: 0.2.1
+version: 1.0.0
 keywords:
 - couchdb-exporter
 sources:
   - https://github.com/gesellix/couchdb-prometheus-exporter
 maintainers:
 - name: gkarthiks
   email: [email protected]
-engine: gotpl
diff --git a/charts/prometheus-couchdb-exporter/README.md b/charts/prometheus-couchdb-exporter/README.md
@@ -6,25 +6,23 @@ This chart bootstraps a [CouchDB Exporter](https://github.com/gesellix/couchdb-p
 
 ## Prerequisites
 
-- Kubernetes 1.8+ with Beta APIs enabled
+- Helm 3.7+
 
-## Get Repo Info
+Helm v2 was no longer supported from chart version 1.0.0.
+
+## Get repository Info
 
 ```console
 helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 helm repo update
 ```
 
-_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._
+_See [`helm repo`](https://helm.sh/docs/helm/helm_repo/) for command documentation._
 
 ## Install Chart
 
 ```console
-# Helm 3
-$ helm install [RELEASE_NAME] prometheus-community/prometheus-couchdb-exporter
-
-# Helm 2
-$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-couchdb-exporter
+helm install [RELEASE_NAME] prometheus-community/prometheus-couchdb-exporter
 ```
 
 _See [configuration](#configuration) below._
@@ -34,11 +32,7 @@ _See [helm install](https://helm.sh/docs/helm/helm_install/) for command documen
 ## Uninstall Chart
 
 ```console
-# Helm 3
-$ helm uninstall [RELEASE_NAME]
-
-# Helm 2
-# helm delete --purge [RELEASE_NAME]
+helm uninstall [RELEASE_NAME]
 ```
 
 This removes all the Kubernetes components associated with the chart and deletes the release.
@@ -48,20 +42,21 @@ _See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command doc
 ## Upgrading Chart
 
 ```console
-# Helm 3 or 2
-$ helm upgrade [RELEASE_NAME] [CHART] --install
+helm upgrade [RELEASE_NAME] [CHART] --install
 ```
 
 _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._
 
+### To 1.0.0
+
+Helm v2 was no longer supported from chart version 1.0.0.
+
+_See [Migrating Helm v2 to v3](https://helm.sh/docs/topics/v2_v3_migration/) guide._
+
 ## Configuration
 
 See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands:
 
 ```console
-# Helm 2
-$ helm inspect values prometheus-community/prometheus-couchdb-exporter
-
-# Helm 3
-$ helm show values prometheus-community/prometheus-couchdb-exporter
+helm show values prometheus-community/prometheus-couchdb-exporter
 ```
diff --git a/charts/prometheus-couchdb-exporter/templates/NOTES.txt b/charts/prometheus-couchdb-exporter/templates/NOTES.txt
@@ -17,3 +17,16 @@
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl port-forward $POD_NAME 8080:80
 {{- end }}
+{{- if .Values.rbac.pspEnabled }}
+#################################################################################
+######   WARNING: Pod Security Policy has been disabled by default since    #####
+######            it deprecated after k8s 1.25+.                            #####
+#################################################################################
+{{- end }}
+{{- if .Values.ingress.enabled }}
+#################################################################################
+######   WARNING: The extensions/v1beta1 API versions of Ingress is         #####
+######            no longer served as of k8s v1.22+.                        #####
+######            use networking.k8s.io/v1 API.                             #####
+#################################################################################
+{{- end }}
diff --git a/charts/prometheus-couchdb-exporter/templates/ingress.yaml b/charts/prometheus-couchdb-exporter/templates/ingress.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ingress.enabled -}}
+{{- if and .Values.ingress.enabled (.Capabilities.APIVersions.Has "extensions/v1beta1/Ingress") }}
 {{- $fullName := include "prometheus-couchdb-exporter.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
 apiVersion: extensions/v1beta1