You've already forked prometheus-postgres-exporter
							
							Compare commits
	
		
			1 Commits
		
	
	
		
			0.4.1
			...
			5808a09234
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 5808a09234 | 
| @@ -5,8 +5,6 @@ on: | |||||||
|     paths: [ "README.md", "values.yaml" ] |     paths: [ "README.md", "values.yaml" ] | ||||||
|     types: [ "opened", "reopened", "synchronize" ] |     types: [ "opened", "reopened", "synchronize" ] | ||||||
|   push: |   push: | ||||||
|     branches: |  | ||||||
|     - '**' |  | ||||||
|     paths: [ "README.md", "values.yaml" ] |     paths: [ "README.md", "values.yaml" ] | ||||||
|     tags-ignore: |     tags-ignore: | ||||||
|     - '**' |     - '**' | ||||||
| @@ -15,7 +13,7 @@ on: | |||||||
| jobs: | jobs: | ||||||
|   generate-parameters: |   generate-parameters: | ||||||
|     container: |     container: | ||||||
|       image: docker.io/library/node:23.8.0-alpine |       image: docker.io/library/node:23.6.0-alpine | ||||||
|     runs-on: |     runs-on: | ||||||
|     - ubuntu-latest |     - ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|   | |||||||
| @@ -4,8 +4,6 @@ on: | |||||||
|   pull_request: |   pull_request: | ||||||
|     types: [ "opened", "reopened", "synchronize" ] |     types: [ "opened", "reopened", "synchronize" ] | ||||||
|   push: |   push: | ||||||
|     branches: |  | ||||||
|     - '**' |  | ||||||
|     tags-ignore: |     tags-ignore: | ||||||
|     - '**' |     - '**' | ||||||
|   workflow_dispatch: {} |   workflow_dispatch: {} | ||||||
| @@ -13,7 +11,7 @@ on: | |||||||
| jobs: | jobs: | ||||||
|   helm-lint: |   helm-lint: | ||||||
|     container: |     container: | ||||||
|       image: docker.io/volkerraschek/helm:3.17.1 |       image: docker.io/volkerraschek/helm:3.16.1 | ||||||
|     runs-on: |     runs-on: | ||||||
|     - ubuntu-latest |     - ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
| @@ -28,7 +26,7 @@ jobs: | |||||||
|  |  | ||||||
|   helm-unittest: |   helm-unittest: | ||||||
|     container: |     container: | ||||||
|       image: docker.io/volkerraschek/helm:3.17.1 |       image: docker.io/volkerraschek/helm:3.16.1 | ||||||
|     runs-on: |     runs-on: | ||||||
|     - ubuntu-latest |     - ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|   | |||||||
| @@ -5,8 +5,6 @@ on: | |||||||
|     paths: [ "**/*.md" ] |     paths: [ "**/*.md" ] | ||||||
|     types: [ "opened", "reopened", "synchronize" ] |     types: [ "opened", "reopened", "synchronize" ] | ||||||
|   push: |   push: | ||||||
|     branches: |  | ||||||
|     - '**' |  | ||||||
|     paths: [ "**/*.md" ] |     paths: [ "**/*.md" ] | ||||||
|     tags-ignore: |     tags-ignore: | ||||||
|     - '**' |     - '**' | ||||||
| @@ -15,7 +13,7 @@ on: | |||||||
| jobs: | jobs: | ||||||
|   markdown-link-checker: |   markdown-link-checker: | ||||||
|     container: |     container: | ||||||
|       image: docker.io/library/node:23.8.0-alpine |       image: docker.io/library/node:23.6.0-alpine | ||||||
|     runs-on: |     runs-on: | ||||||
|     - ubuntu-latest |     - ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
| @@ -31,7 +29,7 @@ jobs: | |||||||
|  |  | ||||||
|   markdown-lint: |   markdown-lint: | ||||||
|     container: |     container: | ||||||
|       image: docker.io/library/node:23.8.0-alpine |       image: docker.io/library/node:23.6.0-alpine | ||||||
|     runs-on: |     runs-on: | ||||||
|     - ubuntu-latest |     - ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ on: | |||||||
| jobs: | jobs: | ||||||
|   publish-chart: |   publish-chart: | ||||||
|     container: |     container: | ||||||
|       image: docker.io/volkerraschek/helm:3.17.1 |       image: docker.io/volkerraschek/helm:3.16.1 | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|       - name: Install tooling |       - name: Install tooling | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ description: Prometheus metric exporter for PostgreSQL | |||||||
| type: application | type: application | ||||||
| kubeVersion: ">=1.20.0" | kubeVersion: ">=1.20.0" | ||||||
| version: "0.1.0" | version: "0.1.0" | ||||||
| appVersion: "0.17.0" | appVersion: "0.16.0" | ||||||
|  |  | ||||||
| # icon: https://annotations.example.com/icon.png | # icon: https://annotations.example.com/icon.png | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										95
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										95
									
								
								README.md
									
									
									
									
									
								
							| @@ -20,7 +20,7 @@ helm chart is tested for deployment scenarios with **ArgoCD**. | |||||||
| ## Helm: configuration and installation | ## Helm: configuration and installation | ||||||
|  |  | ||||||
| 1. A helm chart repository must be configured, to pull the helm charts from. | 1. A helm chart repository must be configured, to pull the helm charts from. | ||||||
| 2. All available parameters are [here](#parameters) in detail documented. The parameters can be defined via the helm | 2. All available parameters are [here](#parameters) in detail document. The parameters can be defined via the helm | ||||||
|    `--set` flag or directly as part of a `values.yaml` file. The following example defines the `prometheus-exporter` |    `--set` flag or directly as part of a `values.yaml` file. The following example defines the `prometheus-exporter` | ||||||
|    repository and use the `--set` flag for a basic deployment. |    repository and use the `--set` flag for a basic deployment. | ||||||
|  |  | ||||||
| @@ -46,7 +46,7 @@ version of the chart must be in sync with the `values.yaml`. Newer *minor* versi | |||||||
| versions can break something! | versions can break something! | ||||||
|  |  | ||||||
| ```bash | ```bash | ||||||
| CHART_VERSION=0.4.0 | CHART_VERSION=0.1.0 | ||||||
| helm show values prometheus-exporters/prometheus-postgres-exporter --version "${CHART_VERSION}" > values.yaml | helm show values prometheus-exporters/prometheus-postgres-exporter --version "${CHART_VERSION}" > values.yaml | ||||||
| ``` | ``` | ||||||
|  |  | ||||||
| @@ -71,7 +71,7 @@ cannot use the available CPU time to perform computing operations. | |||||||
|  |  | ||||||
| The application must be informed that despite several CPUs only a part (limit) of the available computing time is | The application must be informed that despite several CPUs only a part (limit) of the available computing time is | ||||||
| available. As this is a Golang application, this can be implemented using `GOMAXPROCS`. The following example is one way | available. As this is a Golang application, this can be implemented using `GOMAXPROCS`. The following example is one way | ||||||
| of defining `GOMAXPROCS` automatically based on the defined CPU limit like `1000m`. Please keep in mind, that the CFS | of defining `GOMAXPROCS` automatically based on the defined CPU limit like `100m`. Please keep in mind, that the CFS | ||||||
| rate of `100ms` - default on each kubernetes node, is also very important to avoid CPU throttling. | rate of `100ms` - default on each kubernetes node, is also very important to avoid CPU throttling. | ||||||
|  |  | ||||||
| Further information about this topic can be found [here](https://kanishk.io/posts/cpu-throttling-in-containerized-go-apps/). | Further information about this topic can be found [here](https://kanishk.io/posts/cpu-throttling-in-containerized-go-apps/). | ||||||
| @@ -79,8 +79,6 @@ Further information about this topic can be found [here](https://kanishk.io/post | |||||||
| > [!NOTE] | > [!NOTE] | ||||||
| > The environment variable `GOMAXPROCS` is set automatically, when a CPU limit is defined. An explicit configuration is | > The environment variable `GOMAXPROCS` is set automatically, when a CPU limit is defined. An explicit configuration is | ||||||
| > not anymore required. | > not anymore required. | ||||||
| > |  | ||||||
| > Please take care the a CPU limit < `1000m` can also lead to CPU throttling. Please read the linked documentation carefully. |  | ||||||
|  |  | ||||||
| ```bash | ```bash | ||||||
| helm install prometheus-postgres-exporter prometheus-exporters/prometheus-postgres-exporter \ | helm install prometheus-postgres-exporter prometheus-exporters/prometheus-postgres-exporter \ | ||||||
| @@ -91,7 +89,7 @@ helm install prometheus-postgres-exporter prometheus-exporters/prometheus-postgr | |||||||
|   --set 'prometheus.metrics.serviceMonitor.enabled=true' \ |   --set 'prometheus.metrics.serviceMonitor.enabled=true' \ | ||||||
|   --set 'deployment.postgresExporter.env.name=GOMAXPROCS' \ |   --set 'deployment.postgresExporter.env.name=GOMAXPROCS' \ | ||||||
|   --set 'deployment.postgresExporter.env.valueFrom.resourceFieldRef.resource=limits.cpu' \ |   --set 'deployment.postgresExporter.env.valueFrom.resourceFieldRef.resource=limits.cpu' \ | ||||||
|   --set 'deployment.postgresExporter.resources.limits.cpu=1000m' |   --set 'deployment.postgresExporter.resources.limits.cpu=100m' | ||||||
| ``` | ``` | ||||||
|  |  | ||||||
| #### TLS authentication and encryption | #### TLS authentication and encryption | ||||||
| @@ -189,75 +187,6 @@ deployment: | |||||||
|             - postgres |             - postgres | ||||||
| ``` | ``` | ||||||
|  |  | ||||||
| ### Network policies |  | ||||||
|  |  | ||||||
| Network policies can only take effect, when the used CNI plugin support network policies. The chart supports no custom |  | ||||||
| network policy implementation of CNI plugins. It's support only the official API resource of `networking.k8s.io/v1`. |  | ||||||
|  |  | ||||||
| The object networkPolicies can contains multiple networkPolicy definitions. There is currently only one example |  | ||||||
| predefined - it's named `default`. Further networkPolicy rules can easy be added by defining additional objects. For example: |  | ||||||
|  |  | ||||||
| > [!NOTE] |  | ||||||
| > The structure of each custom network policy must be equal like that of default. For this reason don't forget to define |  | ||||||
| > `annotations`, `labels` and the other properties as well. |  | ||||||
|  |  | ||||||
| ```yaml |  | ||||||
| networkPolicies: |  | ||||||
|   enabled: false |  | ||||||
|   default: {} |  | ||||||
|   my-custom-network-policy: {} |  | ||||||
| ``` |  | ||||||
|  |  | ||||||
| The example below is an excerpt of the `values.yaml` file. The network policy `default` contains ingress rules to allow |  | ||||||
| incoming traffic from Prometheus. Additionally two egress rules are defined, to allow the application outgoing access to |  | ||||||
| the internal running DNS server `core-dns` and the external running postgres database listen on `10.14.243.12`. |  | ||||||
|  |  | ||||||
| > [!IMPORTANT] |  | ||||||
| > Please keep in mind, that the namespace and pod selector labels can be different from environment to environment. For |  | ||||||
| > this reason, there is are not default network policy rules defined. |  | ||||||
|  |  | ||||||
| ```yaml |  | ||||||
| networkPolicies: |  | ||||||
|   enabled: true |  | ||||||
|   default: |  | ||||||
|     enabled: true |  | ||||||
|     annotations: {} |  | ||||||
|     labels: {} |  | ||||||
|     policyTypes: |  | ||||||
|     - Egress |  | ||||||
|     - Ingress |  | ||||||
|     egress: |  | ||||||
|     - to: |  | ||||||
|       - ipBlock: |  | ||||||
|           cidr: 10.14.243.12/32 |  | ||||||
|       ports: |  | ||||||
|       - port: 5432 |  | ||||||
|         protocol: TCP |  | ||||||
|     - to: |  | ||||||
|       - namespaceSelector: |  | ||||||
|           matchLabels: |  | ||||||
|             kubernetes.io/metadata.name: kube-system |  | ||||||
|         podSelector: |  | ||||||
|           matchLabels: |  | ||||||
|            k8s-app: kube-dns |  | ||||||
|       ports: |  | ||||||
|       - port: 53 |  | ||||||
|         protocol: TCP |  | ||||||
|       - port: 53 |  | ||||||
|         protocol: UDP |  | ||||||
|     ingress: |  | ||||||
|     - from: |  | ||||||
|       - namespaceSelector: |  | ||||||
|           matchLabels: |  | ||||||
|             kubernetes.io/metadata.name: monitoring |  | ||||||
|         podSelector: |  | ||||||
|           matchLabels: |  | ||||||
|             app.kubernetes.io/name: prometheus |  | ||||||
|       ports: |  | ||||||
|       - port: http |  | ||||||
|         protocol: TCP |  | ||||||
| ``` |  | ||||||
|  |  | ||||||
| ## Parameters | ## Parameters | ||||||
|  |  | ||||||
| ### Global | ### Global | ||||||
| @@ -319,7 +248,7 @@ networkPolicies: | |||||||
| | `deployment.replicas`                              | Number of replicas for the postgres-exporter deployment.                                                   | `1`                                     | | | `deployment.replicas`                              | Number of replicas for the postgres-exporter deployment.                                                   | `1`                                     | | ||||||
| | `deployment.restartPolicy`                         | Restart policy of the postgres-exporter deployment.                                                        | `""`                                    | | | `deployment.restartPolicy`                         | Restart policy of the postgres-exporter deployment.                                                        | `""`                                    | | ||||||
| | `deployment.securityContext`                       | Security context of the postgres-exporter deployment.                                                      | `{}`                                    | | | `deployment.securityContext`                       | Security context of the postgres-exporter deployment.                                                      | `{}`                                    | | ||||||
| | `deployment.strategy.type`                         | Strategy type - `Recreate` or `RollingUpdate`.                                                             | `RollingUpdate`                         | | | `deployment.strategy.type`                         | Strategy type - `Recreate` or `Rollingupdate`.                                                             | `Recreate`                              | | ||||||
| | `deployment.strategy.rollingUpdate.maxSurge`       | The maximum number of pods that can be scheduled above the desired number of pods during a rolling update. | `1`                                     | | | `deployment.strategy.rollingUpdate.maxSurge`       | The maximum number of pods that can be scheduled above the desired number of pods during a rolling update. | `1`                                     | | ||||||
| | `deployment.strategy.rollingUpdate.maxUnavailable` | The maximum number of pods that can be unavailable during a rolling update.                                | `1`                                     | | | `deployment.strategy.rollingUpdate.maxUnavailable` | The maximum number of pods that can be unavailable during a rolling update.                                | `1`                                     | | ||||||
| | `deployment.terminationGracePeriodSeconds`         | How long to wait until forcefully kill the pod.                                                            | `60`                                    | | | `deployment.terminationGracePeriodSeconds`         | How long to wait until forcefully kill the pod.                                                            | `60`                                    | | ||||||
| @@ -354,17 +283,11 @@ networkPolicies: | |||||||
| | --------------------- | ---------------------- | ----- | | | --------------------- | ---------------------- | ----- | | ||||||
| | `podDisruptionBudget` | Pod disruption budget. | `{}`  | | | `podDisruptionBudget` | Pod disruption budget. | `{}`  | | ||||||
|  |  | ||||||
| ### NetworkPolicies | ### Network | ||||||
|  |  | ||||||
| | Name                                  | Description                                                                                           | Value   | | | Name              | Description                                                                                                        | Value | | ||||||
| | ------------------------------------- | ----------------------------------------------------------------------------------------------------- | ------- | | | ----------------- | ------------------------------------------------------------------------------------------------------------------ | ----- | | ||||||
| | `networkPolicies.enabled`             | Enable network policies in general.                                                                   | `false` | | | `networkPolicies` | Deploy network policies based on the used container network interface (CNI) implementation - like calico or weave. | `{}`  | | ||||||
| | `networkPolicies.default.enabled`     | Enable the network policy for accessing the application by default. For example to scape the metrics. | `false` | |  | ||||||
| | `networkPolicies.default.annotations` | Additional network policy annotations.                                                                | `{}`    | |  | ||||||
| | `networkPolicies.default.labels`      | Additional network policy labels.                                                                     | `{}`    | |  | ||||||
| | `networkPolicies.default.policyTypes` | List of policy types. Supported is ingress, egress or ingress and egress.                             | `[]`    | |  | ||||||
| | `networkPolicies.default.egress`      | Concrete egress network policy implementation.                                                        | `[]`    | |  | ||||||
| | `networkPolicies.default.ingress`     | Concrete ingress network policy implementation.                                                       | `[]`    | |  | ||||||
|  |  | ||||||
| ### Prometheus | ### Prometheus | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										1194
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1194
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -16,6 +16,6 @@ | |||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "@bitnami/readme-generator-for-helm": "^2.5.0", |     "@bitnami/readme-generator-for-helm": "^2.5.0", | ||||||
|     "markdown-link-check": "^3.13.6", |     "markdown-link-check": "^3.13.6", | ||||||
|     "markdownlint-cli": "^0.44.0" |     "markdownlint-cli": "^0.43.0" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,10 +1,9 @@ | |||||||
| { | { | ||||||
|   "$schema": "https://docs.renovatebot.com/renovate-schema.json", |   "$schema": "https://docs.renovatebot.com/renovate-schema.json", | ||||||
|   "assignees": [ |   "assignees": [ "volker.raschek" ], | ||||||
|     "volker.raschek" |  | ||||||
|   ], |  | ||||||
|   "customManagers": [ |   "customManagers": [ | ||||||
|     { |     { | ||||||
|  |       "description": "Update container image reference", | ||||||
|       "fileMatch": [ |       "fileMatch": [ | ||||||
|         "^Chart\\.yaml$" |         "^Chart\\.yaml$" | ||||||
|       ], |       ], | ||||||
| @@ -17,55 +16,28 @@ | |||||||
|       "versioningTemplate": "semver" |       "versioningTemplate": "semver" | ||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
|  |       "description": "Detect helm chart version in README", | ||||||
|       "fileMatch": ["^README\\.md$"], |       "fileMatch": ["^README\\.md$"], | ||||||
|       "matchStrings": [ |       "matchStrings": [ | ||||||
|         "VERSION=(?<currentValue>.*)" |         "^CHART_VERSION=(?<currentValue>.*)$" | ||||||
|       ], |       ], | ||||||
|  |       "datasourceTemplate": "git-tags", | ||||||
|       "depNameTemplate": "volker.raschek/prometheus-postgres-exporter", |       "depNameTemplate": "volker.raschek/prometheus-postgres-exporter", | ||||||
|       "packageNameTemplate": "https://git.cryptic.systems/volker.raschek/prometheus-postgres-exporter", |       "packageNameTemplate": "https://git.cryptic.systems/volker.raschek/prometheus-postgres-exporter", | ||||||
|       "datasourceTemplate": "git-tags", |  | ||||||
|       "versioningTemplate": "semver" |       "versioningTemplate": "semver" | ||||||
|     } |     } | ||||||
|   ], |   ], | ||||||
|   "labels": [ |   "labels": [ "renovate" ], | ||||||
|     "renovate" |  | ||||||
|   ], |  | ||||||
|   "lockFileMaintenance": { |  | ||||||
|     "addLabels": [ |  | ||||||
|       "renovate/automerge", |  | ||||||
|       "renovate/lockFileMaintenance" |  | ||||||
|     ], |  | ||||||
|     "automerge": true, |  | ||||||
|     "enabled": true |  | ||||||
|   }, |  | ||||||
|   "npm": { |  | ||||||
|     "enabled": true |  | ||||||
|   }, |  | ||||||
|   "packageRules": [ |   "packageRules": [ | ||||||
|     { |     { | ||||||
|       "addLabels": [ |       "addLabels": [ "renovate/automerge", "renovate/npm" ], | ||||||
|         "renovate/automerge", |  | ||||||
|         "renovate/npm" |  | ||||||
|       ], |  | ||||||
|       "automerge": true, |       "automerge": true, | ||||||
|       "matchPackageNames": [ |       "matchPackageNames": [ "markdownlint-cli", "@bitnami/readme-generator-for-helm" ], | ||||||
|         "@bitnami/readme-generator-for-helm", |       "matchManagers": [ "npm" ], | ||||||
|         "markdownlint-cli", |       "matchUpdateTypes": [ "minor", "patch"] | ||||||
|         "markdown-link-check" |  | ||||||
|       ], |  | ||||||
|       "matchManagers": [ |  | ||||||
|         "npm" |  | ||||||
|       ], |  | ||||||
|       "matchUpdateTypes": [ |  | ||||||
|         "minor", |  | ||||||
|         "patch" |  | ||||||
|       ] |  | ||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
|       "addLabels": [ |       "addLabels": [ "renovate/automerge", "renovate/container" ], | ||||||
|         "renovate/automerge", |  | ||||||
|         "renovate/container" |  | ||||||
|       ], |  | ||||||
|       "automerge": true, |       "automerge": true, | ||||||
|       "excludePackagePatterns": [ |       "excludePackagePatterns": [ | ||||||
|         "prometheuscommunity/postgres-exporter" |         "prometheuscommunity/postgres-exporter" | ||||||
| @@ -79,10 +51,7 @@ | |||||||
|       ] |       ] | ||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
|       "addLabels": [ |       "addLabels": [ "renovate/automerge", "renovate/documentation" ], | ||||||
|         "renovate/automerge", |  | ||||||
|         "renovate/documentation" |  | ||||||
|       ], |  | ||||||
|       "automerge": true, |       "automerge": true, | ||||||
|       "matchDepNames": [ |       "matchDepNames": [ | ||||||
|         "volker.raschek/prometheus-postgres-exporter" |         "volker.raschek/prometheus-postgres-exporter" | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ | |||||||
| {{- define "prometheus-postgres-exporter.deployment.env" -}} | {{- define "prometheus-postgres-exporter.deployment.env" -}} | ||||||
| {{- $env := dict "env" (.Values.deployment.postgresExporter.env | default (list) ) }} | {{- $env := dict "env" (.Values.deployment.postgresExporter.env | default (list) ) }} | ||||||
| {{- if and (hasKey .Values.deployment.postgresExporter.resources "limits") (hasKey .Values.deployment.postgresExporter.resources.limits "cpu") }} | {{- if and (hasKey .Values.deployment.postgresExporter.resources "limits") (hasKey .Values.deployment.postgresExporter.resources.limits "cpu") }} | ||||||
| {{- $env = merge $env (dict "env" (list (dict "name" "GOMAXPROCS" "valueFrom" (dict "resourceFieldRef" (dict "divisor" "1" "resource" "limits.cpu"))))) }} | {{- $env = merge $env (dict "env" (list (dict "name" "GOMAXPROCS" "valueFrom" (dict "resourceFieldRef" (dict "resource" "limits.cpu"))))) }} | ||||||
| {{- end }} | {{- end }} | ||||||
| {{ toYaml $env }} | {{ toYaml $env }} | ||||||
| {{- end -}} | {{- end -}} | ||||||
|   | |||||||
| @@ -1,19 +0,0 @@ | |||||||
| {{/* vim: set filetype=mustache: */}} |  | ||||||
|  |  | ||||||
| {{/* annotations */}} |  | ||||||
|  |  | ||||||
| {{- define "prometheus-postgres-exporter.networkPolicies.annotations" -}} |  | ||||||
| {{ include "prometheus-postgres-exporter.annotations" .context }} |  | ||||||
| {{- if .networkPolicy.annotations }} |  | ||||||
| {{ toYaml .networkPolicy.annotations }} |  | ||||||
| {{- end }} |  | ||||||
| {{- end }} |  | ||||||
|  |  | ||||||
| {{/* labels */}} |  | ||||||
|  |  | ||||||
| {{- define "prometheus-postgres-exporter.networkPolicies.labels" -}} |  | ||||||
| {{ include "prometheus-postgres-exporter.labels" .context }} |  | ||||||
| {{- if .networkPolicy.labels }} |  | ||||||
| {{ toYaml .networkPolicy.labels }} |  | ||||||
| {{- end }} |  | ||||||
| {{- end }} |  | ||||||
| @@ -126,7 +126,3 @@ spec: | |||||||
|       volumes: |       volumes: | ||||||
|       {{- toYaml $volumes.volumes | nindent 6 }} |       {{- toYaml $volumes.volumes | nindent 6 }} | ||||||
|       {{- end }} |       {{- end }} | ||||||
|   {{- with .Values.deployment.strategy }} |  | ||||||
|   strategy: |  | ||||||
|     {{- toYaml . | nindent 4 }} |  | ||||||
|   {{- end }} |  | ||||||
| @@ -1,36 +0,0 @@ | |||||||
| {{- if .Values.networkPolicies.enabled }} |  | ||||||
| {{- range $key, $value := .Values.networkPolicies -}} |  | ||||||
| {{- if and (not (eq $key "enabled")) $value.enabled }} |  | ||||||
| --- |  | ||||||
| apiVersion: networking.k8s.io/v1 |  | ||||||
| kind: NetworkPolicy |  | ||||||
| metadata: |  | ||||||
|   {{- with (include "prometheus-postgres-exporter.networkPolicies.annotations" (dict "networkPolicy" $value "context" $) | fromYaml) }} |  | ||||||
|   annotations: |  | ||||||
|     {{- toYaml . | nindent 4 }} |  | ||||||
|   {{- end }} |  | ||||||
|   {{- with (include "prometheus-postgres-exporter.networkPolicies.labels" (dict "networkPolicy" $value "context" $) | fromYaml) }} |  | ||||||
|   labels: |  | ||||||
|     {{- toYaml . | nindent 4 }} |  | ||||||
|   {{- end }} |  | ||||||
|   name: {{ printf "%s-%s" (include "prometheus-postgres-exporter.fullname" $ ) $key }} |  | ||||||
|   namespace: {{ $.Release.Namespace }} |  | ||||||
| spec: |  | ||||||
|   podSelector: |  | ||||||
|     matchLabels: |  | ||||||
|       {{- include "prometheus-postgres-exporter.pod.selectorLabels" $ | nindent 6 }} |  | ||||||
|   {{- with $value.policyTypes }} |  | ||||||
|   policyTypes: |  | ||||||
|   {{- toYaml . | nindent 2 }} |  | ||||||
|   {{- end }} |  | ||||||
|   {{- with $value.egress }} |  | ||||||
|   egress: |  | ||||||
|   {{- toYaml . | nindent 2 }} |  | ||||||
|   {{- end }} |  | ||||||
|   {{- with $value.ingress }} |  | ||||||
|   ingress: |  | ||||||
|   {{- toYaml . | nindent 2 }} |  | ||||||
|   {{- end }} |  | ||||||
| {{- end }} |  | ||||||
| {{- end }} |  | ||||||
| {{- end }} |  | ||||||
| @@ -95,13 +95,6 @@ tests: | |||||||
|       path: spec.template.spec.tolerations |       path: spec.template.spec.tolerations | ||||||
|   - notExists: |   - notExists: | ||||||
|       path: spec.template.spec.topologySpreadConstraints |       path: spec.template.spec.topologySpreadConstraints | ||||||
|   - equal: |  | ||||||
|       path: spec.strategy |  | ||||||
|       value: |  | ||||||
|         type: "RollingUpdate" |  | ||||||
|         rollingUpdate: |  | ||||||
|           maxSurge: 1 |  | ||||||
|           maxUnavailable: 1 |  | ||||||
|  |  | ||||||
| - it: Test custom replicas | - it: Test custom replicas | ||||||
|   set: |   set: | ||||||
| @@ -240,7 +233,6 @@ tests: | |||||||
|       - name: GOMAXPROCS |       - name: GOMAXPROCS | ||||||
|         valueFrom: |         valueFrom: | ||||||
|           resourceFieldRef: |           resourceFieldRef: | ||||||
|             divisor: "1" |  | ||||||
|             resource: limits.cpu |             resource: limits.cpu | ||||||
|   - equal: |   - equal: | ||||||
|       path: spec.template.spec.containers[0].resources |       path: spec.template.spec.containers[0].resources | ||||||
|   | |||||||
| @@ -1,118 +0,0 @@ | |||||||
| chart: |  | ||||||
|   appVersion: 0.1.0 |  | ||||||
|   version: 0.1.0 |  | ||||||
| suite: NetworkPolicies template (basic) |  | ||||||
| release: |  | ||||||
|   name: prometheus-postgres-exporter-unittest |  | ||||||
|   namespace: testing |  | ||||||
| templates: |  | ||||||
| - templates/prometheus-postgres-exporter/networkPolicies.yaml |  | ||||||
| tests: |  | ||||||
| - it: Skip networkPolicies in general disabled. |  | ||||||
|   set: |  | ||||||
|     networkPolicies.enabled: false |  | ||||||
|   asserts: |  | ||||||
|   - hasDocuments: |  | ||||||
|       count: 0 |  | ||||||
|  |  | ||||||
| - it: Skip networkPolicy 'default' when disabled. |  | ||||||
|   set: |  | ||||||
|     networkPolicies.enabled: true |  | ||||||
|     networkPolicies.default.enabled: false |  | ||||||
|   asserts: |  | ||||||
|   - hasDocuments: |  | ||||||
|       count: 0 |  | ||||||
|  |  | ||||||
| - it: Loop over networkPolicies |  | ||||||
|   set: |  | ||||||
|     networkPolicies.enabled: true |  | ||||||
|     networkPolicies.default.enabled: false |  | ||||||
|     networkPolicies.nginx.enabled: true |  | ||||||
|     networkPolicies.prometheus.enabled: true |  | ||||||
|   asserts: |  | ||||||
|   - hasDocuments: |  | ||||||
|       count: 2 |  | ||||||
|  |  | ||||||
| - it: Template networkPolicy 'default' without policyTypes, egress and ingress configuration |  | ||||||
|   set: |  | ||||||
|     networkPolicies.enabled: true |  | ||||||
|     networkPolicies.default.enabled: true |  | ||||||
|   asserts: |  | ||||||
|   - hasDocuments: |  | ||||||
|       count: 1 |  | ||||||
|   - containsDocument: |  | ||||||
|       apiVersion: networking.k8s.io/v1 |  | ||||||
|       kind: NetworkPolicy |  | ||||||
|       name: prometheus-postgres-exporter-unittest-default |  | ||||||
|       namespace: testing |  | ||||||
|   - notExists: |  | ||||||
|       path: metadata.annotations |  | ||||||
|   - equal: |  | ||||||
|       path: metadata.labels |  | ||||||
|       value: |  | ||||||
|         app.kubernetes.io/instance: prometheus-postgres-exporter-unittest |  | ||||||
|         app.kubernetes.io/managed-by: Helm |  | ||||||
|         app.kubernetes.io/name: prometheus-postgres-exporter |  | ||||||
|         app.kubernetes.io/version: 0.1.0 |  | ||||||
|         helm.sh/chart: prometheus-postgres-exporter-0.1.0 |  | ||||||
|   - equal: |  | ||||||
|       path: spec.podSelector.matchLabels |  | ||||||
|       value: |  | ||||||
|         app.kubernetes.io/instance: prometheus-postgres-exporter-unittest |  | ||||||
|         app.kubernetes.io/name: prometheus-postgres-exporter |  | ||||||
|   - notExists: |  | ||||||
|       path: spec.policyTypes |  | ||||||
|   - notExists: |  | ||||||
|       path: spec.egress |  | ||||||
|   - notExists: |  | ||||||
|       path: spec.ingress |  | ||||||
|  |  | ||||||
| - it: Template networkPolicy 'default' with policyTypes, egress and ingress configuration |  | ||||||
|   set: |  | ||||||
|     networkPolicies.enabled: true |  | ||||||
|     networkPolicies.default.enabled: true |  | ||||||
|     networkPolicies.default.policyTypes: |  | ||||||
|     - Egress |  | ||||||
|     - Ingress |  | ||||||
|     networkPolicies.default.ingress: |  | ||||||
|     - from: |  | ||||||
|       - namespaceSelector: |  | ||||||
|           matchLabels: |  | ||||||
|             kubernetes.io/metadata.name: khv-production |  | ||||||
|         podSelector: |  | ||||||
|           matchLabels: |  | ||||||
|             app.kubernetes.io/name: prometheus |  | ||||||
|     networkPolicies.default.egress: |  | ||||||
|     - to: |  | ||||||
|       - namespaceSelector: |  | ||||||
|           matchLabels: |  | ||||||
|             kubernetes.io/metadata.name: database |  | ||||||
|         podSelector: |  | ||||||
|           matchLabels: |  | ||||||
|             app.kubernetes.io/name: oracle |  | ||||||
|   asserts: |  | ||||||
|   - equal: |  | ||||||
|       path: spec.policyTypes |  | ||||||
|       value: |  | ||||||
|       - Egress |  | ||||||
|       - Ingress |  | ||||||
|   - equal: |  | ||||||
|       path: spec.egress |  | ||||||
|       value: |  | ||||||
|       - to: |  | ||||||
|         - namespaceSelector: |  | ||||||
|             matchLabels: |  | ||||||
|               kubernetes.io/metadata.name: database |  | ||||||
|           podSelector: |  | ||||||
|             matchLabels: |  | ||||||
|               app.kubernetes.io/name: oracle |  | ||||||
|   - equal: |  | ||||||
|       path: spec.ingress |  | ||||||
|       value: |  | ||||||
|       - from: |  | ||||||
|         - namespaceSelector: |  | ||||||
|             matchLabels: |  | ||||||
|               kubernetes.io/metadata.name: khv-production |  | ||||||
|           podSelector: |  | ||||||
|             matchLabels: |  | ||||||
|               app.kubernetes.io/name: prometheus |  | ||||||
							
								
								
									
										80
									
								
								values.yaml
									
									
									
									
									
								
							
							
						
						
									
										80
									
								
								values.yaml
									
									
									
									
									
								
							| @@ -224,11 +224,11 @@ deployment: | |||||||
|   securityContext: {} |   securityContext: {} | ||||||
|     # fsGroup: 2000 |     # fsGroup: 2000 | ||||||
|  |  | ||||||
|   ## @param deployment.strategy.type Strategy type - `Recreate` or `RollingUpdate`. |   ## @param deployment.strategy.type Strategy type - `Recreate` or `Rollingupdate`. | ||||||
|   ## @param deployment.strategy.rollingUpdate.maxSurge The maximum number of pods that can be scheduled above the desired number of pods during a rolling update. |   ## @param deployment.strategy.rollingUpdate.maxSurge The maximum number of pods that can be scheduled above the desired number of pods during a rolling update. | ||||||
|   ## @param deployment.strategy.rollingUpdate.maxUnavailable The maximum number of pods that can be unavailable during a rolling update. |   ## @param deployment.strategy.rollingUpdate.maxUnavailable The maximum number of pods that can be unavailable during a rolling update. | ||||||
|   strategy: |   strategy: | ||||||
|     type: "RollingUpdate" |     type: "Recreate" | ||||||
|     rollingUpdate: |     rollingUpdate: | ||||||
|       maxSurge: 1 |       maxSurge: 1 | ||||||
|       maxUnavailable: 1 |       maxUnavailable: 1 | ||||||
| @@ -266,7 +266,7 @@ grafana: | |||||||
|   enabled: false |   enabled: false | ||||||
|  |  | ||||||
|   ## @param grafana.dashboardDiscoveryLabels Labels that Grafana uses to discover resources. The labels may vary depending on the Grafana deployment. |   ## @param grafana.dashboardDiscoveryLabels Labels that Grafana uses to discover resources. The labels may vary depending on the Grafana deployment. | ||||||
|   ## @skip grafana.dashboardDiscoveryLabels Skip individual configuration. |   ## @skip grafana.dashboardDiscoveryLabels | ||||||
|   dashboardDiscoveryLabels: |   dashboardDiscoveryLabels: | ||||||
|     grafana_dashboard: "1" |     grafana_dashboard: "1" | ||||||
|  |  | ||||||
| @@ -311,77 +311,9 @@ podDisruptionBudget: {} | |||||||
| #  maxUnavailable: 1 | #  maxUnavailable: 1 | ||||||
| #  minAvailable: 1 | #  minAvailable: 1 | ||||||
|  |  | ||||||
| ## @section NetworkPolicies | ## @section Network | ||||||
| ## @param networkPolicies.enabled Enable network policies in general. | ## @param networkPolicies Deploy network policies based on the used container network interface (CNI) implementation - like calico or weave. | ||||||
| networkPolicies: | networkPolicies: {} | ||||||
|   enabled: false |  | ||||||
|  |  | ||||||
|   ## @param networkPolicies.default.enabled Enable the network policy for accessing the application by default. For example to scape the metrics. |  | ||||||
|   ## @param networkPolicies.default.annotations Additional network policy annotations. |  | ||||||
|   ## @param networkPolicies.default.labels Additional network policy labels. |  | ||||||
|   ## @param networkPolicies.default.policyTypes List of policy types. Supported is ingress, egress or ingress and egress. |  | ||||||
|   ## @param networkPolicies.default.egress Concrete egress network policy implementation. |  | ||||||
|   ## @skip networkPolicies.default.egress Skip individual egress configuration. |  | ||||||
|   ## @param networkPolicies.default.ingress Concrete ingress network policy implementation. |  | ||||||
|   ## @skip networkPolicies.default.ingress Skip individual ingress configuration. |  | ||||||
|   default: |  | ||||||
|     enabled: false |  | ||||||
|     annotations: {} |  | ||||||
|     labels: {} |  | ||||||
|     policyTypes: [] |  | ||||||
|     # - Egress |  | ||||||
|     # - Ingress |  | ||||||
|     egress: [] |  | ||||||
|     # Allow outgoing traffic to database host |  | ||||||
|     # |  | ||||||
|     # - to: |  | ||||||
|     #   - ipBlock: |  | ||||||
|     #       cidr: 192.168.179.1/32 |  | ||||||
|     #   ports: |  | ||||||
|     #   - port: 5432 |  | ||||||
|     #     protocol: TCP |  | ||||||
|  |  | ||||||
|     # Allow outgoing DNS traffic to the internal running DNS-Server. For example core-dns. |  | ||||||
|     # |  | ||||||
|     # - to: |  | ||||||
|     #   - namespaceSelector: |  | ||||||
|     #       matchLabels: |  | ||||||
|     #         kubernetes.io/metadata.name: kube-system |  | ||||||
|     #     podSelector: |  | ||||||
|     #       matchLabels: |  | ||||||
|     #        k8s-app: kube-dns |  | ||||||
|     #   ports: |  | ||||||
|     #   - port: 53 |  | ||||||
|     #     protocol: TCP |  | ||||||
|     #   - port: 53 |  | ||||||
|     #     protocol: UDP |  | ||||||
|  |  | ||||||
|     ingress: [] |  | ||||||
|     # Allow incoming HTTP traffic from prometheus. |  | ||||||
|     # |  | ||||||
|     # - from: |  | ||||||
|     #   - namespaceSelector: |  | ||||||
|     #       matchLabels: |  | ||||||
|     #         kubernetes.io/metadata.name: monitoring |  | ||||||
|     #     podSelector: |  | ||||||
|     #       matchLabels: |  | ||||||
|     #         app.kubernetes.io/name: prometheus |  | ||||||
|     #   ports: |  | ||||||
|     #   - port: http |  | ||||||
|     #     protocol: TCP |  | ||||||
|  |  | ||||||
|     # Allow incoming HTTP traffic from ingress-nginx. |  | ||||||
|     # |  | ||||||
|     # - from: |  | ||||||
|     #   - namespaceSelector: |  | ||||||
|     #       matchLabels: |  | ||||||
|     #         kubernetes.io/metadata.name: ingress-nginx |  | ||||||
|     #     podSelector: |  | ||||||
|     #       matchLabels: |  | ||||||
|     #         app.kubernetes.io/name: ingress-nginx |  | ||||||
|     #   ports: |  | ||||||
|     #   - port: http |  | ||||||
|     #     protocol: TCP |  | ||||||
|  |  | ||||||
| ## @section Prometheus | ## @section Prometheus | ||||||
| prometheus: | prometheus: | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user