diff --git a/Makefile b/Makefile index fa677c27..27e28b75 100644 --- a/Makefile +++ b/Makefile @@ -158,7 +158,7 @@ install-minio: install-ingress --wait \ --timeout $(TIMEOUT) \ --set auth.rootUser=lagoonFilesAccessKey,auth.rootPassword=lagoonFilesSecretKey \ - --set defaultBuckets=lagoon-files \ + --set defaultBuckets='lagoon-files\,restores' \ --version=12.8.7 \ minio \ bitnami/minio diff --git a/charts/lagoon-test/Chart.yaml b/charts/lagoon-test/Chart.yaml index 836924df..cc055519 100644 --- a/charts/lagoon-test/Chart.yaml +++ b/charts/lagoon-test/Chart.yaml @@ -15,7 +15,7 @@ type: application # time you make changes to the chart and its templates, including the app # version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.52.0 +version: 0.53.0 # This is the version number of the application being deployed. This version # number should be incremented each time you make changes to the application. @@ -29,4 +29,4 @@ appVersion: v2.16.0 annotations: artifacthub.io/changes: | - kind: changed - description: require minimum Kubernetes 1.23 + description: add minio settings to api-data-watcher-pusher diff --git a/charts/lagoon-test/templates/local-api-data-watcher-pusher.deployment.yaml b/charts/lagoon-test/templates/local-api-data-watcher-pusher.deployment.yaml index eadd3040..bede06d4 100644 --- a/charts/lagoon-test/templates/local-api-data-watcher-pusher.deployment.yaml +++ b/charts/lagoon-test/templates/local-api-data-watcher-pusher.deployment.yaml @@ -47,6 +47,12 @@ spec: secretKeyRef: name: {{ .Values.jwtSecretSecret | quote }} key: JWTSECRET + - name: MINIO_SERVER_URL + value: {{ .Values.minioURL | quote }} + - name: MINIO_ROOT_USER + value: {{ .Values.minioUser | quote }} + - name: MINIO_ROOT_PASSWORD + value: {{ .Values.minioPass | quote }} - name: TOKEN value: {{ required "A valid .Values.token required!" .Values.token | quote }} startupProbe: diff --git a/charts/lagoon-test/values.yaml b/charts/lagoon-test/values.yaml index 0bea382c..49108445 100644 --- a/charts/lagoon-test/values.yaml +++ b/charts/lagoon-test/values.yaml @@ -8,6 +8,9 @@ gitAuthorizedKeys: > ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDEZlms5XsiyWjmnnUyhpt93VgHypse9Bl8kNkmZJTiM3Ex/wZAfwogzqd2LrTEiIOWSH1HnQazR+Cc9oHCmMyNxRrLkS/MEl0yZ38Q+GDfn37h/llCIZNVoHlSgYkqD0MQrhfGL5AulDUKIle93dA6qdCUlnZZjDPiR0vEXR36xGuX7QYAhK30aD2SrrBruTtFGvj87IP/0OEOvUZe8dcU9G/pCoqrTzgKqJRpqs/s5xtkqLkTIyR/SzzplO21A+pCKNax6csDDq3snS8zfx6iM8MwVfh8nvBW9seax1zBvZjHAPSTsjzmZXm4z32/ujAn/RhIkZw3ZgRKrxzryttGnWJJ8OFyF31JTJgwWWuPdH53G15PC83ZbmEgSV3win51RZRVppN4uQUuaqZWG9wwk2a6P5aen1RLCSLpTkd2mAEk9PlgmJrf8vITkiU9pF9n68ENCoo556qSdxW2pxnjrzKVPSqmqO1Xg5K4LOX4/9N4n4qkLEOiqnzzJClhFif3O28RW86RPxERGdPT81UI0oDAcU5euQr8Emz+Hd+PY1115UIld3CIHib5PYL9Ee0bFUKiWpR/acSe1fHB64mCoHP7hjFepGsq7inkvg2651wUDKBshGltpNkMj6+aZedNc0/rKYyjl80nT8g8QECgOSRzpmYp0zli2HpFoLOiWw== ansible-testing jwtSecretSecret: lagoon-core-secrets keycloakURL: http://lagoon-core-keycloak:8080 +minioURL: http://minio.minio.svc:9000 +minioUser: lagoonFilesAccessKey +minioPass: lagoonFilesSecretKey routeSuffixHTTPPort: 32080 routeSuffixHTTPSPort: 32443 sshHost: lagoon-core-ssh