Skip to content

Commit 9ea6f2d

Browse files
Merge branch 'allow-nginx-additional-config' of github.com:solution-libre/helm into allow-nginx-additional-config
2 parents e2daefb + 92612ec commit 9ea6f2d

File tree

16 files changed

+518
-268
lines changed

16 files changed

+518
-268
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: "Enhancement"
3+
about: "Suggest an enhancement for this project ✨"
4+
title: "Feature: A cool new feature..."
5+
labels: "enhancement"
6+
assignees: ''
7+
8+
---
9+
## Description of the change
10+
11+
<!-- Describe the scope of your change - i.e. what the change does. -->
12+
13+
## Benefits
14+
15+
<!-- What benefits will be realized by the code change? -->
16+
17+
## Possible drawbacks
18+
19+
<!-- Describe any known limitations with your change -->
20+
21+
## Additional information
22+
23+
<!-- If there's anything else that's important and relevant to your pull request, mention that information here. -->
24+
25+
<!-- Thanks for submitting an enhancement! Please consider also submitting a pull request for your suggestion :) -->

.github/ISSUE_TEMPLATE/issue.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: "General Issue"
3+
about: "Create an issue to report something not working."
4+
title: "A descriptive title of the issue"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
## Describe your Issue
11+
<!-- A clear and concise description of what the issue or bug is -->
12+
13+
### Logs and Errors
14+
<!-- Give us any errors you're getting -->
15+
<!-- Let us know where you got the log, e.g. nextcloud container or nginx container -->
16+
<!-- You can get the pod logs with: `kubectl logs` (remove any sensitive data ahead of time) -->
17+
18+
## Describe your Environment
19+
20+
- Kubernetes distribution: <!-- examples: k3s, k0s, eks, gke -->
21+
22+
- Helm Version (or App that manages helm): <!-- example: Using helm version 3.11, or include data about what is running helm, e.g. ArgoCD version 2.5.8 -->
23+
24+
- Helm Chart Version: <!-- example: 3.4.3 -->
25+
26+
- `values.yaml`:
27+
28+
```yaml
29+
# paste your values.yaml (anonymize any sensitive data)
30+
```
31+
32+
## Additional context, if any
33+
<!-- Also note any additional relevant info about your environment. -->
34+
<!-- example: If your issue is related to persistent volumes, let us know you're using NFS or EFS, for instance. -->

.github/dependabot.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# To get started with Dependabot version updates, you'll need to specify which
22
# package ecosystems to update and where the package manifests are located.
33
# Please see the documentation for all configuration options:
4-
# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
4+
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
55

66
version: 2
77
updates:
@@ -10,3 +10,8 @@ updates:
1010
schedule:
1111
# Check for updates to GitHub Actions every weekday
1212
interval: "daily"
13+
14+
- package-ecosystem: "docker"
15+
directory: "/charts/nextcloud"
16+
schedule:
17+
interval: "daily"

.github/workflows/lint-test.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ name: Lint and Test Charts
33
on:
44
pull_request:
55
paths-ignore:
6-
- 'README.md'
6+
- '.github/**'
77
- 'charts/**/README.md'
8+
- 'CODE_OF_CONDUCT.md'
89
- 'LICENSE'
10+
- 'README.md'
911

1012
jobs:
1113
lint-test:
@@ -14,40 +16,38 @@ jobs:
1416
- name: Checkout
1517
uses: actions/checkout@v3
1618
with:
17-
fetch-depth: 0
19+
fetch-depth: 0
1820

1921
- name: Install Helm
20-
uses: azure/setup-helm@v3.1
22+
uses: azure/setup-helm@v3.5
2123
with:
22-
version: v3.6.3
24+
version: v3.11.1
2325

2426
- name: Add dependency chart repos
2527
run: |
2628
helm repo add bitnami https://charts.bitnami.com/bitnami
2729
2830
- name: Set up chart-testing
29-
uses: helm/chart-testing-action@v2.3.1
31+
uses: helm/chart-testing-action@v2.4.0
3032

3133
- name: Run chart-testing (list-changed)
3234
id: list-changed
3335
run: |
34-
changed=$(ct list-changed)
36+
changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
3537
if [[ -n "$changed" ]]; then
36-
echo "::set-output name=changed::true"
38+
echo "changed=true" >> "$GITHUB_OUTPUT"
3739
fi
3840
3941
- name: Run chart-testing (lint)
4042
id: lint
4143
if: steps.list-changed.outputs.changed == 'true'
42-
run: ct lint --config ct.yaml
44+
run: ct lint --target-branch ${{ github.event.repository.default_branch }}
4345

4446
- name: Create kind cluster
45-
uses: helm/[email protected]
46-
with:
47-
install_local_path_provisioner: true
47+
uses: helm/[email protected]
4848
if: steps.list-changed.outputs.changed == 'true'
4949

5050
- name: Run chart-testing (install)
5151
id: install
5252
if: steps.list-changed.outputs.changed == 'true'
53-
run: ct install --config ct.yaml
53+
run: ct install --target-branch ${{ github.event.repository.default_branch }}

.github/workflows/release.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ name: Release Charts
44
on:
55
push:
66
branches:
7-
- master
7+
- main
88
paths-ignore:
9-
- 'README.md'
9+
- '.github/**'
1010
- 'charts/**/README.md'
1111
- 'LICENSE'
12+
- 'README.md'
1213

1314
jobs:
1415
release:
@@ -34,17 +35,15 @@ jobs:
3435
3536
# See https://github.com/helm/chart-releaser-action/issues/6
3637
- name: Set up Helm
37-
uses: azure/setup-helm@v3.1
38+
uses: azure/setup-helm@v3.5
3839
with:
39-
version: v3.6.3
40+
version: v3.11.1
4041

4142
- name: Add dependency chart repos
4243
run: |
4344
helm repo add bitnami https://charts.bitnami.com/bitnami
4445
4546
- name: Run chart-releaser
46-
uses: helm/[email protected]
47-
with:
48-
charts_repo_url: https://nextcloud.github.io/helm
47+
uses: helm/[email protected]
4948
env:
5049
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

CODE_OF_CONDUCT.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
In the Nextcloud community, participants from all over the world come together to create Free Software for a free internet. This is made possible by the support, hard work and enthusiasm of thousands of people, including those who create and use Nextcloud software.
2+
3+
Our code of conduct offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
4+
5+
The Code of Conduct is shared by all contributors and users who engage with the Nextcloud team and its community services. It presents a summary of the shared values and “common sense” thinking in our community.
6+
7+
You can find our full code of conduct on our website: https://nextcloud.com/code-of-conduct/
8+
9+
Please, keep our CoC in mind when you contribute! That way, everyone can be a part of our community in a productive, positive, creative and fun way.

README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,17 @@ helm repo update
1818
```bash
1919
helm install my-release nextcloud/nextcloud
2020
```
21+
22+
For more information, please checkout the chart level [README.md](./charts/nextcloud/README.md).
23+
24+
### Support and Contribution
25+
Please also review the official [NextCloud Code of Conduct](https://nextcloud.com/contribute/code-of-conduct/) before contributing.
26+
27+
#### Questions and Discussions
28+
[GitHub Discussion](https://github.com/nextcloud/helm/discussions)
29+
30+
#### Bugs and other Issues
31+
If you have a bug to report or a feature to request, you can first search the [GitHub Issues](https://github.com/nextcloud/helm/issues), and if you can't find what you're looking for, feel free to open an issue.
32+
33+
#### Contributing to the Code
34+
We're always happy to review a pull request :) Please just be sure to check the pull request template to make sure you fufill all the required checks, most importantly the [DCO](https://probot.github.io/apps/dco/).

charts/nextcloud/Chart.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dependencies:
22
- name: postgresql
33
repository: https://charts.bitnami.com/bitnami
4-
version: 11.6.10
4+
version: 11.6.26
55
- name: mariadb
66
repository: https://charts.bitnami.com/bitnami
7-
version: 11.0.13
7+
version: 11.0.14
88
- name: redis
99
repository: https://charts.bitnami.com/bitnami
1010
version: 16.12.3
11-
digest: sha256:fa5daab278b20ab0521819791750848c7cf8f4081bea4d675ce04faef5cbb547
12-
generated: "2022-06-28T20:46:18.681579184+02:00"
11+
digest: sha256:26d3436ece41f0fbe00d0184c1cda7f5cccb7d49642982cfff49f113c11c0f34
12+
generated: "2022-10-30T11:48:19.745391397+01:00"

charts/nextcloud/Chart.yaml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
apiVersion: v2
22
name: nextcloud
3-
version: 3.2.3
4-
appVersion: 24.0.5
3+
version: 3.5.12
4+
appVersion: 26.0.1
55
description: A file sharing server that puts the control and security of your own data back into your hands.
66
keywords:
7-
- nextcloud
8-
- storage
9-
- http
10-
- web
11-
- php
7+
- nextcloud
8+
- storage
9+
- http
10+
- web
11+
- php
1212
home: https://nextcloud.com/
1313
icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
1414
sources:
15-
- https://github.com/nextcloud/helm
16-
- https://github.com/nextcloud/docker
15+
- https://github.com/nextcloud/helm
16+
- https://github.com/nextcloud/docker
1717
maintainers:
18-
- name: skjnldsv
19-
20-
- name: chrisingenhaag
21-
22-
- name: billimek
23-
18+
- name: skjnldsv
19+
20+
- name: chrisingenhaag
21+
22+
- name: billimek
23+
2424
dependencies:
25-
- name: postgresql
26-
version: 11.6.*
27-
repository: https://charts.bitnami.com/bitnami
28-
condition: postgresql.enabled
29-
- name: mariadb
30-
version: 11.0.*
31-
repository: https://charts.bitnami.com/bitnami
32-
condition: mariadb.enabled
33-
- name: redis
34-
version: 16.12.*
35-
repository: https://charts.bitnami.com/bitnami
36-
condition: redis.enabled
25+
- name: postgresql
26+
version: 11.6.*
27+
repository: https://charts.bitnami.com/bitnami
28+
condition: postgresql.enabled
29+
- name: mariadb
30+
version: 11.0.*
31+
repository: https://charts.bitnami.com/bitnami
32+
condition: mariadb.enabled
33+
- name: redis
34+
version: 16.12.*
35+
repository: https://charts.bitnami.com/bitnami
36+
condition: redis.enabled

0 commit comments

Comments
 (0)