Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(nextcloud): move ci lint-test values to yaml file #650

Merged
merged 3 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: ct lint --target-branch ${{ github.event.repository.default_branch }}

test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: [changes, lint]
# only run this job if there are helm chart file changes
if: needs.changes.outputs.src != 'false'
Expand All @@ -72,21 +72,21 @@ jobs:

# test the helm chart with postgresql subchart enabled
- name: PostgreSQL Enabled
helm_args: '--helm-extra-set-args "--set=postgresql.enabled=true --set=postgresql.global.postgresql.auth.password=testing123456 --set=internalDatabase.enabled=false --set=externalDatabase.enabled=True --set=externalDatabase.type=postgresql --set=externalDatabase.password=testing12345"'
helm_args: '--helm-extra-set-args "--values charts/nextcloud/test-values/postgresql.yaml"'

# test the helm chart with nginx container enabled
- name: Nginx Enabled
helm_args: '--helm-extra-set-args "--set=image.flavor=fpm --set=nginx.enabled=true"'
helm_args: '--helm-extra-set-args "--values charts/nextcloud/test-values/nginx.yaml"'

# test the helm chart with horizontal pod autoscaling enabled
- name: Horizontal Pod Autoscaling Enabled
helm_args: '--helm-extra-set-args "--set=hpa.enabled=true --set=hpa.minPods=2 --set=hpa.maxPods=3 --set=hpa.targetCPUUtilizationPercentage=75"'
helm_args: '--helm-extra-set-args "--values charts/nextcloud/test-values/hpa.yaml"'

# test the helm chart with s3 as the primary storage
- name: S3 Enabled as Primary Storage
# we need to skip the clean up so we can test adding a file
helm_args: |
--namespace nextcloud --skip-clean-up --helm-extra-set-args "--set=fullnameOverride=nextcloud --set=nextcloud.objectStore.s3.enabled=true --set=nextcloud.objectStore.s3.accessKey=nextcloud --set=nextcloud.objectStore.s3.secretKey=rootpass123 --set=nextcloud.objectStore.s3.host=minio.nextcloud.svc.cluster.local --set=nextcloud.objectStore.s3.port=9000 --set=nextcloud.objectStore.s3.ssl=false --set=nextcloud.objectStore.s3.bucket=nextcloud --set=nextcloud.objectStore.s3.usePathStyle=true --set=image.flavor=fpm --set=nginx.enabled=true --set=nextcloud.host=nextcloud --set=nextcloud.trustedDomains[0]='*'"
--namespace nextcloud --skip-clean-up --helm-extra-set-args "--values charts/nextcloud/test-values/s3-as-primary-storage.yaml"

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion charts/nextcloud/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: nextcloud
version: 6.2.3
version: 6.2.4
appVersion: 30.0.2
description: A file sharing server that puts the control and security of your own data back into your hands.
keywords:
Expand Down
5 changes: 5 additions & 0 deletions charts/nextcloud/test-values/hpa.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
hpa:
enabled: true
minPods: 2
maxPods: 3
targetCPUUtilizationPercentage: 75
5 changes: 5 additions & 0 deletions charts/nextcloud/test-values/nginx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
image:
flavor: fpm

nginx:
enabled: true
14 changes: 14 additions & 0 deletions charts/nextcloud/test-values/postgresql.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
postgresql:
enabled: true
global:
postgresql:
auth:
password: "testing123456"

internalDatabase:
enabled: false

externalDatabase:
enabled: true
type: postgresql
password: "testing123456"
20 changes: 20 additions & 0 deletions charts/nextcloud/test-values/s3-as-primary-storage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
fullnameOverride: nextcloud

image:
flavor: fpm

nginx:
enabled: true

nextcloud:
host: nextcloud
objectStore:
s3:
enabled: true
accessKey: nextcloud
secretKey: rootpass123
host: minio.nextcloud.svc.cluster.local
port: 9000
ssl: false
bucket: nextcloud
usePathStyle: true