chore(incubator): make things work with new common part 3 (#15994)
**Description** <!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. --> ⚒️ Fixes # <!--(issue)--> **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** <!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration --> **📃 Notes:** <!-- Please enter any other relevant information here --> **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._
This commit is contained in:
Kjeld Schouten
@@ -0,0 +1,30 @@
|
||||
# Patterns to ignore when building packages.
|
||||
# This supports shell glob matching, relative path matching, and
|
||||
# negation (prefixed with !). Only one pattern per line.
|
||||
.DS_Store
|
||||
# Common VCS dirs
|
||||
.git/
|
||||
.gitignore
|
||||
.bzr/
|
||||
.bzrignore
|
||||
.hg/
|
||||
.hgignore
|
||||
.svn/
|
||||
# Common backup files
|
||||
*.swp
|
||||
*.bak
|
||||
*.tmp
|
||||
*~
|
||||
# Various IDEs
|
||||
.project
|
||||
.idea/
|
||||
*.tmproj
|
||||
.vscode/
|
||||
# OWNERS file for Kubernetes
|
||||
OWNERS
|
||||
# helm-docs templates
|
||||
*.gotmpl
|
||||
# docs folder
|
||||
/docs
|
||||
# icon
|
||||
icon.png
|
||||
@@ -0,0 +1,190 @@
|
||||
# Changelog
|
||||
|
||||
|
||||
|
||||
## [cherry-1.0.0](https://github.com/truecharts/charts/compare/cherry-0.0.10...cherry-1.0.0) (2022-11-10)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Major Change to GUI
|
||||
- update helm general non-major ([#4342](https://github.com/truecharts/charts/issues/4342))
|
||||
- update helm general non-major ([#4349](https://github.com/truecharts/charts/issues/4349))
|
||||
- update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329))
|
||||
|
||||
### Fix
|
||||
|
||||
- change container config label
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.13](https://github.com/truecharts/charts/compare/cherry-0.0.10...cherry-0.0.13) (2022-11-08)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4342](https://github.com/truecharts/charts/issues/4342))
|
||||
- update helm general non-major ([#4349](https://github.com/truecharts/charts/issues/4349))
|
||||
- update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.12](https://github.com/truecharts/charts/compare/cherry-0.0.10...cherry-0.0.12) (2022-11-08)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4342](https://github.com/truecharts/charts/issues/4342))
|
||||
- update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.12](https://github.com/truecharts/charts/compare/cherry-0.0.10...cherry-0.0.12) (2022-11-08)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4342](https://github.com/truecharts/charts/issues/4342))
|
||||
- update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.12](https://github.com/truecharts/charts/compare/cherry-0.0.10...cherry-0.0.12) (2022-11-08)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4342](https://github.com/truecharts/charts/issues/4342))
|
||||
- update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.11](https://github.com/truecharts/charts/compare/cherry-0.0.10...cherry-0.0.11) (2022-11-07)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.11](https://github.com/truecharts/charts/compare/cherry-0.0.10...cherry-0.0.11) (2022-11-06)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.10](https://github.com/truecharts/charts/compare/cherry-0.0.9...cherry-0.0.10) (2022-11-06)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4317](https://github.com/truecharts/charts/issues/4317))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.9](https://github.com/truecharts/charts/compare/cherry-0.0.8...cherry-0.0.9) (2022-11-05)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4308](https://github.com/truecharts/charts/issues/4308))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.8](https://github.com/truecharts/charts/compare/cherry-0.0.7...cherry-0.0.8) (2022-11-02)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4261](https://github.com/truecharts/charts/issues/4261))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.7](https://github.com/truecharts/charts/compare/cherry-0.0.6...cherry-0.0.7) (2022-10-25)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4182](https://github.com/truecharts/charts/issues/4182))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.5](https://github.com/truecharts/charts/compare/cherry-0.0.4...cherry-0.0.5) (2022-10-19)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4122](https://github.com/truecharts/charts/issues/4122))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.4](https://github.com/truecharts/charts/compare/cherry-0.0.3...cherry-0.0.4) (2022-10-14)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- update docker general non-major ([#4084](https://github.com/truecharts/charts/issues/4084))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.3](https://github.com/truecharts/charts/compare/cherry-0.0.2...cherry-0.0.3) (2022-10-12)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- update helm general non-major ([#4071](https://github.com/truecharts/charts/issues/4071))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.2](https://github.com/truecharts/charts/compare/cherry-0.0.1...cherry-0.0.2) (2022-10-11)
|
||||
|
||||
### Chore
|
||||
|
||||
- Auto-update chart README [skip ci]
|
||||
- Auto-update chart README [skip ci]
|
||||
- update docker general non-major ([#4070](https://github.com/truecharts/charts/issues/4070))
|
||||
|
||||
|
||||
|
||||
|
||||
## [cherry-0.0.1]cherry-0.0.1 (2022-10-10)
|
||||
@@ -0,0 +1,37 @@
|
||||
kubeVersion: ">=1.24.0-0"
|
||||
apiVersion: v2
|
||||
name: cherry
|
||||
version: 3.0.2
|
||||
appVersion: 0.0.7
|
||||
description: An open source self-hosted bookmark service
|
||||
home: https://truecharts.org/charts/incubator/cherry
|
||||
icon: https://truecharts.org/img/hotlink-ok/chart-icons/cherry.png
|
||||
deprecated: false
|
||||
sources:
|
||||
- https://cherry.haishan.me/
|
||||
- https://github.com/haishanh/cherry
|
||||
- https://github.com/truecharts/charts/tree/master/charts/incubator/cherry
|
||||
- https://hub.docker.com/r/haishanh/cherry
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
email: info@truecharts.org
|
||||
url: https://truecharts.org
|
||||
keywords:
|
||||
- bookmark
|
||||
dependencies:
|
||||
- name: common
|
||||
version: 16.2.6
|
||||
repository: https://library-charts.truecharts.org
|
||||
condition: ""
|
||||
alias: ""
|
||||
tags: []
|
||||
import-values: []
|
||||
annotations:
|
||||
max_scale_version: 23.10.1
|
||||
min_scale_version: 22.12.4
|
||||
truecharts.org/SCALE-support: "true"
|
||||
truecharts.org/category: bookmark
|
||||
truecharts.org/max_helm_version: "3.13"
|
||||
truecharts.org/min_helm_version: "3.12"
|
||||
truecharts.org/train: incubator
|
||||
type: application
|
||||
@@ -0,0 +1,27 @@
|
||||
# README
|
||||
|
||||
## General Info
|
||||
|
||||
TrueCharts can be installed as both *normal* Helm Charts or as Apps on TrueNAS SCALE.
|
||||
However only installations using the TrueNAS SCALE Apps system are supported.
|
||||
|
||||
For more information about this App, please check the docs on the TrueCharts [website](https://truecharts.org/charts/incubator/cherry)
|
||||
|
||||
**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/charts/issues/new/choose)**
|
||||
|
||||
|
||||
## Support
|
||||
|
||||
- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
|
||||
- See the [Website](https://truecharts.org)
|
||||
- Check our [Discord](https://discord.gg/tVsPTHWTtr)
|
||||
- Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
|
||||
|
||||
---
|
||||
|
||||
## Sponsor TrueCharts
|
||||
|
||||
TrueCharts can only exist due to the incredible effort of our staff.
|
||||
Please consider making a [donation](https://truecharts.org/sponsor) or contributing back to the project any way you can!
|
||||
|
||||
*All Rights Reserved - The TrueCharts Project*
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
@@ -0,0 +1,136 @@
|
||||
# Include{groups}
|
||||
portals:
|
||||
open:
|
||||
# Include{portalLink}
|
||||
questions:
|
||||
# Include{global}
|
||||
# Include{workload}
|
||||
# Include{workloadDeployment}
|
||||
|
||||
# Include{replicas1}
|
||||
# Include{podSpec}
|
||||
# Include{containerMain}
|
||||
# Include{containerBasic}
|
||||
# Include{containerAdvanced}
|
||||
# Include{containerConfig}
|
||||
# Include{podOptions}
|
||||
|
||||
- variable: cherry
|
||||
group: App Configuration
|
||||
label: Cherry Configuration
|
||||
schema:
|
||||
additional_attrs: true
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: insecure_cookie
|
||||
label: Insecure Cookie
|
||||
schema:
|
||||
type: boolean
|
||||
default: false
|
||||
- variable: public_registration
|
||||
label: Public Registration
|
||||
schema:
|
||||
type: boolean
|
||||
default: true
|
||||
- variable: page_bookmark_limit
|
||||
label: Page Bookmark Limit
|
||||
schema:
|
||||
type: int
|
||||
default: 60
|
||||
- variable: google_oauth_uri
|
||||
label: Google OAuth URI
|
||||
schema:
|
||||
type: string
|
||||
default: ""
|
||||
- variable: google_oauth_id
|
||||
label: Google OAuth ID
|
||||
schema:
|
||||
type: string
|
||||
private: true
|
||||
default: ""
|
||||
- variable: google_oauth_secret
|
||||
label: Google OAuth Secret
|
||||
schema:
|
||||
type: string
|
||||
private: true
|
||||
default: ""
|
||||
|
||||
# Include{serviceRoot}
|
||||
- variable: main
|
||||
label: Main Service
|
||||
description: The Primary service on which the healthcheck runs, often the webUI
|
||||
schema:
|
||||
additional_attrs: true
|
||||
type: dict
|
||||
attrs:
|
||||
# Include{serviceSelectorLoadBalancer}
|
||||
# Include{serviceSelectorExtras}
|
||||
- variable: main
|
||||
label: Main Service Port Configuration
|
||||
schema:
|
||||
additional_attrs: true
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: port
|
||||
label: Port
|
||||
description: This port exposes the container port on the service
|
||||
schema:
|
||||
type: int
|
||||
default: 10303
|
||||
required: true
|
||||
# Include{serviceExpertRoot}
|
||||
# Include{serviceExpert}
|
||||
# Include{serviceList}
|
||||
# Include{persistenceRoot}
|
||||
- variable: data
|
||||
label: App Data Storage
|
||||
description: Stores the Application Data.
|
||||
schema:
|
||||
additional_attrs: true
|
||||
type: dict
|
||||
attrs:
|
||||
# Include{persistenceBasic}
|
||||
# Include{persistenceList}
|
||||
# Include{ingressRoot}
|
||||
- variable: main
|
||||
label: Main Ingress
|
||||
schema:
|
||||
additional_attrs: true
|
||||
type: dict
|
||||
attrs:
|
||||
# Include{ingressDefault}
|
||||
# Include{ingressTLS}
|
||||
# Include{ingressTraefik}
|
||||
# Include{ingressAdvanced}
|
||||
# Include{ingressList}
|
||||
|
||||
# Include{securityContextRoot}
|
||||
- variable: runAsUser
|
||||
label: "runAsUser"
|
||||
description: "The UserID of the user running the application"
|
||||
schema:
|
||||
type: int
|
||||
default: 0
|
||||
- variable: runAsGroup
|
||||
label: "runAsGroup"
|
||||
description: "The groupID of the user running the application"
|
||||
schema:
|
||||
type: int
|
||||
default: 0
|
||||
# Include{securityContextContainer}
|
||||
# Include{securityContextAdvanced}
|
||||
# Include{securityContextPod}
|
||||
- variable: fsGroup
|
||||
label: "fsGroup"
|
||||
description: "The group that should own ALL storage."
|
||||
schema:
|
||||
type: int
|
||||
default: 568
|
||||
|
||||
# Include{resources}
|
||||
# Include{advanced}
|
||||
# Include{addons}
|
||||
# Include{codeserver}
|
||||
# Include{netshoot}
|
||||
# Include{vpn}
|
||||
# Include{documentation}
|
||||
@@ -0,0 +1,15 @@
|
||||
{{/* Define the configmap */}}
|
||||
{{- define "cherry.configmap" -}}
|
||||
|
||||
{{- $configName := printf "%s-cherry-configmap" (include "tc.v1.common.names.fullname" .) }}
|
||||
|
||||
enabled: true
|
||||
data:
|
||||
DATABASE_PATH: /data/cherry.sqlite
|
||||
ENABLE_PUBLIC_REGISTRATION: {{ ternary "1" "0" .Values.cherry.public_registration | quote }}
|
||||
USE_INSECURE_COOKIE: {{ ternary "1" "0" .Values.cherry.insecure_cookie | quote }}
|
||||
PAGE_BOOKMARK_LIMIT: {{ .Values.cherry.page_bookmark_limit | quote }}
|
||||
{{- with .Values.cherry.google_oauth_uri }}
|
||||
GOOGLE_OAUTH_REDIRECT_URI: {{ . }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
@@ -0,0 +1,19 @@
|
||||
{{/* Define the secrets */}}
|
||||
{{- define "cherry.secrets" -}}
|
||||
|
||||
{{- $secretName := printf "%s-cherry-secret" (include "tc.v1.common.names.fullname" .) }}
|
||||
|
||||
enabled: true
|
||||
data:
|
||||
{{- with (lookup "v1" "Secret" .Release.Namespace $secretName) }}
|
||||
JWT_SECRET: {{ index .data "JWT_SECRET" }}
|
||||
{{- else }}
|
||||
JWT_SECRET: {{ randAlphaNum 32 }}
|
||||
{{- end }}
|
||||
{{- with .Values.cherry.google_oauth_id }}
|
||||
GOOGLE_OAUTH_CLIENT_ID: {{ . }}
|
||||
{{- end }}
|
||||
{{- with .Values.cherry.google_oauth_secret }}
|
||||
GOOGLE_OAUTH_CLIENT_SECRET: {{ . }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
@@ -0,0 +1,7 @@
|
||||
{{- include "tc.v1.common.loader.init" . }}
|
||||
|
||||
{{- include "cherry.configmap" . }}
|
||||
|
||||
{{ include "cherry.secrets" . }}
|
||||
|
||||
{{ include "tc.v1.common.loader.apply" . }}
|
||||
@@ -0,0 +1,50 @@
|
||||
cherry:
|
||||
google_oauth_id: ""
|
||||
google_oauth_secret: ""
|
||||
google_oauth_uri: ""
|
||||
insecure_cookie: true
|
||||
page_bookmark_limit: 60
|
||||
public_registration: true
|
||||
image:
|
||||
pullPolicy: IfNotPresent
|
||||
repository: haishanh/cherry
|
||||
tag: v0.0.7@sha256:ac38d09dc167501882b60c882931ba89a2cdc4feb2f30e768098f142dde8b9ee
|
||||
persistence:
|
||||
data:
|
||||
enabled: true
|
||||
mountPath: /data
|
||||
portal:
|
||||
open:
|
||||
enabled: true
|
||||
securityContext:
|
||||
container:
|
||||
readOnlyRootFilesystem: false
|
||||
runAsGroup: 0
|
||||
runAsUser: 0
|
||||
service:
|
||||
main:
|
||||
ports:
|
||||
main:
|
||||
port: 10303
|
||||
protocol: http
|
||||
targetPort: 8000
|
||||
workload:
|
||||
main:
|
||||
podSpec:
|
||||
containers:
|
||||
main:
|
||||
envFrom:
|
||||
- secretRef:
|
||||
name: 'cherry-secret'
|
||||
- configMapRef:
|
||||
name: 'cherry-configmap'
|
||||
probes:
|
||||
liveness:
|
||||
path: /
|
||||
type: http
|
||||
readiness:
|
||||
path: /
|
||||
type: http
|
||||
startup:
|
||||
path: /
|
||||
type: http
|
||||
Reference in New Issue
Block a user