Skip to content

Commit 7ec4951

Browse files
authored
Merge branch 'main' into projected-volume
2 parents 003373c + b1d64c2 commit 7ec4951

23 files changed

Lines changed: 73 additions & 79 deletions

.github/actions/deploy-cluster/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runs:
1313
env:
1414
NAMESPACE: ${{ inputs.namespace }}
1515
run: |
16-
cat <<EOF | kubectl apply -f -
16+
cat <<EOF | kubectl apply --server-side --validate=strict -f -
1717
# Example of PostgreSQL cluster
1818
apiVersion: postgresql.cnpg.io/v1
1919
kind: Cluster

.github/actions/deploy-operator/action.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ runs:
1717
env:
1818
NAMESPACE: ${{ inputs.namespace }}
1919
CLUSTER_WIDE: ${{ inputs.cluster-wide }}
20-
run:
21-
helm dependency update charts/cloudnative-pg
22-
23-
helm upgrade
24-
--install
25-
--namespace $NAMESPACE
26-
--create-namespace
27-
--set config.clusterWide=$CLUSTER_WIDE
28-
--wait
29-
cnpg charts/cloudnative-pg
20+
run: |
21+
helm repo add cnpg https://cloudnative-pg.github.io/charts
22+
helm upgrade \
23+
--install \
24+
--namespace $NAMESPACE \
25+
--create-namespace \
26+
--set config.clusterWide=$CLUSTER_WIDE \
27+
--wait \
28+
cnpg cnpg/cloudnative-pg

.github/workflows/release-pr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ jobs:
2222
id: create-pr
2323
env:
2424
GH_TOKEN: ${{ secrets.REPO_GHA_PAT }}
25+
ACTOR: ${{ github.actor }}
2526
run: |
2627
TAG="${GITHUB_REF##*/}"
2728
TITLE="Release ${TAG}"
2829
BODY="Automated PR. Will trigger the ${TAG} release when approved."
2930
LABEL=release
30-
ASSIGNEE=${{ github.actor }}
31+
ASSIGNEE="${ACTOR}"
3132
gh pr create --title "${TITLE}" --body "${BODY}" --label "${LABEL}" --assignee "${ASSIGNEE}" ||
3233
gh pr edit --title "${TITLE}" --body "${BODY}" --add-label "${LABEL}"

.github/workflows/tests-cluster-chainsaw.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,6 @@ jobs:
7070
tenant minio-operator/tenant
7171
7272
- name: Run Kyverno/Chainsaw
73-
run: chainsaw test charts/cluster/test/${{matrix.test}}
73+
env:
74+
MATRIX_TEST: ${{ matrix.test }}
75+
run: chainsaw test "charts/cluster/test/${MATRIX_TEST}"

.github/workflows/tests-plugin-barman-cloud.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix: ${{ fromJson(needs.test-list.outputs.tests) }}
29-
name: ${{matrix.test}}
29+
env:
30+
MATRIX_TEST: ${{ matrix.test }}
31+
name: ${{ env.MATRIX_TEST }}
3032
steps:
3133
- name: Checkout
3234
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -73,4 +75,4 @@ jobs:
7375
tenant minio-operator/tenant
7476
7577
- name: Run Kyverno/Chainsaw
76-
run: chainsaw test charts/plugin-barman-cloud/test/${{matrix.test}}
78+
run: chainsaw test "charts/plugin-barman-cloud/test/${MATRIX_TEST}"

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ charts/**/charts/*.tgz
1616
# Output of the go coverage tool, specifically when used with LiteIDE
1717
*.out
1818

19-
# editor and IDE paraphernalia
19+
# Editor and IDE paraphernalia
2020
.idea
2121
*.swp
2222
*.swo
2323
*~
24+
25+
# macOS
26+
.DS_Store

CONTRIBUTING.md

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
1-
# Contributing to Helm Charts
1+
# Contributing to CloudNativePG
22

3-
Please read the [code of conduct](CODE-OF-CONDUCT.md) first.
3+
Thank you for your interest in contributing! 💖
44

5-
## How to report a new issue
5+
To ensure consistency across the project, all CloudNativePG repositories follow
6+
a common set of guidelines regarding code of conduct, AI usage, and
7+
contribution workflows.
68

7-
Before reporting a new issue, please make sure you have:
8-
9-
- read the documentation
10-
- checked that a similar issue has not been opened in the past
11-
12-
## How to contribute
13-
14-
You can contribute to charts by submitting a new pull request.
15-
16-
Please:
17-
18-
1. Open a new issue providing information about the feature you want to add
19-
2. Fork the project, develop the feature as a branch with the issue ID (e.g. dev/43) and test the code
20-
3. Submit a pull request
21-
22-
Thank you.
9+
Please review the [CloudNativePG Project contributing guidelines](https://github.com/cloudnative-pg/governance/blob/main/CONTRIBUTING.md)
10+
before searching for issues, reporting bugs, or submitting a pull request.

LICENSE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Apache License
32
Version 2.0, January 2004
43
http://www.apache.org/licenses/

charts/cluster/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ name: cluster
2121
description: Deploys and manages a CloudNativePG cluster and its associated resources.
2222
icon: https://raw.githubusercontent.com/cloudnative-pg/artwork/main/cloudnativepg-logo.svg
2323
type: application
24-
version: 0.5.0
24+
version: 0.6.0
2525
sources:
2626
- https://github.com/cloudnative-pg/charts
2727
keywords:

charts/cluster/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# cluster
22

3-
![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
3+
![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
44

55
> **Warning**
66
> ### This chart is under active development.
@@ -68,7 +68,7 @@ Depending on the type the chart will use a different Docker image and fill in so
6868

6969
The chart has three modes of operation. These are configured via the `mode` parameter:
7070
* `standalone` - Creates new or updates an existing CNPG cluster. This is the default mode.
71-
* `replica` - Creates a replica cluster from an existing CNPG cluster. **_Note_ that this mode is not yet supported.**
71+
* `replica` - Creates a replica cluster from an existing CNPG cluster.
7272
* `recovery` - Recovers a CNPG cluster from a backup, object store or via pg_basebackup.
7373

7474
### Backup configuration
@@ -93,9 +93,9 @@ backups:
9393
backupOwnerReference: self
9494
```
9595
96-
Each backup adapter takes it's own set of parameters, listed in the [Configuration options](#Configuration-options) section
97-
below. Refer to the table for the full list of parameters and place the configuration under the appropriate key: `backup.s3`,
98-
`backup.azure`, or `backup.google`.
96+
Each backup adapter takes it's own set of parameters, listed in the [Configuration options](#Configuration-options)
97+
section. Refer to the table for the full list of parameters and place the configuration under the appropriate key: `backups.s3`,
98+
`backups.azure`, or `backups.google`.
9999

100100
Recovery
101101
--------
@@ -106,7 +106,7 @@ Examples
106106
--------
107107

108108
There are several configuration examples in the [examples](examples) directory. Refer to them for a basic setup and
109-
refer to the [CloudNativePG Documentation](https://cloudnative-pg.io/documentation/current/) for more advanced configurations.
109+
refer to the [CloudNativePG Documentation](https://cloudnative-pg.io/documentation/current/) for more advanced configurations.
110110

111111
## Values
112112

0 commit comments

Comments
 (0)