diff --git a/charts/flagger/README.md b/charts/flagger/README.md index 631ed472..be25d3d1 100644 --- a/charts/flagger/README.md +++ b/charts/flagger/README.md @@ -90,7 +90,7 @@ The [configuration](#configuration) section lists the parameters that can be con To uninstall/delete the `flagger` deployment: ```console -$ helm delete --purge flagger +$ helm delete flagger ``` The command removes all the Kubernetes components associated with the chart and deletes the release. @@ -105,8 +105,9 @@ Parameter | Description | Default `image.tag` | Image tag | `` `image.pullPolicy` | Image pull policy | `IfNotPresent` `logLevel` | Log level | `info` -`prometheus.install` | If `true`, installs Prometheus configured to scrape all pods in the custer including the App Mesh sidecar | `false` `metricsServer` | Prometheus URL, used when `prometheus.install` is `false` | `http://prometheus.istio-system:9090` +`prometheus.install` | If `true`, installs Prometheus configured to scrape all pods in the custer | `false` +`prometheus.retention` | Prometheus data retention | `2h` `selectorLabels` | List of labels that Flagger uses to create pod selectors | `app,name,app.kubernetes.io/name` `configTracking.enabled` | If `true`, flagger will track changes in Secrets and ConfigMaps referenced in the target deployment | `true` `eventWebhook` | If set, Flagger will publish events to the given webhook | None diff --git a/charts/flagger/templates/prometheus.yaml b/charts/flagger/templates/prometheus.yaml index 467797c3..287d7f40 100644 --- a/charts/flagger/templates/prometheus.yaml +++ b/charts/flagger/templates/prometheus.yaml @@ -233,7 +233,7 @@ spec: image: {{ .Values.prometheus.image }} imagePullPolicy: IfNotPresent args: - - '--storage.tsdb.retention=2h' + - '--storage.tsdb.retention={{ .Values.prometheus.retention }}' - '--config.file=/etc/prometheus/prometheus.yml' ports: - containerPort: 9090 diff --git a/charts/flagger/values.yaml b/charts/flagger/values.yaml index 15d94bfc..d7ce7978 100644 --- a/charts/flagger/values.yaml +++ b/charts/flagger/values.yaml @@ -121,7 +121,8 @@ tolerations: [] prometheus: # to be used with ingress controllers install: false - image: docker.io/prom/prometheus:v2.18.1 + image: docker.io/prom/prometheus:v2.19.0 + retention: 2h # Istio multi-cluster service mesh (shared control plane single-network) # https://istio.io/docs/setup/install/multicluster/shared-vpn/ diff --git a/kustomize/base/prometheus/deployment.yaml b/kustomize/base/prometheus/deployment.yaml index 407840f1..2cdbff5b 100644 --- a/kustomize/base/prometheus/deployment.yaml +++ b/kustomize/base/prometheus/deployment.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: flagger-prometheus containers: - name: prometheus - image: prom/prometheus:v2.18.1 + image: prom/prometheus:v2.19.0 imagePullPolicy: IfNotPresent args: - '--storage.tsdb.retention=2h'