feat(plugins): allow plugin defintion #680
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -67,6 +67,10 @@ spec: | |||||||||||
| name: {{ . }} | ||||||||||||
| {{ end }} | ||||||||||||
| enablePDB: {{ .Values.cluster.enablePDB }} | ||||||||||||
| {{- with .Values.cluster.plugins }} | ||||||||||||
| plugins: | ||||||||||||
| {{- toYaml . | nindent 4}} | ||||||||||||
| {{- end }} | ||||||||||||
|
Comment on lines
+70
to
+73
There was a problem hiding this comment. If the suggestion with the ObjectStore name and the corresponding change within the
Suggested change
|
||||||||||||
| postgresql: | ||||||||||||
| {{- if or (eq .Values.type "timescaledb") (not (empty .Values.cluster.postgresql.shared_preload_libraries)) }} | ||||||||||||
| shared_preload_libraries: | ||||||||||||
|
|
||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,22 @@ | ||||||
| {{ if and (eq (include "cluster.useBarmanCloudPlugin" .) "true") .Values.backups.enabled }} | ||||||
| apiVersion: barmancloud.cnpg.io/v1 | ||||||
| kind: ObjectStore | ||||||
| metadata: | ||||||
| name: {{ include "cluster.fullname" $ }}-object-store | ||||||
|
pha91 marked this conversation as resolved.
There was a problem hiding this comment. The name is currently "hardcoded" but must also be specified within the plugin declaration. This creates the problem, that the user must know/predict the name to be used and if that ever changes (either by changing what
Suggested change
Possibly save the output of |
||||||
| spec: | ||||||
| configuration: | ||||||
| wal: | ||||||
| compression: {{ .Values.backups.wal.compression }} | ||||||
| {{- if .Values.backups.wal.encryption }} | ||||||
| encryption: {{ .Values.backups.wal.encryption }} | ||||||
| {{- end }} | ||||||
| maxParallel: {{ .Values.backups.wal.maxParallel }} | ||||||
| data: | ||||||
| compression: {{ .Values.backups.data.compression }} | ||||||
| {{- if .Values.backups.data.encryption }} | ||||||
| encryption: {{ .Values.backups.data.encryption }} | ||||||
| {{- end }} | ||||||
| jobs: {{ .Values.backups.data.jobs }} | ||||||
| {{- $d := dict "chartFullname" (include "cluster.fullname" .) "scope" .Values.backups "secretPrefix" "backup" -}} | ||||||
| {{- include "cluster.barmanObjectStoreConfig" $d | indent 2 }} | ||||||
| {{- end }} | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -11,9 +11,15 @@ metadata: | |||||||||||||||||||||||||||||||||||||
| spec: | ||||||||||||||||||||||||||||||||||||||
| immediate: true | ||||||||||||||||||||||||||||||||||||||
| schedule: {{ .schedule | quote }} | ||||||||||||||||||||||||||||||||||||||
| backupOwnerReference: {{ .backupOwnerReference }} | ||||||||||||||||||||||||||||||||||||||
| cluster: | ||||||||||||||||||||||||||||||||||||||
| name: {{ include "cluster.fullname" $context }} | ||||||||||||||||||||||||||||||||||||||
| {{- if (eq (include "cluster.useBarmanCloudPlugin" $context ) "true") }} | ||||||||||||||||||||||||||||||||||||||
| pluginConfiguration: | ||||||||||||||||||||||||||||||||||||||
| name: barman-cloud.cloudnative-pg.io | ||||||||||||||||||||||||||||||||||||||
| method: plugin | ||||||||||||||||||||||||||||||||||||||
| {{ else }} | ||||||||||||||||||||||||||||||||||||||
| method: {{ .method }} | ||||||||||||||||||||||||||||||||||||||
| {{- end }} | ||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+17
to
+23
There was a problem hiding this comment. I am not sure if this should be "hardcoded" in case the barman cloud plugin is enabled. In case it is possible to still use
Suggested change
|
||||||||||||||||||||||||||||||||||||||
| {{ end -}} | ||||||||||||||||||||||||||||||||||||||
| {{ end }} | ||||||||||||||||||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -101,7 +101,13 @@ spec: | |
| memory: 256Mi | ||
| limits: | ||
| cpu: 100m | ||
| memory: 256Mi | ||
|
There was a problem hiding this comment. trailing spaces after |
||
| plugins: | ||
| - name: cnpg-i-plugin-example.my-org.io | ||
| enabled: true | ||
| parameters: | ||
| key1: value1 | ||
| key2: value2 | ||
| priorityClassName: mega-high | ||
| primaryUpdateStrategy: supervised | ||
| primaryUpdateMethod: restart | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,6 +87,12 @@ cluster: | |
| inRoles: | ||
| - pg_monitor | ||
| - pg_signal_backend | ||
| plugins: | ||
| - name: cnpg-i-plugin-example.my-org.io | ||
| enabled: true | ||
| parameters: | ||
| key1: value1 | ||
| key2: value2 | ||
| postgresql: | ||
| ldap: | ||
| server: 'openldap.default.svc.cluster.local' | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -262,6 +262,27 @@ | |
| } | ||
| } | ||
| }, | ||
| "plugins": { | ||
| "type": "array", | ||
| "items": { | ||
| "type": "object", | ||
| "properties": { | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "enabled": { | ||
| "type": "boolean" | ||
| }, | ||
| "isWALArchiver": { | ||
| "type": "boolean" | ||
| }, | ||
| "parameters": { | ||
| "type": "object" | ||
| } | ||
| }, | ||
| "required": ["name"] | ||
| } | ||
| }, | ||
| "postgresGID": { | ||
| "type": "integer" | ||
| }, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -343,6 +343,13 @@ cluster: | |
| # - name: custom-queries-secret | ||
| # key: custom-queries | ||
|
|
||
| plugins: [] | ||
| # - name: cnpg-i-plugin-example.my-org.io | ||
| # enabled: true | ||
| # parameters: | ||
| # key1: value1 | ||
| # key2: value2 | ||
|
|
||
| postgresql: | ||
| # -- PostgreSQL configuration options (postgresql.conf) | ||
| parameters: {} | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the CRD
enabledis set totrueby default, thus this may be changed to something like this:Furthermore I guess this should also check if
isWALArchiveris true (but I am not sure):There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Depending whether the first or no suggestion gets applied, the suggestion in #680 (comment) needs to get adapted (twice; in both nested template definitions).