From e0e53da7fa7ab31903803891dbfddf5470b4224c Mon Sep 17 00:00:00 2001 From: Joshua Seals Date: Tue, 30 Jan 2024 12:22:29 -0500 Subject: [PATCH 01/28] adding email server configs --- index.yaml | 38 ++++++++++++++++++++++++++++++++++++++ templates/deployment.yaml | 15 +++++++++++++++ templates/secrets.yaml | 15 +++++++++++++++ values.yaml | 13 ++++++------- 4 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 index.yaml diff --git a/index.yaml b/index.yaml new file mode 100644 index 0000000..7e216a4 --- /dev/null +++ b/index.yaml @@ -0,0 +1,38 @@ +apiVersion: v1 +entries: + postgresql: + - annotations: + category: Database + apiVersion: v2 + appVersion: 14.4.0 + created: "2023-08-04T13:47:09.925021-04:00" + dependencies: + - name: common + repository: https://charts.bitnami.com/bitnami + version: 1.x.x + description: PostgreSQL (Postgres) is an open source object-relational database + known for reliability and data integrity. ACID-compliant, it supports foreign + keys, joins, views, triggers and stored procedures. + digest: 0f28a70ea01674fe9754f442b81499cafd60bb5c3b9255dd95bd285a83f7a60a + home: https://github.com/bitnami/charts/tree/master/bitnami/postgresql + icon: https://bitnami.com/assets/stacks/postgresql/img/postgresql-stack-220x234.png + keywords: + - postgresql + - postgres + - database + - sql + - replication + - cluster + maintainers: + - name: Bitnami + url: https://github.com/bitnami/charts + - email: cedric@desaintmartin.fr + name: desaintmartin + name: postgresql + sources: + - https://github.com/bitnami/containers/tree/main/bitnami/postgresql + - https://www.postgresql.org/ + urls: + - https://helxplatform.github.io/helm-charts/charts/postgresql-11.6.26.tgz + version: 11.6.26 +generated: "2023-08-04T13:47:09.921534-04:00" diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 7be18d7..1515831 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -327,6 +327,21 @@ spec: key: NFSRODS_HOST name: {{ include "appstore.fullname" . }} {{- end }} + - name: EMAIL_HOST + valueFrom: + secretKeyRef: + key: EMAIL_HOST + name: {{ include "appstore.fullname" . }} + - name: EMAIL_PORT + valueFrom: + secretKeyRef: + key: EMAIL_PORT + name: {{ include "appstore.fullname" . }} + - name: EMAIL_USE_TLS + valueFrom: + secretKeyRef: + key: EMAIL_USE_TLS + name: {{ include "appstore.fullname" . }} - name: EMAIL_HOST_USER valueFrom: secretKeyRef: diff --git a/templates/secrets.yaml b/templates/secrets.yaml index 8a6cb6c..5f68e41 100644 --- a/templates/secrets.yaml +++ b/templates/secrets.yaml @@ -28,6 +28,21 @@ data: {{- else }} EMAIL_HOST_USER: "" {{- end }} + {{ if .Values.django.EMAIL_HOST }} + EMAIL_HOST: {{ .Values.django.EMAIL_HOST | b64enc }} + {{- else }} + EMAIL_HOST: "" + {{-end }} + {{ if .Values.django.EMAIL_PORT }} + EMAIL_HOST: {{ .Values.django.EMAIL_PORT | b64enc }} + {{- else }} + EMAIL_PORT: "" + {{-end }} + {{ if .Values.django.EMAIL_USE_TLS }} + EMAIL_HOST: {{ .Values.django.EMAIL_USE_TLS | b64enc }} + {{- else }} + EMAIL_USE_TLS: "" + {{-end }} {{ if .Values.django.EMAIL_HOST_PASSWORD }} EMAIL_HOST_PASSWORD: {{ .Values.django.EMAIL_HOST_PASSWORD | b64enc }} {{- else }} diff --git a/values.yaml b/values.yaml index b55cd27..3ffeb3e 100644 --- a/values.yaml +++ b/values.yaml @@ -94,13 +94,6 @@ djangoSettings: helx # -- Allow for a custom entrypoint command via the values file. appstoreEntrypointArgs: "make start" -artillery: - # -- When either smokeTest or loadTest is true, set CREATE_TEST_USERS, TEST_USERS_PATH under django settings. - smokeTest: false - loadTest: false - loadDuration: 10 - loadArrivalRate: 10 - gunicorn: # -- Set the number of gunicorn workers. (2*CPU)+1 is recommended. workers: 5 @@ -134,6 +127,12 @@ django: ALLOW_DJANGO_LOGIN: "" # -- show SAML log in fields (true | false) ALLOW_SAML_LOGIN: "" + # -- Email Server host ie relay.unc.edu | relay.renci.org + EMAIL_HOST: "" + # -- Email Server port ie 25 or other. + EMAIL_PORT: "" + # -- Does the Email Server require TLS connection or not? Boolean (true | false) + EMAIL_USE_TLS: False # -- email of account to use for outgoing emails EMAIL_HOST_USER: "" # -- password of account to use for outgoing emails From 414de8d1bb15b780c17d8eac2faa73618f8004ec Mon Sep 17 00:00:00 2001 From: Joshua Seals Date: Tue, 30 Jan 2024 12:33:00 -0500 Subject: [PATCH 02/28] removing random file --- index.yaml | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 index.yaml diff --git a/index.yaml b/index.yaml deleted file mode 100644 index 7e216a4..0000000 --- a/index.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: v1 -entries: - postgresql: - - annotations: - category: Database - apiVersion: v2 - appVersion: 14.4.0 - created: "2023-08-04T13:47:09.925021-04:00" - dependencies: - - name: common - repository: https://charts.bitnami.com/bitnami - version: 1.x.x - description: PostgreSQL (Postgres) is an open source object-relational database - known for reliability and data integrity. ACID-compliant, it supports foreign - keys, joins, views, triggers and stored procedures. - digest: 0f28a70ea01674fe9754f442b81499cafd60bb5c3b9255dd95bd285a83f7a60a - home: https://github.com/bitnami/charts/tree/master/bitnami/postgresql - icon: https://bitnami.com/assets/stacks/postgresql/img/postgresql-stack-220x234.png - keywords: - - postgresql - - postgres - - database - - sql - - replication - - cluster - maintainers: - - name: Bitnami - url: https://github.com/bitnami/charts - - email: cedric@desaintmartin.fr - name: desaintmartin - name: postgresql - sources: - - https://github.com/bitnami/containers/tree/main/bitnami/postgresql - - https://www.postgresql.org/ - urls: - - https://helxplatform.github.io/helm-charts/charts/postgresql-11.6.26.tgz - version: 11.6.26 -generated: "2023-08-04T13:47:09.921534-04:00" From a5ef1ebd07a2a1a6e78b811814e83a47a024f4ce Mon Sep 17 00:00:00 2001 From: Joshua Seals <117867292+joshua-seals@users.noreply.github.com> Date: Thu, 8 Feb 2024 12:41:11 -0500 Subject: [PATCH 03/28] Update Chart.yaml Did not update when committing last time. --- Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index a83e774..1e71545 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -12,10 +12,10 @@ description: A Helm chart for Kubernetes type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 4.1.0 +version: 4.1.1 # This is the version number of the application being deployed. This version # number should be incremented each time you make changes to the application. -appVersion: 3.3.0 +appVersion: 3.3.1 dependencies: - name: postgresql condition: postgresql.enabled From bf029b4d0226c400632e1da94caedb1345af511e Mon Sep 17 00:00:00 2001 From: Joshua Seals Date: Thu, 22 Feb 2024 10:05:31 -0500 Subject: [PATCH 04/28] Removed all artillery related values --- README.md | 22 ++++++-------- templates/_helpers.tpl | 5 --- templates/configmap.yaml | 7 +---- templates/deployment.yaml | 14 --------- templates/tests/test-artillery.yaml | 47 ----------------------------- values.yaml | 7 +---- 6 files changed, 11 insertions(+), 91 deletions(-) delete mode 100644 templates/tests/test-artillery.yaml diff --git a/README.md b/README.md index 76eb384..1385914 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A Helm chart for Kubernetes -![Version: 3.2.3](https://img.shields.io/badge/Version-3.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square) +![Version: 4.1.1](https://img.shields.io/badge/Version-4.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) ## CI/CD @@ -32,10 +32,6 @@ Additionally there is a workflow that allows bumping the chart version, if this | apps.WEBTOP_PGID | string | `"1000"` | PGID variable in webtop specifies the GID to switch the user to after initialization. | | apps.WEBTOP_PUID | string | `"1000"` | PUID variable in webtop specifies the UID to switch the user to after initialization. | | appstoreEntrypointArgs | string | `"make start"` | Allow for a custom entrypoint command via the values file. | -| artillery.loadArrivalRate | int | `10` | | -| artillery.loadDuration | int | `10` | | -| artillery.loadTest | bool | `false` | | -| artillery.smokeTest | bool | `false` | When either smokeTest or loadTest is true, set CREATE_TEST_USERS, TEST_USERS_PATH under django settings. | | db | object | `{"host":"postgresql","name":"appstore","port":5432}` | appstore database settings | | debug | string | `""` | | | django.ALLOW_DJANGO_LOGIN | string | `""` | show Django log in fields (true | false) | @@ -43,17 +39,18 @@ Additionally there is a workflow that allows bumping the chart version, if this | django.APPSTORE_DJANGO_PASSWORD | string | `""` | | | django.APPSTORE_DJANGO_USERNAME | string | `"admin"` | | | django.AUTHORIZED_USERS | string | `""` | user emails for oauth providers | -| django.CREATE_TEST_USERS | string | `"false"` | create test users for load testing | +| django.AUTO_WHITELIST_PATTERNS | list | `[]` | Note that these only run on a user's primary alias. If a user has primary@cs.unc.edu as their primary alias, and secondary@renci.org as a secondary alias, they will only be whitelisted automatically if cs.unc.edu emails are allowed. ex. Whitelist all RENCI emails - "^[A-Za-z0-9._%+-]+@renci\\.org$" ex. Whitelist all UNC emails - "^[A-Za-z0-9._%+-]+@([A-Za-z0-9.-]+\\.)?unc\\.edu$" ex. Whitelist CS dept. (grad./prof.) UNC emails - "^[A-Za-z0-9._%+-]+@cs\\.unc\\.edu$" | | django.DEV_PHASE | string | `"live"` | should be 'live' unless you are doing some kind of development | | django.DOCKSTORE_APPS_BRANCH | string | `"v1.6.0"` | Specify the git branch to use for HeLx app specifications. When declaring 'tycho.externalAppRegistryRepo' leave this as an empty string. | +| django.EMAIL_HOST | string | `""` | Email Server host ie relay.unc.edu | relay.renci.org | | django.EMAIL_HOST_PASSWORD | string | `""` | password of account to use for outgoing emails | | django.EMAIL_HOST_USER | string | `""` | email of account to use for outgoing emails | +| django.EMAIL_PORT | string | `""` | Email Server port ie 25 or other. | +| django.EMAIL_USE_TLS | bool | `false` | Does the Email Server require TLS connection or not? Boolean (true | false) | | django.IMAGE_DOWNLOAD_URL | string | `""` | Specify URL to use for the "Image Download" link on the top part of website. | | django.RECIPIENT_EMAILS | string | `""` | list of appstore registration emails | | django.REMOVE_AUTHORIZED_USERS | string | `""` | user emails to remove from an already-existing database | -| django.SESSION_IDLE_TIMEOUT | int | `3600` | idle timeout for user web session | -| django.TEST_USERS_PATH | string | `"/usr/src/inst-mgmt/artillery-tests/payloads"` | parent directory where the users.txt would be mounted | -| django.TEST_USERS_SECRET | string | `"test-users-secret"` | secret file deployed on the cluster to fetch the test users | +| django.SESSION_IDLE_TIMEOUT | string | `"2592000"` | idle timeout for user web session | | djangoSettings | string | `"helx"` | set the theme for appstore (bdc, braini, restartr, scidas) | | extraEnv | object | `{}` | | | fetcherImage.pullPolicy | string | `"IfNotPresent"` | pull policy | @@ -109,6 +106,7 @@ Additionally there is a workflow that allows bumping the chart version, if this | oauth.GOOGLE_SITES | string | `""` | | | oauth.OAUTH_PROVIDERS | string | `""` | oauth providers separated by commas (google, github) | | podAnnotations | object | `{}` | | +| podSecurityContext | object | `{}` | | | postgresql | object | `{"audit":{"logConnections":true,"logHostname":true},"enabled":true,"global":{"postgresql":{"auth":{"database":"appstore-oauth","password":"renciAdmin","postgresPassword":"adminPass","username":"renci"}}},"networkPolicyEnabled":true,"persistence":{"existingClaim":"appstore-postgresql-pvc","storageClass":null},"primary":{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}},"volumePermissions":{"enabled":true}}` | postgresql settings | | postgresql.audit | object | `{"logConnections":true,"logHostname":true}` | postgresql logs | | postgresql.global.postgresql | object | `{"auth":{"database":"appstore-oauth","password":"renciAdmin","postgresPassword":"adminPass","username":"renci"}}` | postgresql credentials | @@ -132,9 +130,6 @@ Additionally there is a workflow that allows bumping the chart version, if this | saml.cache.storageClass | string | `""` | | | saml.cache.storageSize | string | `"20M"` | | | security.isolatedApps | bool | `true` | | -| securityContext.fsGroup | int | `0` | | -| securityContext.runAsGroup | int | `0` | | -| securityContext.runAsUser | int | `0` | | | service.name | string | `"http"` | | | service.port | int | `80` | | | service.type | string | `"ClusterIP"` | | @@ -167,9 +162,10 @@ Additionally there is a workflow that allows bumping the chart version, if this | userStorage.nfs.createPV | bool | `false` | | | userStorage.nfs.path | string | `nil` | | | userStorage.nfs.server | string | `nil` | | +| userStorage.retain | bool | `true` | | | userStorage.storageClass | string | `nil` | | | userStorage.storageSize | string | `"10Gi"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0) diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 0dafe33..04a73ea 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -51,11 +51,6 @@ app.kubernetes.io/name: {{ include "appstore.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} -{{- define "appstore.artillery.selectorLabels" -}} -app.kubernetes.io/name: {{ include "appstore.name" . }}-artillery -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end -}} - {{/* Create the name of the service account to use */}} diff --git a/templates/configmap.yaml b/templates/configmap.yaml index b3d1b80..09e7021 100644 --- a/templates/configmap.yaml +++ b/templates/configmap.yaml @@ -29,8 +29,6 @@ data: TYCHO_INIT_RESOURCES_CPUS: "{{ .Values.tycho.init.resources.cpus }}" TYCHO_INIT_RESOURCES_MEMORY: "{{ .Values.tycho.init.resources.memory }}" - CREATE_TEST_USERS: "{{ .Values.django.CREATE_TEST_USERS }}" - TEST_USERS_PATH: "{{ .Values.django.TEST_USERS_PATH }}" {{- if .Values.saml.cache.enabled }} SAML_METADATA_SOURCE: "{{ .Values.saml.cache.APPSTORE_DIRECTORY }}/{{ .Values.saml.cache.APPSTORE_FILE }}" {{- else if .Values.saml.AUTHORITY_URL }} @@ -43,7 +41,4 @@ data: SAML_AUTH_ENTITY_ID: "{{ .Values.saml.ENTITY_ID }}" GUNICORN_WORKERS: "{{ .Values.gunicorn.workers }}" SET_BUILD_ENV_FROM_FILE: "{{ .Values.SET_BUILD_ENV_FROM_FILE }}" - {{- if .Values.artillery.loadTest }} - ARTILLERY_DURATION: "{{ .Values.artillery.loadDuration }}" - ARTILLERY_ARRIVAL_RATE: "{{ .Values.artillery.loadArrivalRate }}" - {{- end }} + diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 1515831..ce2d303 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -66,16 +66,6 @@ spec: configMapKeyRef: key: LOG_LEVEL name: {{ include "appstore.fullname" . }}-env - - name: CREATE_TEST_USERS - valueFrom: - configMapKeyRef: - key: CREATE_TEST_USERS - name: {{ include "appstore.fullname" . }}-env - - name: TEST_USERS_PATH - valueFrom: - configMapKeyRef: - key: TEST_USERS_PATH - name: {{ include "appstore.fullname" . }}-env - name: DEBUG valueFrom: configMapKeyRef: @@ -468,10 +458,6 @@ spec: ports: - containerPort: 8000 volumeMounts: - {{- if or .Values.artillery.loadTest .Values.artillery.smokeTest }} - - mountPath: {{ .Values.django.TEST_USERS_PATH }}/test-users/ - name: test-users-volume - {{- end }} {{- if not .Values.postgresql.enabled }} - mountPath: /var/lib/sqlite3 name: appstore-sqlite-volume diff --git a/templates/tests/test-artillery.yaml b/templates/tests/test-artillery.yaml deleted file mode 100644 index 1121b39..0000000 --- a/templates/tests/test-artillery.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: {{ include "appstore.fullname" . }}-artillery-test - annotations: - "helm.sh/hook": test - labels: - {{- include "appstore.artillery.selectorLabels" . | nindent 4 }} - {{- with .Values.networkPolicyLabels }} - {{ toYaml . | nindent 4 }} - {{- end }} -spec: - serviceAccountName: {{ include "appstore.fullname" . }}-sa - {{- if .Values.securityContext }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - runAsGroup: {{ .Values.securityContext.runAsGroup }} - fsGroup: {{ .Values.securityContext.fsGroup }} - {{- end }} - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - command: ['/bin/bash', '-ec'] - args: - - "$RUN_SMOKE_TESTS && (export ARTILLERY_ENVIRONMENT=smoke && make test.artillery) || echo 'Skipping smoke tests.'; - $RUN_LOAD_TESTS && (export ARTILLERY_ENVIRONMENT=load && make test.artillery) || echo 'Skipping load tests'" - resources: - {{- toYaml .Values.resources | nindent 10 }} - envFrom: - - configMapRef: - name: {{ include "appstore.fullname" . }}-env - - secretRef: - name: {{ include "appstore.fullname" . }} - env: - - name: ARTILLERY_TARGET - value: http://{{ include "appstore.fullname" . }}:8000 - - name: SECRET_KEY - valueFrom: - secretKeyRef: - key: APPSTORE_SECRET_KEY - name: {{ include "appstore.fullname" . }} - - name: RUN_SMOKE_TESTS - value: "{{ .Values.artillery.smokeTest | default false }}" - - name: RUN_LOAD_TESTS - value: "{{ .Values.artillery.loadTest | default false }}" - restartPolicy: Never \ No newline at end of file diff --git a/values.yaml b/values.yaml index 3ffeb3e..95cef78 100644 --- a/values.yaml +++ b/values.yaml @@ -107,12 +107,7 @@ django: # ex. Whitelist all UNC emails - "^[A-Za-z0-9._%+-]+@([A-Za-z0-9.-]+\\.)?unc\\.edu$" # ex. Whitelist CS dept. (grad./prof.) UNC emails - "^[A-Za-z0-9._%+-]+@cs\\.unc\\.edu$" AUTO_WHITELIST_PATTERNS: [] - # -- create test users for load testing - CREATE_TEST_USERS: "false" - # -- parent directory where the users.txt would be mounted - TEST_USERS_PATH: "/usr/src/inst-mgmt/artillery-tests/payloads" - # -- secret file deployed on the cluster to fetch the test users - TEST_USERS_SECRET: "test-users-secret" + # -- user emails for oauth providers AUTHORIZED_USERS: "" # -- user emails to remove from an already-existing database From 3a4b8fe9bd2e1c445b90548bfd36b330080ed2ba Mon Sep 17 00:00:00 2001 From: Joshua Seals Date: Thu, 22 Feb 2024 10:40:50 -0500 Subject: [PATCH 05/28] Change appstore-chart version and remove errors in secrets template --- Chart.yaml | 2 +- templates/secrets.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 1e71545..a213f0d 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 4.1.1 +version: 4.1.2 # This is the version number of the application being deployed. This version # number should be incremented each time you make changes to the application. appVersion: 3.3.1 diff --git a/templates/secrets.yaml b/templates/secrets.yaml index 5f68e41..8c05cf7 100644 --- a/templates/secrets.yaml +++ b/templates/secrets.yaml @@ -32,17 +32,17 @@ data: EMAIL_HOST: {{ .Values.django.EMAIL_HOST | b64enc }} {{- else }} EMAIL_HOST: "" - {{-end }} + {{- end }} {{ if .Values.django.EMAIL_PORT }} EMAIL_HOST: {{ .Values.django.EMAIL_PORT | b64enc }} {{- else }} EMAIL_PORT: "" - {{-end }} + {{- end }} {{ if .Values.django.EMAIL_USE_TLS }} EMAIL_HOST: {{ .Values.django.EMAIL_USE_TLS | b64enc }} {{- else }} EMAIL_USE_TLS: "" - {{-end }} + {{- end }} {{ if .Values.django.EMAIL_HOST_PASSWORD }} EMAIL_HOST_PASSWORD: {{ .Values.django.EMAIL_HOST_PASSWORD | b64enc }} {{- else }} From 5cdee18667e5dcb71c3fc267a31ee1d07b30e483 Mon Sep 17 00:00:00 2001 From: Hoid Date: Mon, 4 Mar 2024 11:11:48 -0500 Subject: [PATCH 06/28] Initial commit --- README.md | 4 ++-- templates/secrets.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1385914..1261132 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A Helm chart for Kubernetes -![Version: 4.1.1](https://img.shields.io/badge/Version-4.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) +![Version: 4.1.2](https://img.shields.io/badge/Version-4.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) ## CI/CD @@ -167,5 +167,5 @@ Additionally there is a workflow that allows bumping the chart version, if this | userStorage.storageSize | string | `"10Gi"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0) +Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/templates/secrets.yaml b/templates/secrets.yaml index 8c05cf7..eb4f322 100644 --- a/templates/secrets.yaml +++ b/templates/secrets.yaml @@ -92,7 +92,7 @@ data: AMBASSADOR_ID: {{ .Values.global.ambassador_id | b64enc }} {{- end }} {{- if .Values.postgresql.global.postgresql }} - PG_DB_ENGINE: {{ .Values.db.host | b64enc }} + PG_DB_ENGINE: {{ "postgresql" | b64enc }} PG_DB_DATABASE: {{ .Values.postgresql.global.postgresql.auth.database | b64enc }} PG_DB_USERNAME: {{ .Values.postgresql.global.postgresql.auth.username | b64enc }} PG_DB_PASSWORD: {{ .Values.postgresql.global.postgresql.auth.password | b64enc }} From c3614e030f256dd6697a759144c1037baf0b27af Mon Sep 17 00:00:00 2001 From: Hoid Date: Mon, 4 Mar 2024 11:55:14 -0500 Subject: [PATCH 07/28] Update helm-docs and rerun --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1261132..8e75b83 100644 --- a/README.md +++ b/README.md @@ -167,5 +167,5 @@ Additionally there is a workflow that allows bumping the chart version, if this | userStorage.storageSize | string | `"10Gi"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) From e450b6951a2ef366afcfa172f7b3ae76e2bbd0a9 Mon Sep 17 00:00:00 2001 From: Hoid Date: Wed, 13 Mar 2024 10:55:19 -0400 Subject: [PATCH 08/28] Start by deleting unneeded secrets --- templates/cloud-top-secrets.yaml | 6 ------ templates/dicom-cloutop-secrets.yaml | 6 ------ templates/dicom-gh-secrets.yaml | 9 --------- templates/kstars-secrets.yaml | 7 ------- templates/napari-secrets.yaml | 6 ------ templates/scout-secrets.yaml | 6 ------ 6 files changed, 40 deletions(-) delete mode 100644 templates/cloud-top-secrets.yaml delete mode 100644 templates/dicom-cloutop-secrets.yaml delete mode 100644 templates/dicom-gh-secrets.yaml delete mode 100644 templates/kstars-secrets.yaml delete mode 100644 templates/napari-secrets.yaml delete mode 100644 templates/scout-secrets.yaml diff --git a/templates/cloud-top-secrets.yaml b/templates/cloud-top-secrets.yaml deleted file mode 100644 index 97e28f9..0000000 --- a/templates/cloud-top-secrets.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: cloud-top-env -data: - VNC_PW: {{ randAlphaNum 12 | b64enc | quote }} diff --git a/templates/dicom-cloutop-secrets.yaml b/templates/dicom-cloutop-secrets.yaml deleted file mode 100644 index 8a11e71..0000000 --- a/templates/dicom-cloutop-secrets.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: dicom-cloudtop-env -data: - VNC_PW: {{ randAlphaNum 12 | b64enc | quote }} diff --git a/templates/dicom-gh-secrets.yaml b/templates/dicom-gh-secrets.yaml deleted file mode 100644 index b415294..0000000 --- a/templates/dicom-gh-secrets.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: dicom-gh-env -data: - VNC_PW: {{ randAlphaNum 12 | b64enc | quote }} - {{- if .Values.apps.DICOMGH_GOOGLE_CLIENT_ID }} - CLIENT_ID: {{ .Values.apps.DICOMGH_GOOGLE_CLIENT_ID | b64enc }} - {{- end }} diff --git a/templates/kstars-secrets.yaml b/templates/kstars-secrets.yaml deleted file mode 100644 index f706248..0000000 --- a/templates/kstars-secrets.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: kstars-env -data: - VNC_PW: {{ randAlphaNum 12 | b64enc | quote }} - diff --git a/templates/napari-secrets.yaml b/templates/napari-secrets.yaml deleted file mode 100644 index 0a7c802..0000000 --- a/templates/napari-secrets.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: napari-env -data: - VNC_PW: {{ randAlphaNum 12 | b64enc | quote }} diff --git a/templates/scout-secrets.yaml b/templates/scout-secrets.yaml deleted file mode 100644 index 3296d74..0000000 --- a/templates/scout-secrets.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: scout-env -data: - VNC_PW: {{ randAlphaNum 12 | b64enc | quote }} From f2a741e017ef193877f9a642e2c6c1367bfea50f Mon Sep 17 00:00:00 2001 From: Hoid Date: Tue, 19 Mar 2024 10:03:22 -0400 Subject: [PATCH 09/28] Allow disabling of certain secrets --- Chart.yaml | 2 +- README.md | 6 +++++- templates/atlas-secrets.yaml | 2 ++ templates/deployment.yaml | 16 +++++----------- templates/imagej-secrets.yaml | 2 ++ templates/isolated-apps-network-policy.yaml | 2 +- templates/octave-secrets.yaml | 2 ++ templates/webtop-image-apps-secrets.yaml | 2 ++ templates/webtop-octave-secrets.yaml | 2 ++ templates/webtop-pgadmin-secrets.yaml | 2 ++ templates/webtop-secrets.yaml | 2 ++ values.yaml | 12 ++++++++++++ 12 files changed, 38 insertions(+), 14 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index a213f0d..1fa601e 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 4.1.2 +version: 4.1.3 # This is the version number of the application being deployed. This version # number should be incremented each time you make changes to the application. appVersion: 3.3.1 diff --git a/README.md b/README.md index 8e75b83..258a3b4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A Helm chart for Kubernetes -![Version: 4.1.2](https://img.shields.io/badge/Version-4.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) +![Version: 4.1.3](https://img.shields.io/badge/Version-4.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) ## CI/CD @@ -32,6 +32,7 @@ Additionally there is a workflow that allows bumping the chart version, if this | apps.WEBTOP_PGID | string | `"1000"` | PGID variable in webtop specifies the GID to switch the user to after initialization. | | apps.WEBTOP_PUID | string | `"1000"` | PUID variable in webtop specifies the UID to switch the user to after initialization. | | appstoreEntrypointArgs | string | `"make start"` | Allow for a custom entrypoint command via the values file. | +| atlas.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Atlas | | db | object | `{"host":"postgresql","name":"appstore","port":5432}` | appstore database settings | | debug | string | `""` | | | django.ALLOW_DJANGO_LOGIN | string | `""` | show Django log in fields (true | false) | @@ -72,6 +73,7 @@ Additionally there is a workflow that allows bumping the chart version, if this | imagePostgresql.repository | string | `"docker.io/bitnami/postgresql"` | repository where postgresql image is located | | imagePostgresql.tag | int | `11` | Image tag for postgresql, coordinate this with postgresql dependency. | | imagePullSecrets | list | `[]` | credentials for a private repo | +| imagej.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for ImageJ | | irods.BRAINI_RODS | string | `""` | | | irods.IROD_COLLECTIONS | string | `""` | | | irods.IROD_ZONE | string | `""` | | @@ -105,6 +107,7 @@ Additionally there is a workflow that allows bumping the chart version, if this | oauth.GOOGLE_SECRET | string | `""` | | | oauth.GOOGLE_SITES | string | `""` | | | oauth.OAUTH_PROVIDERS | string | `""` | oauth providers separated by commas (google, github) | +| octave.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Octave | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | | postgresql | object | `{"audit":{"logConnections":true,"logHostname":true},"enabled":true,"global":{"postgresql":{"auth":{"database":"appstore-oauth","password":"renciAdmin","postgresPassword":"adminPass","username":"renci"}}},"networkPolicyEnabled":true,"persistence":{"existingClaim":"appstore-postgresql-pvc","storageClass":null},"primary":{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}},"volumePermissions":{"enabled":true}}` | postgresql settings | @@ -165,6 +168,7 @@ Additionally there is a workflow that allows bumping the chart version, if this | userStorage.retain | bool | `true` | | | userStorage.storageClass | string | `nil` | | | userStorage.storageSize | string | `"10Gi"` | | +| webtop.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Webtop | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/templates/atlas-secrets.yaml b/templates/atlas-secrets.yaml index b36a279..fea0298 100644 --- a/templates/atlas-secrets.yaml +++ b/templates/atlas-secrets.yaml @@ -1,3 +1,4 @@ +{{- if .Values.atlas.enabled }} apiVersion: v1 kind: Secret metadata: @@ -21,3 +22,4 @@ data: {{- if .Values.apps.FLYWAY_DATASOURCE_USERNAME }} FLYWAY_DATASOURCE_USERNAME: {{ .Values.apps.FLYWAY_DATASOURCE_USERNAME | b64enc }} {{- end }} +{{- end }} \ No newline at end of file diff --git a/templates/deployment.yaml b/templates/deployment.yaml index ce2d303..0a6c524 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: command: - sh - -c - - until pg_isready -h {{ .Release.Name }}-postgresql -p 5432 -U postgres; do echo "waiting for postgresql"; sleep 5; done + - until pg_isready -h {{ include "appstore.fullname" . }}-postgresql -p 5432 -U postgres; do echo "waiting for postgresql"; sleep 5; done {{- end }} containers: - name: {{ .Chart.Name }} @@ -354,20 +354,14 @@ spec: key: PG_DB_ENGINE name: {{ include "appstore.fullname" . }} - name: PG_DB_DATABASE - valueFrom: - secretKeyRef: - key: PG_DB_DATABASE - name: {{ include "appstore.fullname" . }} + value: postgres - name: PG_DB_USERNAME - valueFrom: - secretKeyRef: - key: PG_DB_USERNAME - name: {{ include "appstore.fullname" . }} + value: postgres - name: PG_DB_PASSWORD valueFrom: secretKeyRef: - key: PG_DB_PASSWORD - name: {{ include "appstore.fullname" . }} + key: postgres-password + name: {{ include "appstore.fullname" . }}-postgresql - name: PG_DB_HOST valueFrom: secretKeyRef: diff --git a/templates/imagej-secrets.yaml b/templates/imagej-secrets.yaml index 19c5093..827bb7f 100644 --- a/templates/imagej-secrets.yaml +++ b/templates/imagej-secrets.yaml @@ -1,6 +1,8 @@ +{{- if .Values.imagej.enabled }} apiVersion: v1 kind: Secret metadata: name: imagej-env data: VNC_PW: {{ randAlphaNum 12 | b64enc | quote }} +{{- end }} \ No newline at end of file diff --git a/templates/isolated-apps-network-policy.yaml b/templates/isolated-apps-network-policy.yaml index ec699d9..e49ccdc 100644 --- a/templates/isolated-apps-network-policy.yaml +++ b/templates/isolated-apps-network-policy.yaml @@ -2,7 +2,7 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: default-deny-ingress + name: {{ include "appstore.fullname" . }}-default-deny-ingress spec: podSelector: matchLabels: diff --git a/templates/octave-secrets.yaml b/templates/octave-secrets.yaml index 925c9d1..c5f9cf8 100644 --- a/templates/octave-secrets.yaml +++ b/templates/octave-secrets.yaml @@ -1,6 +1,8 @@ +{{- if .Values.octave.enabled }} apiVersion: v1 kind: Secret metadata: name: octave-env data: VNC_PW: {{ randAlphaNum 12 | b64enc | quote }} +{{- end }} \ No newline at end of file diff --git a/templates/webtop-image-apps-secrets.yaml b/templates/webtop-image-apps-secrets.yaml index 2a9c61e..f9fa68b 100644 --- a/templates/webtop-image-apps-secrets.yaml +++ b/templates/webtop-image-apps-secrets.yaml @@ -1,3 +1,4 @@ +{{- if .Values.webtop.enabled }} apiVersion: v1 kind: Secret metadata: @@ -5,3 +6,4 @@ metadata: data: PUID: {{ .Values.apps.WEBTOP_PUID | b64enc | quote }} PGID: {{ .Values.apps.WEBTOP_PGID | b64enc | quote }} +{{- end }} \ No newline at end of file diff --git a/templates/webtop-octave-secrets.yaml b/templates/webtop-octave-secrets.yaml index aac00a9..355f93c 100644 --- a/templates/webtop-octave-secrets.yaml +++ b/templates/webtop-octave-secrets.yaml @@ -1,3 +1,4 @@ +{{- if .Values.webtop.enabled }} apiVersion: v1 kind: Secret metadata: @@ -5,3 +6,4 @@ metadata: data: PUID: {{ .Values.apps.WEBTOP_PUID | b64enc | quote }} PGID: {{ .Values.apps.WEBTOP_PGID | b64enc | quote }} +{{- end }} \ No newline at end of file diff --git a/templates/webtop-pgadmin-secrets.yaml b/templates/webtop-pgadmin-secrets.yaml index a94c346..5bc92da 100644 --- a/templates/webtop-pgadmin-secrets.yaml +++ b/templates/webtop-pgadmin-secrets.yaml @@ -1,3 +1,4 @@ +{{- if .Values.webtop.enabled }} apiVersion: v1 kind: Secret metadata: @@ -5,3 +6,4 @@ metadata: data: PUID: {{ .Values.apps.WEBTOP_PUID | b64enc | quote }} PGID: {{ .Values.apps.WEBTOP_PGID | b64enc | quote }} +{{- end }} \ No newline at end of file diff --git a/templates/webtop-secrets.yaml b/templates/webtop-secrets.yaml index 183a225..defaac5 100644 --- a/templates/webtop-secrets.yaml +++ b/templates/webtop-secrets.yaml @@ -1,3 +1,4 @@ +{{- if .Values.webtop.enabled }} apiVersion: v1 kind: Secret metadata: @@ -5,3 +6,4 @@ metadata: data: PUID: {{ .Values.apps.WEBTOP_PUID | b64enc | quote }} PGID: {{ .Values.apps.WEBTOP_PGID | b64enc | quote }} +{{- end }} \ No newline at end of file diff --git a/values.yaml b/values.yaml index 95cef78..7f77f2c 100644 --- a/values.yaml +++ b/values.yaml @@ -190,6 +190,18 @@ irodsUnbranded: IROD_USER_VALUES: {} NFSRODS_HOST: "" +atlas: + # -- Disabling will turn off the creation of secrets/configmaps for Atlas + enabled: true +imagej: + # -- Disabling will turn off the creation of secrets/configmaps for ImageJ + enabled: true +octave: + # -- Disabling will turn off the creation of secrets/configmaps for Octave + enabled: true +webtop: + # -- Disabling will turn off the creation of secrets/configmaps for Webtop + enabled: true apps: DICOMGH_GOOGLE_CLIENT_ID: "" From 2aecbfd7335a17b9cf37ced20f3b9fcb69b6d0ca Mon Sep 17 00:00:00 2001 From: Hoid Date: Fri, 22 Mar 2024 10:28:07 -0400 Subject: [PATCH 10/28] Undo changes to deployment.yaml and some values, remove global in secrets.yaml --- Chart.yaml | 2 +- README.md | 6 +++--- templates/deployment.yaml | 16 +++++++++++----- templates/secrets.yaml | 6 +++--- values.yaml | 13 ++++++------- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 1fa601e..b89a2d5 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 4.1.3 +version: 4.1.4 # This is the version number of the application being deployed. This version # number should be incremented each time you make changes to the application. appVersion: 3.3.1 diff --git a/README.md b/README.md index 258a3b4..2e4bb6c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A Helm chart for Kubernetes -![Version: 4.1.3](https://img.shields.io/badge/Version-4.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) +![Version: 4.1.4](https://img.shields.io/badge/Version-4.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) ## CI/CD @@ -110,9 +110,9 @@ Additionally there is a workflow that allows bumping the chart version, if this | octave.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Octave | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | -| postgresql | object | `{"audit":{"logConnections":true,"logHostname":true},"enabled":true,"global":{"postgresql":{"auth":{"database":"appstore-oauth","password":"renciAdmin","postgresPassword":"adminPass","username":"renci"}}},"networkPolicyEnabled":true,"persistence":{"existingClaim":"appstore-postgresql-pvc","storageClass":null},"primary":{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}},"volumePermissions":{"enabled":true}}` | postgresql settings | +| postgresql | object | `{"audit":{"logConnections":true,"logHostname":true},"auth":{"database":"appstore-oauth","password":"renciAdmin","postgresPassword":"adminPass","username":"renci"},"enabled":true,"networkPolicyEnabled":true,"persistence":{"existingClaim":"appstore-postgresql-pvc","storageClass":null},"primary":{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}},"volumePermissions":{"enabled":true}}` | postgresql settings | | postgresql.audit | object | `{"logConnections":true,"logHostname":true}` | postgresql logs | -| postgresql.global.postgresql | object | `{"auth":{"database":"appstore-oauth","password":"renciAdmin","postgresPassword":"adminPass","username":"renci"}}` | postgresql credentials | +| postgresql.auth.postgresPassword | string | `"adminPass"` | postgresql credentials | | postgresql.networkPolicyEnabled | bool | `true` | enable/disable postgresql network policy, allows traffic to and from appstore pod only. | | postgresql.persistence | object | `{"existingClaim":"appstore-postgresql-pvc","storageClass":null}` | postgresql persistence storage | | postgresql.primary | object | `{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}}` | postgresql labels | diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 0a6c524..ce2d303 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: command: - sh - -c - - until pg_isready -h {{ include "appstore.fullname" . }}-postgresql -p 5432 -U postgres; do echo "waiting for postgresql"; sleep 5; done + - until pg_isready -h {{ .Release.Name }}-postgresql -p 5432 -U postgres; do echo "waiting for postgresql"; sleep 5; done {{- end }} containers: - name: {{ .Chart.Name }} @@ -354,14 +354,20 @@ spec: key: PG_DB_ENGINE name: {{ include "appstore.fullname" . }} - name: PG_DB_DATABASE - value: postgres + valueFrom: + secretKeyRef: + key: PG_DB_DATABASE + name: {{ include "appstore.fullname" . }} - name: PG_DB_USERNAME - value: postgres + valueFrom: + secretKeyRef: + key: PG_DB_USERNAME + name: {{ include "appstore.fullname" . }} - name: PG_DB_PASSWORD valueFrom: secretKeyRef: - key: postgres-password - name: {{ include "appstore.fullname" . }}-postgresql + key: PG_DB_PASSWORD + name: {{ include "appstore.fullname" . }} - name: PG_DB_HOST valueFrom: secretKeyRef: diff --git a/templates/secrets.yaml b/templates/secrets.yaml index eb4f322..552e2f9 100644 --- a/templates/secrets.yaml +++ b/templates/secrets.yaml @@ -93,9 +93,9 @@ data: {{- end }} {{- if .Values.postgresql.global.postgresql }} PG_DB_ENGINE: {{ "postgresql" | b64enc }} - PG_DB_DATABASE: {{ .Values.postgresql.global.postgresql.auth.database | b64enc }} - PG_DB_USERNAME: {{ .Values.postgresql.global.postgresql.auth.username | b64enc }} - PG_DB_PASSWORD: {{ .Values.postgresql.global.postgresql.auth.password | b64enc }} + PG_DB_DATABASE: {{ .Values.postgresql.auth.database | b64enc }} + PG_DB_USERNAME: {{ .Values.postgresql.auth.username | b64enc }} + PG_DB_PASSWORD: {{ .Values.postgresql.auth.password | b64enc }} PG_DB_HOST: {{ printf "%s-%s" .Release.Name .Values.db.host | b64enc }} PG_DB_PORT: {{ .Values.db.port | toString | b64enc }} {{- end }} diff --git a/values.yaml b/values.yaml index 7f77f2c..17b54bb 100644 --- a/values.yaml +++ b/values.yaml @@ -330,14 +330,13 @@ db: # -- postgresql settings postgresql: enabled: true - global: + auth: # -- postgresql credentials - postgresql: - auth: - postgresPassword: "adminPass" - database: "appstore-oauth" - username: "renci" - password: "renciAdmin" + postgresPassword: "adminPass" + database: "appstore-oauth" + username: "renci" + password: "renciAdmin" + # -- postgresql labels primary: labels: {"np-label": "appstore-db"} From 15a21cde1e5053e0c5b76720ef7ef7f97d12c94a Mon Sep 17 00:00:00 2001 From: Hoid Date: Fri, 22 Mar 2024 10:39:50 -0400 Subject: [PATCH 11/28] Add existingSecret value and comment postgres password values --- README.md | 4 ++-- values.yaml | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2e4bb6c..3a4e9a5 100644 --- a/README.md +++ b/README.md @@ -110,9 +110,9 @@ Additionally there is a workflow that allows bumping the chart version, if this | octave.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Octave | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | -| postgresql | object | `{"audit":{"logConnections":true,"logHostname":true},"auth":{"database":"appstore-oauth","password":"renciAdmin","postgresPassword":"adminPass","username":"renci"},"enabled":true,"networkPolicyEnabled":true,"persistence":{"existingClaim":"appstore-postgresql-pvc","storageClass":null},"primary":{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}},"volumePermissions":{"enabled":true}}` | postgresql settings | +| postgresql | object | `{"audit":{"logConnections":true,"logHostname":true},"auth":{"database":"appstore-oauth","username":"renci"},"enabled":true,"networkPolicyEnabled":true,"persistence":{"existingClaim":"appstore-postgresql-pvc","storageClass":null},"primary":{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}},"volumePermissions":{"enabled":true}}` | postgresql settings | | postgresql.audit | object | `{"logConnections":true,"logHostname":true}` | postgresql logs | -| postgresql.auth.postgresPassword | string | `"adminPass"` | postgresql credentials | +| postgresql.auth.database | string | `"appstore-oauth"` | postgresql credentials | | postgresql.networkPolicyEnabled | bool | `true` | enable/disable postgresql network policy, allows traffic to and from appstore pod only. | | postgresql.persistence | object | `{"existingClaim":"appstore-postgresql-pvc","storageClass":null}` | postgresql persistence storage | | postgresql.primary | object | `{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}}` | postgresql labels | diff --git a/values.yaml b/values.yaml index 17b54bb..e5c773c 100644 --- a/values.yaml +++ b/values.yaml @@ -332,10 +332,13 @@ postgresql: enabled: true auth: # -- postgresql credentials - postgresPassword: "adminPass" database: "appstore-oauth" username: "renci" - password: "renciAdmin" + # -- Password and Postgres Password. Set these values if not using an existingSecret. + # password: "renciAdmin" + # postgresPassword: "adminPass" + # -- Set this to the name of an existing secret in the namespace, if using one. + # existingSecret: # -- postgresql labels primary: From 5810737373440ee5e240852807ce70d5bd6b0ef7 Mon Sep 17 00:00:00 2001 From: Hoid Date: Wed, 3 Apr 2024 16:11:02 -0400 Subject: [PATCH 12/28] Remove host as a necessary value and part of PG_DB_HOST in secret --- Chart.yaml | 2 +- README.md | 4 ++-- templates/deployment.yaml | 10 +++++++++- templates/secrets.yaml | 2 +- values.yaml | 3 +-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index b89a2d5..96e1698 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 4.1.4 +version: 4.1.5 # This is the version number of the application being deployed. This version # number should be incremented each time you make changes to the application. appVersion: 3.3.1 diff --git a/README.md b/README.md index 3a4e9a5..32ab0a4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A Helm chart for Kubernetes -![Version: 4.1.4](https://img.shields.io/badge/Version-4.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) +![Version: 4.1.5](https://img.shields.io/badge/Version-4.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) ## CI/CD @@ -33,7 +33,7 @@ Additionally there is a workflow that allows bumping the chart version, if this | apps.WEBTOP_PUID | string | `"1000"` | PUID variable in webtop specifies the UID to switch the user to after initialization. | | appstoreEntrypointArgs | string | `"make start"` | Allow for a custom entrypoint command via the values file. | | atlas.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Atlas | -| db | object | `{"host":"postgresql","name":"appstore","port":5432}` | appstore database settings | +| db | object | `{"name":"appstore","port":5432}` | appstore database settings | | debug | string | `""` | | | django.ALLOW_DJANGO_LOGIN | string | `""` | show Django log in fields (true | false) | | django.ALLOW_SAML_LOGIN | string | `""` | show SAML log in fields (true | false) | diff --git a/templates/deployment.yaml b/templates/deployment.yaml index ce2d303..b9517ce 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: command: - sh - -c - - until pg_isready -h {{ .Release.Name }}-postgresql -p 5432 -U postgres; do echo "waiting for postgresql"; sleep 5; done + - until pg_isready -h {{ include "appstore.fullname" . }}-postgresql -p 5432 -U postgres; do echo "waiting for postgresql"; sleep 5; done {{- end }} containers: - name: {{ .Chart.Name }} @@ -363,11 +363,19 @@ spec: secretKeyRef: key: PG_DB_USERNAME name: {{ include "appstore.fullname" . }} + {{- if .Values.postgresql.auth.existingSecret }} + - name: PG_DB_PASSWORD + valueFrom: + secretKeyRef: + key: postgres-password + name: {{ .Values.postgresql.auth.existingSecret }} + {{- else }} - name: PG_DB_PASSWORD valueFrom: secretKeyRef: key: PG_DB_PASSWORD name: {{ include "appstore.fullname" . }} + {{- end }} - name: PG_DB_HOST valueFrom: secretKeyRef: diff --git a/templates/secrets.yaml b/templates/secrets.yaml index 552e2f9..cf3ed84 100644 --- a/templates/secrets.yaml +++ b/templates/secrets.yaml @@ -96,7 +96,7 @@ data: PG_DB_DATABASE: {{ .Values.postgresql.auth.database | b64enc }} PG_DB_USERNAME: {{ .Values.postgresql.auth.username | b64enc }} PG_DB_PASSWORD: {{ .Values.postgresql.auth.password | b64enc }} - PG_DB_HOST: {{ printf "%s-%s" .Release.Name .Values.db.host | b64enc }} + PG_DB_HOST: {{ printf "%s-%s" ( include "appstore.fullname" . ) "postgresql" | b64enc }} PG_DB_PORT: {{ .Values.db.port | toString | b64enc }} {{- end }} {{- if .Values.postgresql.enabled }} diff --git a/values.yaml b/values.yaml index e5c773c..e8a53d7 100644 --- a/values.yaml +++ b/values.yaml @@ -324,7 +324,6 @@ global: # -- appstore database settings db: name: appstore - host: postgresql port: 5432 # -- postgresql settings @@ -337,7 +336,7 @@ postgresql: # -- Password and Postgres Password. Set these values if not using an existingSecret. # password: "renciAdmin" # postgresPassword: "adminPass" - # -- Set this to the name of an existing secret in the namespace, if using one. + # -- Set this to the name of an existing secret in the namespace, if using one. Otherwise keep commented out. # existingSecret: # -- postgresql labels From 3092f8518c77af351c8cdbac699d7a69b0d95331 Mon Sep 17 00:00:00 2001 From: Patrick Hachicho Date: Mon, 15 Apr 2024 23:41:57 -0400 Subject: [PATCH 13/28] linked and also deleted bump chart --- .github/workflows/bump-chart.yml | 159 ---------------------- .github/workflows/trigger-helm-charts.yml | 17 +-- 2 files changed, 5 insertions(+), 171 deletions(-) delete mode 100644 .github/workflows/bump-chart.yml diff --git a/.github/workflows/bump-chart.yml b/.github/workflows/bump-chart.yml deleted file mode 100644 index 6014c7c..0000000 --- a/.github/workflows/bump-chart.yml +++ /dev/null @@ -1,159 +0,0 @@ -# Convenience workflow responsible for adjusting -# Chart.yml 'version' & 'appVersion' fields to the -# corresponding app:[version-tag] -# and incrementing 'version' field by 1 in the patch section. - -# Additionally, helm-docs is run to autogenerate README.md -# updates and github badges corresponding to new Chart.yml. - -# This workflow will uses the github api to get -# latest app release tag information and update 'appVersion' field or -# will take user input for the appVersion field. -# -# Eg. Chart.yml -# name: appstore -# version: 1.7.0 -> 1.7.1 -> 1.7.2 -# appVersion: 2.1.0 -> 2.2.1 -> 3.0.0 -# -# - -name: Bump-Chart-Versions -on: - workflow_dispatch: - inputs: - appVersion: - description: 'Application version for Helm Chart to use. If unset, workflow uses github api to obtain newest version tag.' - required: false - type: string - chartVersion: - description: 'With every change to the helm chart, the chart version should be incremented. If unset- patch increments by +1.' - required: false - type: string - -jobs: - bump-app-version: - runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v3 - with: - ref: ${{ github.head_ref }} - fetch-depth: 0 - - - name: Install yq Utility - run: | - sudo wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 - - - name: Check appVersion Inputs - id: checkAppVersion - shell: bash - run: | - if [ "${{ inputs.appVersion }}" == "" ]; then - echo "appVersionPresent=NO" >> $GITHUB_OUTPUT - else - echo "appVersionPresent=YES" >> $GITHUB_OUTPUT - fi - - # The APPVERSION code is brittle and could easily break. - # Additionally, github api doesn't support getting the latest tag - # So here we rely on the 'release' version to get the latest tag. - # We can mostly trust this as the application should have been updated - # automatically by github actions for a new release and new tag. - - name: Query Github and Set Latest AppVersion Tag - env: - GH_TOKEN: ${{ github.token }} - # Because the tag uses "v2.0.0" the awk Field to split on is 'v'. -Fv was used but is now unnecessary. - run: | - APPVERSION=$(gh release view -R github.com/helxplatform/appstore | grep 'tag:' | awk '{print $2}') \ - yq --inplace '.appVersion = env(APPVERSION)' Chart.yaml - if: ( steps.checkAppVersion.outputs.appVersionPresent == 'NO') - - - name: Set User Specified AppVersion Tag - env: - APPVERSION: ${{ inputs.appVersion }} - run: | - APP=$(echo $APPVERSION) yq --inplace '.appVersion = env(APP)' Chart.yaml - if: ( steps.checkAppVersion.outputs.appVersionPresent == 'YES') - - - name: Check chartVersion Inputs - id: checkChartVersion - shell: bash - run: | - if [ "${{ inputs.chartVersion }}" == "" ]; then - echo "chartVersionPresent=NO" >> $GITHUB_OUTPUT - else - echo "chartVersionPresent=YES" >> $GITHUB_OUTPUT - fi - - # Awk magic below - # Ref: https://www.reddit.com/r/bash/comments/78rxyv/how_to_make_awk_return_an_integer/ - # We obtain version major.minor.patch, and always increment patch by 1. - - name: AutoIncrement Chart Version - run: | - MAJOR=$(yq '.version' Chart.yaml | awk -F. '{ print $1 }') - MINOR=$(yq '.version' Chart.yaml | awk -F. '{ print $2 }') - BUMP_PATCH=$(yq '.version' Chart.yaml | awk -F. '{print int($3) + 1}') - CHARTVERSION=$(echo $MAJOR.$MINOR.$BUMP_PATCH) yq --inplace '.version = env(CHARTVERSION)' Chart.yaml - if: ( steps.checkChartVersion.outputs.chartVersionPresent == 'NO') - - - name: Set User Specified chart version - env: - CHARTVERSION: ${{ inputs.chartVersion }} - run: | - CHART=$(echo $CHARTVERSION) yq --inplace '.version = env(CHART)' Chart.yaml - if: ( steps.checkChartVersion.outputs.chartVersionPresent == 'YES') - -############################# Lint-Test ######################### - - name: Set up Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.2 - - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - check-latest: true - - - name: Set up chart-testing - uses: helm/chart-testing-action@v2.4.0 - - - name: Run chart-testing (list-changed) - id: list-changed - run: | - changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) - if [[ -n "$changed" ]]; then - echo "changed=true" >> "$GITHUB_OUTPUT" - fi - - - name: Run chart-testing (lint) - if: steps.list-changed.outputs.changed == 'true' - run: ct lint --target-branch ${{ github.event.repository.default_branch }} - - - name: Create kind cluster - if: steps.list-changed.outputs.changed == 'true' - uses: helm/kind-action@v1.4.0 - - - name: Run chart-testing (install) - if: steps.list-changed.outputs.changed == 'true' - run: ct install --target-branch ${{ github.event.repository.default_branch }} - -############################## Generate Docs and Push ########################################## - - name: Download Helm-Docs - run: | - wget https://github.com/norwoodj/helm-docs/releases/download/v1.11.0/helm-docs_1.11.0_Linux_x86_64.tar.gz - tar -xvf helm-docs_1.11.0_Linux_x86_64.tar.gz - mv helm-docs /usr/local/bin/ - chmod +x /usr/local/bin/helm-docs - - - name: Create Helm-Docs README.md - run: | - helm-docs - - - name: Commit Chart.yaml Changes - uses: EndBug/add-and-commit@v9 - env: - GH_TOKEN: ${{ github.token }} - with: - author_name: Actions_${{ github.actor}} - message: 'Bumping appVersion and chart version, updating readme' - add: 'Chart.yaml README.md' diff --git a/.github/workflows/trigger-helm-charts.yml b/.github/workflows/trigger-helm-charts.yml index f0c853c..c885086 100644 --- a/.github/workflows/trigger-helm-charts.yml +++ b/.github/workflows/trigger-helm-charts.yml @@ -13,18 +13,11 @@ on: - .github/* jobs: trigger-helm-charts: - runs-on: ubuntu-latest - steps: - - - name: Trigger Helm-Charts Workflow - env: - GH_TOKEN: ${{ secrets.GH_TOKEN }} - run: | - gh --repo https://github.com/helxplatform/helm-charts \ - workflow run package-index.yml \ - -f appRepo=${{ github.repository }} \ - -f actor=${{ github.actor }} \ - --ref develop + uses: helxplatform/helx-github-actions/.github/workflows/trigger-helm-charts.yml@main + secrets: inherit + with: + appRepo: ${{ github.repository }} + actor: ${{ github.actor }} From 4bbe902bf2fa396ce592581a936dbd160b9edf55 Mon Sep 17 00:00:00 2001 From: Patrick Hachicho Date: Tue, 16 Apr 2024 13:19:27 -0400 Subject: [PATCH 14/28] added run-helm-docs --- .github/workflows/run-helm-docs.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/run-helm-docs.yml diff --git a/.github/workflows/run-helm-docs.yml b/.github/workflows/run-helm-docs.yml new file mode 100644 index 0000000..361e171 --- /dev/null +++ b/.github/workflows/run-helm-docs.yml @@ -0,0 +1,13 @@ +# On pull request, ensure helm-docs is being run + +name: Run-Helm-Docs +on: + pull_request: + types: [ opened, synchronize ] + paths-ignore: + - .github/workflows/* + - .github/* +jobs: + run-helm-docs: + uses: helxplatform/helx-github-actions/.github/workflows/run-helm-docs.yml@main + secrets: inherit \ No newline at end of file From f7ae0bfdc0629e9ac9ca6e449d8ae3051f596e4f Mon Sep 17 00:00:00 2001 From: Hoid Date: Wed, 17 Apr 2024 11:09:22 -0400 Subject: [PATCH 15/28] Put pgadmin-env behind flag like other secrets --- README.md | 1 + templates/pgadmin-secrets.yaml | 2 ++ values.yaml | 3 +++ 3 files changed, 6 insertions(+) diff --git a/README.md b/README.md index 32ab0a4..b909ddc 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,7 @@ Additionally there is a workflow that allows bumping the chart version, if this | oauth.GOOGLE_SITES | string | `""` | | | oauth.OAUTH_PROVIDERS | string | `""` | oauth providers separated by commas (google, github) | | octave.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Octave | +| pgadmin.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for PgAdmin | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | | postgresql | object | `{"audit":{"logConnections":true,"logHostname":true},"auth":{"database":"appstore-oauth","username":"renci"},"enabled":true,"networkPolicyEnabled":true,"persistence":{"existingClaim":"appstore-postgresql-pvc","storageClass":null},"primary":{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}},"volumePermissions":{"enabled":true}}` | postgresql settings | diff --git a/templates/pgadmin-secrets.yaml b/templates/pgadmin-secrets.yaml index 58d77ee..e790e02 100644 --- a/templates/pgadmin-secrets.yaml +++ b/templates/pgadmin-secrets.yaml @@ -1,3 +1,4 @@ +{{- if .Values.pgadmin.enabled }} apiVersion: v1 kind: Secret metadata: @@ -10,3 +11,4 @@ data: HELX_DB_HOSTNAME: {{ .Values.apps.HELX_DB_HOSTNAME | b64enc | quote }} PGADMIN_DISABLE_POSTFIX: {{ .Values.apps.PGADMIN_DISABLE_POSTFIX | b64enc | quote }} PGADMIN_LISTEN_PORT: {{ .Values.apps.PGADMIN_LISTEN_PORT | b64enc | quote }} +{{- end }} \ No newline at end of file diff --git a/values.yaml b/values.yaml index e8a53d7..5e1e7ff 100644 --- a/values.yaml +++ b/values.yaml @@ -199,6 +199,9 @@ imagej: octave: # -- Disabling will turn off the creation of secrets/configmaps for Octave enabled: true +pgadmin: + # -- Disabling will turn off the creation of secrets/configmaps for PgAdmin + enabled: true webtop: # -- Disabling will turn off the creation of secrets/configmaps for Webtop enabled: true From c0b124088c77c5ea64541bec8ba7ee8634113c12 Mon Sep 17 00:00:00 2001 From: Hoid Date: Wed, 17 Apr 2024 12:12:29 -0400 Subject: [PATCH 16/28] Ensure backwards compatibility --- Chart.yaml | 2 +- README.md | 6 +++--- templates/secrets.yaml | 6 +++--- values.yaml | 16 +++++++--------- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 96e1698..0a9a607 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 4.1.5 +version: 4.1.6 # This is the version number of the application being deployed. This version # number should be incremented each time you make changes to the application. appVersion: 3.3.1 diff --git a/README.md b/README.md index b909ddc..a79b336 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A Helm chart for Kubernetes -![Version: 4.1.5](https://img.shields.io/badge/Version-4.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) +![Version: 4.1.6](https://img.shields.io/badge/Version-4.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) ## CI/CD @@ -111,9 +111,9 @@ Additionally there is a workflow that allows bumping the chart version, if this | pgadmin.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for PgAdmin | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | -| postgresql | object | `{"audit":{"logConnections":true,"logHostname":true},"auth":{"database":"appstore-oauth","username":"renci"},"enabled":true,"networkPolicyEnabled":true,"persistence":{"existingClaim":"appstore-postgresql-pvc","storageClass":null},"primary":{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}},"volumePermissions":{"enabled":true}}` | postgresql settings | +| postgresql | object | `{"audit":{"logConnections":true,"logHostname":true},"enabled":true,"global":{"postgresql":{"auth":{"database":"appstore-oauth","password":"renciAdmin","postgresPassword":"adminPass","username":"renci"}}},"networkPolicyEnabled":true,"persistence":{"existingClaim":"appstore-postgresql-pvc","storageClass":null},"primary":{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}},"volumePermissions":{"enabled":true}}` | postgresql settings | | postgresql.audit | object | `{"logConnections":true,"logHostname":true}` | postgresql logs | -| postgresql.auth.database | string | `"appstore-oauth"` | postgresql credentials | +| postgresql.global.postgresql | object | `{"auth":{"database":"appstore-oauth","password":"renciAdmin","postgresPassword":"adminPass","username":"renci"}}` | postgresql credentials | | postgresql.networkPolicyEnabled | bool | `true` | enable/disable postgresql network policy, allows traffic to and from appstore pod only. | | postgresql.persistence | object | `{"existingClaim":"appstore-postgresql-pvc","storageClass":null}` | postgresql persistence storage | | postgresql.primary | object | `{"labels":{"np-label":"appstore-db"},"podLabels":{"np-label":"appstore-db"}}` | postgresql labels | diff --git a/templates/secrets.yaml b/templates/secrets.yaml index cf3ed84..a97f725 100644 --- a/templates/secrets.yaml +++ b/templates/secrets.yaml @@ -93,9 +93,9 @@ data: {{- end }} {{- if .Values.postgresql.global.postgresql }} PG_DB_ENGINE: {{ "postgresql" | b64enc }} - PG_DB_DATABASE: {{ .Values.postgresql.auth.database | b64enc }} - PG_DB_USERNAME: {{ .Values.postgresql.auth.username | b64enc }} - PG_DB_PASSWORD: {{ .Values.postgresql.auth.password | b64enc }} + PG_DB_DATABASE: {{ .Values.postgresql.global.postgresql.auth.database | b64enc }} + PG_DB_USERNAME: {{ .Values.postgresql.global.postgresql.auth.username | b64enc }} + PG_DB_PASSWORD: {{ .Values.postgresql.global.postgresql.auth.password | b64enc }} PG_DB_HOST: {{ printf "%s-%s" ( include "appstore.fullname" . ) "postgresql" | b64enc }} PG_DB_PORT: {{ .Values.db.port | toString | b64enc }} {{- end }} diff --git a/values.yaml b/values.yaml index 5e1e7ff..7111273 100644 --- a/values.yaml +++ b/values.yaml @@ -332,16 +332,14 @@ db: # -- postgresql settings postgresql: enabled: true - auth: + global: # -- postgresql credentials - database: "appstore-oauth" - username: "renci" - # -- Password and Postgres Password. Set these values if not using an existingSecret. - # password: "renciAdmin" - # postgresPassword: "adminPass" - # -- Set this to the name of an existing secret in the namespace, if using one. Otherwise keep commented out. - # existingSecret: - + postgresql: + auth: + database: "appstore-oauth" + username: "renci" + password: "renciAdmin" + postgresPassword: "adminPass" # -- postgresql labels primary: labels: {"np-label": "appstore-db"} From c1dbd82d3f511960aeb89549016f9b1c4b39a3de Mon Sep 17 00:00:00 2001 From: Actions_Hoid Date: Wed, 24 Apr 2024 15:22:56 +0000 Subject: [PATCH 17/28] Running helm-docs and adding updated Readme.mds if any --- LICENSE | 695 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- README.md | 2 +- 2 files changed, 675 insertions(+), 22 deletions(-) diff --git a/LICENSE b/LICENSE index 3e5a5c2..94a9ed0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,674 @@ -MIT License - -Copyright (c) 2021 helx-charts - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md index a79b336..1055e4b 100644 --- a/README.md +++ b/README.md @@ -172,5 +172,5 @@ Additionally there is a workflow that allows bumping the chart version, if this | webtop.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Webtop | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) From 4b7a2e4a0409504504b48a91b82a1d9cb967e3d3 Mon Sep 17 00:00:00 2001 From: Hina Shah Date: Mon, 29 Apr 2024 14:03:18 -0400 Subject: [PATCH 18/28] ENH: Adding allowed domain list --- templates/deployment.yaml | 5 +++++ templates/secrets.yaml | 5 +++++ values.yaml | 2 ++ 3 files changed, 12 insertions(+) diff --git a/templates/deployment.yaml b/templates/deployment.yaml index ce2d303..58e5638 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -186,6 +186,11 @@ spec: key: AUTHORIZED_USERS name: {{ include "appstore.fullname" . }} {{- end }} + - name: CSRF_DOMAINS + valueFrom: + secretKeyRef: + key: CSRF_DOMAINS + name: {{ include "appstore.fullname" . }} - name: OAUTH_PROVIDERS valueFrom: secretKeyRef: diff --git a/templates/secrets.yaml b/templates/secrets.yaml index eb4f322..975d492 100644 --- a/templates/secrets.yaml +++ b/templates/secrets.yaml @@ -58,6 +58,11 @@ data: {{- else }} OAUTH_PROVIDERS: "" {{- end }} + {{ if .Values.django.CSRF_DOMAINS }} + CSRF_DOMAINS: {{ .Values.django.CSRF_DOMAINS | b64enc }} + {{- else }} + CSRF_DOMAINS: "" + {{- end }} {{ if .Values.oauth.GITHUB_NAME }} GITHUB_NAME: {{ .Values.oauth.GITHUB_NAME | b64enc }} GITHUB_CLIENT_ID: {{ .Values.oauth.GITHUB_CLIENT_ID | b64enc }} diff --git a/values.yaml b/values.yaml index 95cef78..f24fe88 100644 --- a/values.yaml +++ b/values.yaml @@ -140,6 +140,8 @@ django: RECIPIENT_EMAILS: "" # -- should be 'live' unless you are doing some kind of development DEV_PHASE: "live" + # -- allowed domains to make post requests to the appstore + CSRF_DOMAINS: "https://*.renci.org,https://*.renci.unc.edu" oauth: # -- oauth providers separated by commas (google, github) From 00dd59875f460d8bdebce7d57b5380f79556fae4 Mon Sep 17 00:00:00 2001 From: Actions_hina-shah Date: Mon, 29 Apr 2024 18:04:13 +0000 Subject: [PATCH 19/28] Running helm-docs and adding updated Readme.mds if any --- LICENSE | 695 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- README.md | 3 +- 2 files changed, 676 insertions(+), 22 deletions(-) diff --git a/LICENSE b/LICENSE index 3e5a5c2..94a9ed0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,674 @@ -MIT License - -Copyright (c) 2021 helx-charts - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md index 8e75b83..29b198c 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Additionally there is a workflow that allows bumping the chart version, if this | django.APPSTORE_DJANGO_USERNAME | string | `"admin"` | | | django.AUTHORIZED_USERS | string | `""` | user emails for oauth providers | | django.AUTO_WHITELIST_PATTERNS | list | `[]` | Note that these only run on a user's primary alias. If a user has primary@cs.unc.edu as their primary alias, and secondary@renci.org as a secondary alias, they will only be whitelisted automatically if cs.unc.edu emails are allowed. ex. Whitelist all RENCI emails - "^[A-Za-z0-9._%+-]+@renci\\.org$" ex. Whitelist all UNC emails - "^[A-Za-z0-9._%+-]+@([A-Za-z0-9.-]+\\.)?unc\\.edu$" ex. Whitelist CS dept. (grad./prof.) UNC emails - "^[A-Za-z0-9._%+-]+@cs\\.unc\\.edu$" | +| django.CSRF_DOMAINS | string | `"https://*.renci.org,https://*.renci.unc.edu"` | allowed domains to make post requests to the appstore | | django.DEV_PHASE | string | `"live"` | should be 'live' unless you are doing some kind of development | | django.DOCKSTORE_APPS_BRANCH | string | `"v1.6.0"` | Specify the git branch to use for HeLx app specifications. When declaring 'tycho.externalAppRegistryRepo' leave this as an empty string. | | django.EMAIL_HOST | string | `""` | Email Server host ie relay.unc.edu | relay.renci.org | @@ -167,5 +168,5 @@ Additionally there is a workflow that allows bumping the chart version, if this | userStorage.storageSize | string | `"10Gi"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) From 363383f45a0ed54e980754ef2c8e76c51d261b4f Mon Sep 17 00:00:00 2001 From: Hoid Date: Wed, 1 May 2024 14:16:35 -0400 Subject: [PATCH 20/28] Just run helm-docs again --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1055e4b..a79b336 100644 --- a/README.md +++ b/README.md @@ -172,5 +172,5 @@ Additionally there is a workflow that allows bumping the chart version, if this | webtop.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Webtop | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) From 9c67fe2d6e63a59daf57884850084cae7a294d52 Mon Sep 17 00:00:00 2001 From: Actions_Hoid Date: Wed, 1 May 2024 18:17:00 +0000 Subject: [PATCH 21/28] Running helm-docs and adding updated Readme.mds if any --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a79b336..1055e4b 100644 --- a/README.md +++ b/README.md @@ -172,5 +172,5 @@ Additionally there is a workflow that allows bumping the chart version, if this | webtop.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Webtop | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) From 830a256621e590a4b7275197cb6e8dab2aea13d9 Mon Sep 17 00:00:00 2001 From: Hoid Date: Wed, 1 May 2024 14:33:24 -0400 Subject: [PATCH 22/28] Restore license, put the chart version back to a reasonable level --- Chart.yaml | 2 +- LICENSE | 695 ++--------------------------------------------------- README.md | 2 +- 3 files changed, 23 insertions(+), 676 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 0a9a607..b89a2d5 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 4.1.6 +version: 4.1.4 # This is the version number of the application being deployed. This version # number should be incremented each time you make changes to the application. appVersion: 3.3.1 diff --git a/LICENSE b/LICENSE index 94a9ed0..3e5a5c2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,21 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +MIT License + +Copyright (c) 2021 helx-charts + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index a79b336..fe02874 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A Helm chart for Kubernetes -![Version: 4.1.6](https://img.shields.io/badge/Version-4.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) +![Version: 4.1.4](https://img.shields.io/badge/Version-4.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) ## CI/CD From 8ce620f9a71aac2baf0a155539a6b14fc3415f96 Mon Sep 17 00:00:00 2001 From: Hoid Date: Wed, 1 May 2024 14:34:49 -0400 Subject: [PATCH 23/28] Run helm-docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8314908..fe02874 100644 --- a/README.md +++ b/README.md @@ -172,5 +172,5 @@ Additionally there is a workflow that allows bumping the chart version, if this | webtop.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Webtop | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) From be79181c712bb03bc85a462354e4a36fbb82ebcf Mon Sep 17 00:00:00 2001 From: Actions_Hoid Date: Wed, 1 May 2024 18:35:12 +0000 Subject: [PATCH 24/28] Running helm-docs and adding updated Readme.mds if any --- LICENSE | 695 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- README.md | 2 +- 2 files changed, 675 insertions(+), 22 deletions(-) diff --git a/LICENSE b/LICENSE index 3e5a5c2..94a9ed0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,674 @@ -MIT License - -Copyright (c) 2021 helx-charts - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md index fe02874..8314908 100644 --- a/README.md +++ b/README.md @@ -172,5 +172,5 @@ Additionally there is a workflow that allows bumping the chart version, if this | webtop.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Webtop | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) From b2d9accff013b5939efc8aab42fe88d012d3aa9d Mon Sep 17 00:00:00 2001 From: Hoid Date: Tue, 7 May 2024 09:06:28 -0400 Subject: [PATCH 25/28] Add AMBASSADOR_SVC_NAME env var --- README.md | 1 + templates/deployment.yaml | 5 ++++- values.yaml | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fe02874..81b1b93 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,7 @@ Additionally there is a workflow that allows bumping the chart version, if this | gitea.serviceName | string | `"gitea-ssh"` | the name of service in Kubernetes to connect to gitea | | gitea.user | string | `"git"` | the default user that gets populated in the gitea ssh config file | | global.ambassador_id | string | `nil` | specify the id of the ambassador for Tycho-launched services. | +| global.ambassador_service_name | string | `"ambassador"` | specify the service name for the ambassador app | | global.stdnfsPvc | string | `"stdnfs"` | the name of the PVC to use for user's files | | gunicorn.workers | int | `5` | Set the number of gunicorn workers. (2*CPU)+1 is recommended. | | image.pullPolicy | string | `"IfNotPresent"` | pull policy | diff --git a/templates/deployment.yaml b/templates/deployment.yaml index b9517ce..e0063d0 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -462,7 +462,10 @@ spec: value: "{{ .Values.tycho.shared_dir }}" - name: STDNFS_PVC value: "{{ .Values.global.stdnfsPvc }}" - + {{- if .Values.global.ambassador_service_name }} + - name: AMBASSADOR_SVC_NAME + value: {{ .Values.global.ambassador_service_name }} + {{- end }} ports: - containerPort: 8000 volumeMounts: diff --git a/values.yaml b/values.yaml index 7111273..b992ebc 100644 --- a/values.yaml +++ b/values.yaml @@ -322,6 +322,8 @@ global: stdnfsPvc: stdnfs # -- specify the id of the ambassador for Tycho-launched services. ambassador_id: + # -- specify the service name for the ambassador app + ambassador_service_name: ambassador ############################################################################# # -- appstore database settings From b240eb4ec402269cf468f5a5ec0112c580805baa Mon Sep 17 00:00:00 2001 From: Hoid Date: Thu, 9 May 2024 11:05:29 -0400 Subject: [PATCH 26/28] Change db hostname to be backwards compatible --- README.md | 2 +- templates/deployment.yaml | 4 ++++ templates/secrets.yaml | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 463645f..81b1b93 100644 --- a/README.md +++ b/README.md @@ -173,5 +173,5 @@ Additionally there is a workflow that allows bumping the chart version, if this | webtop.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Webtop | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/templates/deployment.yaml b/templates/deployment.yaml index e0063d0..5115f47 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -37,7 +37,11 @@ spec: command: - sh - -c + {{- if .Values.fullnameOverride }} - until pg_isready -h {{ include "appstore.fullname" . }}-postgresql -p 5432 -U postgres; do echo "waiting for postgresql"; sleep 5; done + {{- else }} + - until pg_isready -h {{ .Release.Name }}-postgresql -p 5432 -U postgres; do echo "waiting for postgresql"; sleep 5; done + {{- end }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/templates/secrets.yaml b/templates/secrets.yaml index a97f725..c48f1da 100644 --- a/templates/secrets.yaml +++ b/templates/secrets.yaml @@ -96,7 +96,11 @@ data: PG_DB_DATABASE: {{ .Values.postgresql.global.postgresql.auth.database | b64enc }} PG_DB_USERNAME: {{ .Values.postgresql.global.postgresql.auth.username | b64enc }} PG_DB_PASSWORD: {{ .Values.postgresql.global.postgresql.auth.password | b64enc }} + {{- if .Values.fullnameOverride }} PG_DB_HOST: {{ printf "%s-%s" ( include "appstore.fullname" . ) "postgresql" | b64enc }} + {{- else }} + PG_DB_HOST: {{ printf "%s-%s" .Release.Name "postgresql" | b64enc }} + {{- end }} PG_DB_PORT: {{ .Values.db.port | toString | b64enc }} {{- end }} {{- if .Values.postgresql.enabled }} From edf061d577a50a7756776b6a989a6faadf63fc5a Mon Sep 17 00:00:00 2001 From: Hoid Date: Mon, 20 May 2024 08:42:20 -0400 Subject: [PATCH 27/28] Add ambassador_mapping_name value and use it --- README.md | 5 +++-- templates/service.yaml | 2 +- values.yaml | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index babb5dc..534d51f 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,8 @@ Additionally there is a workflow that allows bumping the chart version, if this | gitea.serviceName | string | `"gitea-ssh"` | the name of service in Kubernetes to connect to gitea | | gitea.user | string | `"git"` | the default user that gets populated in the gitea ssh config file | | global.ambassador_id | string | `nil` | specify the id of the ambassador for Tycho-launched services. | -| global.ambassador_service_name | string | `"ambassador"` | specify the service name for the ambassador app | +| global.ambassador_mapping_name | string | `"appstore-mapping"` | specify the mapping name for ambassador | +| global.ambassador_service_name | string | `"ambassador"` | specify the service name for ambassador | | global.stdnfsPvc | string | `"stdnfs"` | the name of the PVC to use for user's files | | gunicorn.workers | int | `5` | Set the number of gunicorn workers. (2*CPU)+1 is recommended. | | image.pullPolicy | string | `"IfNotPresent"` | pull policy | @@ -174,5 +175,5 @@ Additionally there is a workflow that allows bumping the chart version, if this | webtop.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Webtop | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/templates/service.yaml b/templates/service.yaml index 12fb857..da336b9 100644 --- a/templates/service.yaml +++ b/templates/service.yaml @@ -13,7 +13,7 @@ metadata: --- apiVersion: ambassador/v1 kind: Mapping - name: appstore-mapping + name: {{ .Values.global.ambassador_mapping_name }} prefix: / service: {{ include "appstore.fullname" . }}:8000 {{ if .Values.global.ambassador_id }} diff --git a/values.yaml b/values.yaml index 4161bc1..48a8869 100644 --- a/values.yaml +++ b/values.yaml @@ -324,8 +324,10 @@ global: stdnfsPvc: stdnfs # -- specify the id of the ambassador for Tycho-launched services. ambassador_id: - # -- specify the service name for the ambassador app + # -- specify the service name for ambassador ambassador_service_name: ambassador + # -- specify the mapping name for ambassador + ambassador_mapping_name: appstore-mapping ############################################################################# # -- appstore database settings From 0fe98eb1c9488e89f8abd7c63c89db0d51ba6c49 Mon Sep 17 00:00:00 2001 From: Actions_Hoid Date: Mon, 20 May 2024 12:46:18 +0000 Subject: [PATCH 28/28] Running helm-docs and adding updated Readme.mds if any --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 534d51f..c98164a 100644 --- a/README.md +++ b/README.md @@ -175,5 +175,5 @@ Additionally there is a workflow that allows bumping the chart version, if this | webtop.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Webtop | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)