This repository has been archived by the owner on Nov 25, 2022. It is now read-only.
Adds Postgres Manifests and removes Postgres Helm Chart dependency #151
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| apiVersion: v2 | ||
| name: illumidesk | ||
| version: 5.5.0 | ||
| appVersion: 1.2.0 | ||
| description: An extention of the JupyterHub chart with additional IllumiDesk resources | ||
| icon: https://configs.illumidesk.com/images/illumidesk-80.png | ||
|
|
@@ -11,14 +11,6 @@ dependencies: | |
| import-values: | ||
| - child: rbac | ||
| parent: rbac | ||
| maintainers: | ||
| - name: IllumiDesk Team | ||
| email: [email protected] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,61 +29,3 @@ If release name contains chart name it will be used as a full name. | |
| {{- end }} | ||
| {{- end }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| {{ if .Values.illumideskSettings.enabled }} | ||
| apiVersion: v1 | ||
| kind: Secret | ||
| metadata: | ||
| name: hub-illumidesk-secret | ||
| namespace: {{ .Release.Namespace }} | ||
| type: Opaque | ||
| stringData: | ||
| JUPYTERHUB_API_TOKEN: {{ .Values.illumideskSettings.jupyterhubAPIToken | default "" | b64enc | quote }} | ||
| JUPYTERHUB_CRYPT_KEY: {{ .Values.illumideskSettings.jupyterhubCryptKey | default "" | b64enc | quote }} | ||
| POSTGRES_JUPYTERHUB_PASSWORD: {{ .Values.illumideskSettings.postgresHubPassword | default "postgres" | quote}} | ||
| NBGRADER_PASSWORD: {{ .Values.illumideskSettings.postgresGraderPassword | default "postgres" | quote}} | ||
|
There was a problem hiding this comment. For consistency, we should change this value to |
||
| LTI_SHARED_SECRET: {{ .Values.illumideskSettings.ltiSharedSecret | default "" | b64enc | quote }} | ||
| OIDC_CLIENT_SECRET: {{ .Values.illumideskSettings.oidcClientSecret | default "" | b64enc | quote }} | ||
| {{ end }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| {{ if not (hasKey .Values.illumideskSettings "externalHost") }} | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: postgres-{{ .Release.Namespace }} | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| app: postgres-{{ .Release.Namespace }} | ||
| spec: | ||
| selector: | ||
| matchLabels: | ||
| app: postgres-{{ .Release.Namespace }} | ||
| replicas: 1 | ||
| strategy: | ||
| rollingUpdate: | ||
| maxSurge: 25% | ||
| maxUnavailable: 25% | ||
| type: RollingUpdate | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app: postgres-{{ .Release.Namespace }} | ||
| spec: | ||
| containers: | ||
| - name: postgres | ||
| image: postgres:10.4 | ||
| resources: | ||
| requests: | ||
| cpu: 100m | ||
| memory: 100Mi | ||
|
There was a problem hiding this comment. Remove requests values and set limits to have an upper bound limit. We should also surface these settings in our |
||
| limits: | ||
| cpu: 100m | ||
| memory: 100Mi | ||
| env: | ||
| - name: POSTGRES_DB | ||
| valueFrom: | ||
| configMapKeyRef: | ||
| name: hub-illumidesk-cm | ||
| key: POSTGRES_JUPYTERHUB_DB | ||
| - name: POSTGRES_USER | ||
| valueFrom: | ||
| configMapKeyRef: | ||
| name: hub-illumidesk-cm | ||
| key: POSTGRES_NBGRADER_USER | ||
| - name: POSTGRES_PASSWORD | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: hub-illumidesk-secret | ||
| key: NBGRADER_PASSWORD | ||
|
There was a problem hiding this comment. Change to |
||
| ports: | ||
| - containerPort: 5432 | ||
| volumeMounts: | ||
| - mountPath: /var/lib/postgresql/data | ||
| name: postgredb | ||
| volumes: | ||
| - name: postgredb | ||
| persistentVolumeClaim: | ||
| claimName: postgres-pv-claim-{{ .Release.Namespace }} | ||
| restartPolicy: Always | ||
| --- | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: postgres-{{ .Release.Namespace }} | ||
| labels: | ||
| app: postgres-{{ .Release.Namespace }} | ||
| spec: | ||
| type: ClusterIP | ||
| ports: | ||
| - port: 5432 | ||
| selector: | ||
| app: postgres-{{ .Release.Namespace }} | ||
|
|
||
| {{ end }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| {{ if not (hasKey .Values.illumideskSettings "externalHost") }} | ||
| kind: PersistentVolume | ||
| apiVersion: v1 | ||
| metadata: | ||
| name: postgres-pv-volume-{{.Release.Namespace }} | ||
| labels: | ||
| type: local | ||
| app: postgres | ||
| spec: | ||
| storageClassName: manual | ||
| capacity: | ||
| storage: 5Gi | ||
| accessModes: | ||
| - ReadWriteMany | ||
| hostPath: | ||
| path: "/mnt/data" | ||
| --- | ||
| kind: PersistentVolumeClaim | ||
| apiVersion: v1 | ||
| metadata: | ||
| name: postgres-pv-claim-{{.Release.Namespace }} | ||
| labels: | ||
| app: postgres | ||
| spec: | ||
| storageClassName: manual | ||
| accessModes: | ||
| - ReadWriteMany | ||
| resources: | ||
| requests: | ||
| storage: 5Gi | ||
|
|
||
| {{ end }} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Our graderservice source code only understands
POSTGRES_NBGRADER_PASSWORD.