mirror of
				https://github.com/TeamPiped/Piped-Kubernetes.git
				synced 2024-08-14 23:57:15 +00:00 
			
		
		
		
	chore(backend): Fix the configmap generation for databases.
It shouldn't require dialect and driver_class and instead default to using them but allow customization.
This commit is contained in:
		
							parent
							
								
									6355d40bbd
								
							
						
					
					
						commit
						ecdbe79880
					
				
					 3 changed files with 13 additions and 9 deletions
				
			
		|  | @ -9,7 +9,7 @@ sources: | ||||||
|   - https://github.com/TeamPiped/piped-proxy |   - https://github.com/TeamPiped/piped-proxy | ||||||
| keywords: | keywords: | ||||||
|   - streaming |   - streaming | ||||||
| version: 2.7.1 | version: 2.8.0 | ||||||
| appVersion: latest | appVersion: latest | ||||||
| kubeVersion: ">=1.22.0-0" | kubeVersion: ">=1.22.0-0" | ||||||
| maintainers: | maintainers: | ||||||
|  | @ -26,5 +26,5 @@ dependencies: | ||||||
|     condition: postgresql.enabled |     condition: postgresql.enabled | ||||||
| annotations: | annotations: | ||||||
|   artifacthub.io/changes: |- |   artifacthub.io/changes: |- | ||||||
|     - kind: fixed |     - kind: changed | ||||||
|       description: Made frontend nginx entrypoint run docker-entrypoint.d scripts |       description: Backend configmap was changed to not require driver_class nor dialect but rather specify them by default. | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| # piped | # piped | ||||||
| 
 | 
 | ||||||
|   |   | ||||||
| 
 | 
 | ||||||
| Piped is an alternative privacy-friendly YouTube frontend which is efficient by design. | Piped is an alternative privacy-friendly YouTube frontend which is efficient by design. | ||||||
| 
 | 
 | ||||||
|  | @ -21,7 +21,7 @@ Kubernetes: `>=1.22.0-0` | ||||||
| | Repository | Name | Version | | | Repository | Name | Version | | ||||||
| |------------|------|---------| | |------------|------|---------| | ||||||
| | https://bjw-s.github.io/helm-charts | common | 1.5.1 | | | https://bjw-s.github.io/helm-charts | common | 1.5.1 | | ||||||
| | https://charts.bitnami.com/bitnami | postgresql | 12.5.6 | | | https://charts.bitnami.com/bitnami | postgresql | 12.6.0 | | ||||||
| 
 | 
 | ||||||
| ## TL;DR | ## TL;DR | ||||||
| 
 | 
 | ||||||
|  | @ -91,7 +91,7 @@ helm install piped TeamPiped/piped -f values.yaml | ||||||
| | backend.service.main.type | string | `"ClusterIP"` |  | | | backend.service.main.type | string | `"ClusterIP"` |  | | ||||||
| | controller.enabled | bool | `false` | enable the controller. | | | controller.enabled | bool | `false` | enable the controller. | | ||||||
| | frontend.args[0] | string | `"-c"` |  | | | frontend.args[0] | string | `"-c"` |  | | ||||||
| | frontend.args[1] | string | `"sed -i s/pipedapi.kavin.rocks/$BACKEND_HOSTNAME/g /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g 'daemon off;'"` |  | | | frontend.args[1] | string | `"sed -i s/pipedapi.kavin.rocks/$BACKEND_HOSTNAME/g /usr/share/nginx/html/assets/* && /docker-entrypoint.sh nginx -g 'daemon off;'"` |  | | ||||||
| | frontend.command | string | `"/bin/ash"` |   BACKEND_HOSTNAME: pipedapi.example.org | | | frontend.command | string | `"/bin/ash"` |   BACKEND_HOSTNAME: pipedapi.example.org | | ||||||
| | frontend.enabled | bool | `true` |  | | | frontend.enabled | bool | `true` |  | | ||||||
| | frontend.image.pullPolicy | string | `"IfNotPresent"` | image pull policy | | | frontend.image.pullPolicy | string | `"IfNotPresent"` | image pull policy | | ||||||
|  | @ -160,7 +160,7 @@ helm install piped TeamPiped/piped -f values.yaml | ||||||
| 
 | 
 | ||||||
| ## Changelog | ## Changelog | ||||||
| 
 | 
 | ||||||
| ### Version 2.6.2 | ### Version 2.8.0 | ||||||
| 
 | 
 | ||||||
| #### Added | #### Added | ||||||
| 
 | 
 | ||||||
|  | @ -168,11 +168,11 @@ N/A | ||||||
| 
 | 
 | ||||||
| #### Changed | #### Changed | ||||||
| 
 | 
 | ||||||
| N/A | * Backend configmap was changed to not require driver_class nor dialect but rather specify them by default. | ||||||
| 
 | 
 | ||||||
| #### Fixed | #### Fixed | ||||||
| 
 | 
 | ||||||
| * ytproxy ingress, GH issue 29 | N/A | ||||||
| 
 | 
 | ||||||
| ## Support | ## Support | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -56,10 +56,14 @@ data: | ||||||
|     FEED_RETENTION: {{ .Values.backend.config.DISABLE_REGISTRATION | int | default 30 }} |     FEED_RETENTION: {{ .Values.backend.config.DISABLE_REGISTRATION | int | default 30 }} | ||||||
|     {{- if and (.Values.backend.config.database) (not .Values.postgresql.enabled) }} |     {{- if and (.Values.backend.config.database) (not .Values.postgresql.enabled) }} | ||||||
|     hibernate.connection.url: {{.Values.backend.config.database.connection_url }} |     hibernate.connection.url: {{.Values.backend.config.database.connection_url }} | ||||||
|  |     {{- else if and (.Values.backend.config.database.driver_class) (.Values.backend.config.database.dialect)}} | ||||||
|     hibernate.connection.driver_class: {{.Values.backend.config.database.driver_class }} |     hibernate.connection.driver_class: {{.Values.backend.config.database.driver_class }} | ||||||
|     hibernate.dialect: {{.Values.backend.config.database.dialect }} |     hibernate.dialect: {{.Values.backend.config.database.dialect }} | ||||||
|     hibernate.connection.username: {{.Values.backend.config.database.username }} |     hibernate.connection.username: {{.Values.backend.config.database.username }} | ||||||
|     hibernate.connection.password: {{.Values.backend.config.database.password }} |     hibernate.connection.password: {{.Values.backend.config.database.password }} | ||||||
|  |     {{- else if (not .Values.backend.config.database.driver_class) (not .Values.backend.config.database.dialect) }} | ||||||
|  |     hibernate.connection.driver_class: org.postgresql.Driver | ||||||
|  |     hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect | ||||||
|     {{- if .Values.backend.config.database.secret }} |     {{- if .Values.backend.config.database.secret }} | ||||||
|     hibernate.connection.username: {{ include "common.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" .Values.backend.config.database.secret "Key" "database.username" ) -}} |     hibernate.connection.username: {{ include "common.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" .Values.backend.config.database.secret "Key" "database.username" ) -}} | ||||||
|     hibernate.connection.password: {{ include "common.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" .Values.backend.config.database.secret "Key" "database.password") -}} |     hibernate.connection.password: {{ include "common.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" .Values.backend.config.database.secret "Key" "database.password") -}} | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue