From 7bf4eabc040c81c11472578c5fa69af0dcc8ad6e Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Fri, 12 Aug 2022 23:32:07 +0300 Subject: [PATCH] fix(neko): cleanup (#3390) * fix(neko): cleanup * add neko images * one more * rename * lint * update some images * update images --- charts/incubator/authentik/Chart.yaml | 2 +- charts/incubator/authentik/values.yaml | 7 +- charts/incubator/neko/Chart.yaml | 16 +- charts/incubator/neko/ci/basic-values.yaml | 0 charts/incubator/neko/ci/brave-values.yaml | 1 + charts/incubator/neko/ci/chrome-values.yaml | 1 + charts/incubator/neko/ci/chromium-values.yaml | 1 + charts/incubator/neko/ci/edge-values.yaml | 1 + charts/incubator/neko/ci/remmina-values.yaml | 1 + charts/incubator/neko/ci/tor-values.yaml | 1 + charts/incubator/neko/ci/vivaldi-values.yaml | 1 + charts/incubator/neko/ci/vlc-values.yaml | 1 + .../incubator/neko/ci/vncviewer-values.yaml | 1 + charts/incubator/neko/ci/xfce-values.yaml | 1 + charts/incubator/neko/questions.yaml | 154 ++++++++++++++---- charts/incubator/neko/values.yaml | 102 ++++++++++-- charts/incubator/rickroll/Chart.yaml | 2 +- charts/incubator/rickroll/values.yaml | 10 +- cspell.config.yaml | 1 + 19 files changed, 234 insertions(+), 70 deletions(-) create mode 100644 charts/incubator/neko/ci/basic-values.yaml create mode 100644 charts/incubator/neko/ci/brave-values.yaml create mode 100644 charts/incubator/neko/ci/chrome-values.yaml create mode 100644 charts/incubator/neko/ci/chromium-values.yaml create mode 100644 charts/incubator/neko/ci/edge-values.yaml create mode 100644 charts/incubator/neko/ci/remmina-values.yaml create mode 100644 charts/incubator/neko/ci/tor-values.yaml create mode 100644 charts/incubator/neko/ci/vivaldi-values.yaml create mode 100644 charts/incubator/neko/ci/vlc-values.yaml create mode 100644 charts/incubator/neko/ci/vncviewer-values.yaml create mode 100644 charts/incubator/neko/ci/xfce-values.yaml diff --git a/charts/incubator/authentik/Chart.yaml b/charts/incubator/authentik/Chart.yaml index 52113c3b711..e52769f382f 100644 --- a/charts/incubator/authentik/Chart.yaml +++ b/charts/incubator/authentik/Chart.yaml @@ -27,7 +27,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/authentik - https://github.com/goauthentik/authentik - https://goauthentik.io/docs/ -version: 3.0.3 +version: 3.0.4 annotations: truecharts.org/catagories: | - authentication diff --git a/charts/incubator/authentik/values.yaml b/charts/incubator/authentik/values.yaml index 05a7575b8a7..1b775d2fa66 100644 --- a/charts/incubator/authentik/values.yaml +++ b/charts/incubator/authentik/values.yaml @@ -9,9 +9,8 @@ geoipImage: pullPolicy: IfNotPresent ldapImage: - # TODO: Update this to our mirror - repository: ghcr.io/goauthentik/ldap - tag: 2022.7.3@sha256:fed2b7e9149bfe9693f7ea1abf87012d643c53e5054415862449c20fe4fe6413 + repository: tccr.io/truecharts/authentik-ldap + tag: 2022.7.3@sha256:b648c3507dfdbcebb2ec7f6eb844d93c7738ef3e4b20ce09f16dbb3b452fcb9a pullPolicy: IfNotPresent extraArgs: ["server"] @@ -38,8 +37,6 @@ authentik: avatars: "gravatar" token_length: 128 # Use single quotes for footer_links - # TODO: test how scale behaves - # eg footer_links: '[{"name": "Link Name", "href": "https://mylink.com"}]' footer_links: '[{"name": "Link Name", "href": "https://mylink.com"}]' mail: host: "" diff --git a/charts/incubator/neko/Chart.yaml b/charts/incubator/neko/Chart.yaml index b91685097ae..a51342855b9 100644 --- a/charts/incubator/neko/Chart.yaml +++ b/charts/incubator/neko/Chart.yaml @@ -1,7 +1,3 @@ -annotations: - truecharts.org/SCALE-support: "true" - truecharts.org/catagories: | - - MediaApp-Video apiVersion: v2 appVersion: "latest" dependencies: @@ -9,12 +5,12 @@ dependencies: repository: https://library-charts.truecharts.org version: 10.4.9 deprecated: false -description: "Neko is an Open-Source self-hosted alternative to rabb.it(deprecated).\r\n" -home: https://truecharts.org/docs/charts/incubator/neko -icon: https://truecharts.org/img/hotlink-ok/chart-icons/neko.png +description: "A self hosted virtual browser that runs in docker" +home: https://github.com/truecharts/charts/tree/master/charts/incubator/neko +icon: https://truecharts.org/img/chart-icons/neko.png keywords: - neko - - MediaApp-Video + - video kubeVersion: ">=1.16.0-0" maintainers: - email: info@truecharts.org @@ -26,3 +22,7 @@ sources: - https://hub.docker.com/r/m1k1o/neko/ type: application version: 0.0.16 +annotations: + truecharts.org/SCALE-support: "true" + truecharts.org/catagories: | + - media diff --git a/charts/incubator/neko/ci/basic-values.yaml b/charts/incubator/neko/ci/basic-values.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/charts/incubator/neko/ci/brave-values.yaml b/charts/incubator/neko/ci/brave-values.yaml new file mode 100644 index 00000000000..120f702ccdd --- /dev/null +++ b/charts/incubator/neko/ci/brave-values.yaml @@ -0,0 +1 @@ +imageSelector: "imageBrave" diff --git a/charts/incubator/neko/ci/chrome-values.yaml b/charts/incubator/neko/ci/chrome-values.yaml new file mode 100644 index 00000000000..e4fd1099889 --- /dev/null +++ b/charts/incubator/neko/ci/chrome-values.yaml @@ -0,0 +1 @@ +imageSelector: "imageChrome" diff --git a/charts/incubator/neko/ci/chromium-values.yaml b/charts/incubator/neko/ci/chromium-values.yaml new file mode 100644 index 00000000000..07521351840 --- /dev/null +++ b/charts/incubator/neko/ci/chromium-values.yaml @@ -0,0 +1 @@ +imageSelector: "imageChromium" diff --git a/charts/incubator/neko/ci/edge-values.yaml b/charts/incubator/neko/ci/edge-values.yaml new file mode 100644 index 00000000000..f4ffaa26989 --- /dev/null +++ b/charts/incubator/neko/ci/edge-values.yaml @@ -0,0 +1 @@ +imageSelector: "imageEdge" diff --git a/charts/incubator/neko/ci/remmina-values.yaml b/charts/incubator/neko/ci/remmina-values.yaml new file mode 100644 index 00000000000..b9d88b51ee9 --- /dev/null +++ b/charts/incubator/neko/ci/remmina-values.yaml @@ -0,0 +1 @@ +imageSelector: "imageRemmina" diff --git a/charts/incubator/neko/ci/tor-values.yaml b/charts/incubator/neko/ci/tor-values.yaml new file mode 100644 index 00000000000..7dda216dd7c --- /dev/null +++ b/charts/incubator/neko/ci/tor-values.yaml @@ -0,0 +1 @@ +imageSelector: "imageTor" diff --git a/charts/incubator/neko/ci/vivaldi-values.yaml b/charts/incubator/neko/ci/vivaldi-values.yaml new file mode 100644 index 00000000000..7c2b7ff2e90 --- /dev/null +++ b/charts/incubator/neko/ci/vivaldi-values.yaml @@ -0,0 +1 @@ +imageSelector: "imageVivaldi" diff --git a/charts/incubator/neko/ci/vlc-values.yaml b/charts/incubator/neko/ci/vlc-values.yaml new file mode 100644 index 00000000000..a5f6ec1b314 --- /dev/null +++ b/charts/incubator/neko/ci/vlc-values.yaml @@ -0,0 +1 @@ +imageSelector: "imageVlc" diff --git a/charts/incubator/neko/ci/vncviewer-values.yaml b/charts/incubator/neko/ci/vncviewer-values.yaml new file mode 100644 index 00000000000..501812215b0 --- /dev/null +++ b/charts/incubator/neko/ci/vncviewer-values.yaml @@ -0,0 +1 @@ +imageSelector: "imageVncviewer" diff --git a/charts/incubator/neko/ci/xfce-values.yaml b/charts/incubator/neko/ci/xfce-values.yaml new file mode 100644 index 00000000000..312155969c9 --- /dev/null +++ b/charts/incubator/neko/ci/xfce-values.yaml @@ -0,0 +1 @@ +imageSelector: "imageXfce" diff --git a/charts/incubator/neko/questions.yaml b/charts/incubator/neko/questions.yaml index 87973376cc4..479b6650f69 100644 --- a/charts/incubator/neko/questions.yaml +++ b/charts/incubator/neko/questions.yaml @@ -4,6 +4,35 @@ portals: # Include{portalLink} questions: # Include{global} + - variable: imageSelector + group: "Container Image" + label: "Select Image" + schema: + type: string + default: "image" + enum: + - value: "image" + description: "Firefox" + - value: "imageBrave" + description: "Brave" + - value: "imageChrome" + description: "Chrome" + - value: "imageChromium" + description: "Chromium" + - value: "imageEdge" + description: "Edge" + - value: "imageRemmina" + description: "Remmina" + - value: "imageTor" + description: "Tor" + - value: "imageVivaldi" + description: "Vivaldi" + - value: "imageVlc" + description: "Vlc" + - value: "imageVncviewer" + description: "Vncviewer" + - value: "imageXfce" + description: "Xfce" # Include{controller} # Include{controllerDeployment} # Include{replicas} @@ -12,6 +41,25 @@ questions: # Include{recreate} # Include{controllerExpert} # Include{controllerExpertExtraArgs} + - variable: secretEnv + group: "Container Configuration" + label: "Image Secrets" + schema: + additional_attrs: true + type: dict + attrs: + - variable: NEKO_PASSWORD + label: "NEKO_PASSWORD" + schema: + type: string + default: "" + private: true + - variable: NEKO_PASSWORD_ADMIN + label: "NEKO_PASSWORD_ADMIN" + schema: + type: string + default: "" + private: true - variable: env group: "Container Configuration" label: "Image Environment" @@ -19,36 +67,48 @@ questions: additional_attrs: true type: dict attrs: - - variable: NEKO_PASSWORD - label: 'NEKO_PASSWORD' - description: "Container Variable NEKOPASSWORD" - schema: - type: string - default: "ChangeMePls-<3" - - variable: NEKO_PASSWORD_ADMIN - label: 'NEKO_PASSWORD_ADMIN' - description: "Container Variable NEKOPASSWORDADMIN" - schema: - type: string - default: "ChangeMeAlsoPls_:)" - - variable: NEKO_NAT1TO1 - label: 'NEKO_NAT1TO1' - description: "Enter the IP of your TrueNAS-Server (or your defined IP in Custom br0 mode)" - schema: - type: string - default: "192.168.1.x" - - variable: NEKO_EPR - label: 'NEKO_EPR' - description: "Container Variable NEKOEPR" - schema: - type: string - default: "52000-52100" - variable: NEKO_SCREEN - label: 'NEKO_SCREEN' - description: "Container Variable NEKOSCREEN" + label: "NEKO_SCREEN" + description: "Resolution after startup. Only Admins can change this later." schema: type: string default: "1920x1080@30" + - variable: NEKO_CONTROL_PROTECTION + label: "NEKO_CONTROL_PROTECTION" + description: "Control protection means, users can gain control only if at least one admin is in the room." + schema: + type: boolean + default: false + - variable: NEKO_IMPLICIT_CONTROL + label: "NEKO_IMPLICIT_CONTROL" + description: "If enabled members can gain control implicitly, they don't need to request control." + schema: + type: boolean + default: false + - variable: NEKO_PROXY + label: "NEKO_PROXY" + description: "Enable reverse proxy mode, so that neko trusts X-Forwarded-For headers." + schema: + type: boolean + default: false + - variable: NEKO_LOCKS + label: "NEKO_LOCKS" + description: "Resources, that will be locked when starting, separated by whitespace." + schema: + type: string + default: "192.168.1.x" + - variable: NEKO_NAT1TO1 + label: "NEKO_NAT1TO1" + description: "Enter the IP of your TrueNAS-Server" + schema: + type: string + default: "192.168.1.x" + - variable: NEKO_IPFETCH + label: "NEKO_IPFETCH" + description: "Automatically fetch IP address from given URL when NEKO_NAT1TO1 is not specified." + schema: + type: string + default: "http://checkip.amazonaws.com" # Include{containerConfig} # Include{serviceRoot} - variable: main @@ -70,7 +130,7 @@ questions: description: "This port exposes the container port on the service" schema: type: int - default: 6530 + default: 10294 required: true # Include{advancedPortHTTP} - variable: targetPort @@ -79,16 +139,15 @@ questions: schema: type: int default: 8080 - - variable: port52000 - label: 'port52000 service' - description: "Needed for Webrtc Communication" + - variable: mux-udp + label: "mux-udp service" schema: additional_attrs: true type: dict attrs: # Include{serviceSelector} - - variable: port52000 - label: "port52000 Service Port Configuration" + - variable: mux-udp + label: "mux-udp Service Port Configuration" schema: additional_attrs: true type: dict @@ -98,7 +157,7 @@ questions: description: "This port exposes the container port on the service" schema: type: int - default: 52000 + default: 52100 required: true # Include{advancedPortUDP} - variable: targetPort @@ -106,7 +165,34 @@ questions: description: "The internal(!) port on the container the Application runs on" schema: type: int - default: 52000 + default: 52100 + - variable: mux-tcp + label: "mux-tcp service" + schema: + additional_attrs: true + type: dict + attrs: +# Include{serviceSelector} + - variable: mux-tcp + label: "mux-tcp 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: 52100 + required: true +# Include{advancedPortTCP} + - variable: targetPort + label: "Target Port" + description: "The internal(!) port on the container the Application runs on" + schema: + type: int + default: 52100 # Include{serviceExpertRoot} default: false # Include{serviceExpert} diff --git a/charts/incubator/neko/values.yaml b/charts/incubator/neko/values.yaml index ad71a6cf70f..fee4b1bbe75 100644 --- a/charts/incubator/neko/values.yaml +++ b/charts/incubator/neko/values.yaml @@ -1,37 +1,107 @@ -env: - NEKO_EPR: 52000-52100 - NEKO_NAT1TO1: 192.168.1.x - NEKO_PASSWORD: ChangeMePls-<3 - NEKO_PASSWORD_ADMIN: ChangeMeAlsoPls_:) - NEKO_SCREEN: 1920x1080@30 image: + repository: tccr.io/truecharts/neko-firefox pullPolicy: IfNotPresent - repository: tccr.io/truecharts/neko - tag: latest@sha256:31cc4b580176cb9dd827faceec767125bcd9cbc88e834ef69eb621af3128894c -persistence: {} + tag: latest@sha256:d703762e99ed1d36b360be7a8cba1d69a3372db37225a3b544f85c5d1f5390cf + +imageBrave: + repository: tccr.io/truecharts/neko-brave + pullPolicy: IfNotPresent + tag: latest@sha256:c6a9293e73ce248c62b941d8877a506939def0ac105f8cd7475eeeabc9ff7ebf + +imageChrome: + repository: tccr.io/truecharts/neko-chrome + pullPolicy: IfNotPresent + tag: latest@sha256:3d5c18318d5c07c5cf6e3733811cca72044db78e740cbc5a1032764ddd2c2ce6 + +imageChromium: + repository: tccr.io/truecharts/neko-chromium + pullPolicy: IfNotPresent + tag: latest@sha256:796e8fa62372299f41a86bada76981f71b6e404ac927871d0a5bae53cf6ed384 + +imageEdge: + repository: tccr.io/truecharts/neko-msedge + pullPolicy: IfNotPresent + tag: latest@sha256:d23c209da9491290e0c26e4c12a94aef9b630ac49cf85c06eb965d58f99b0c1a + +imageRemmina: + repository: tccr.io/truecharts/neko-remmina + pullPolicy: IfNotPresent + tag: latest@sha256:a8aa398d954531e9282bd9d3fb9fff729d34364975a58f62675828f33374997a + +imageTor: + repository: tccr.io/truecharts/neko-tor + pullPolicy: IfNotPresent + tag: latest@sha256:bd5a1186f39d03335969b70daa8dc67b1ecbe02c64256e2cf655c8b691ebc303 + +imageVivaldi: + repository: tccr.io/truecharts/neko-vivaldi + pullPolicy: IfNotPresent + tag: latest@sha256:c212091ef7c8fb4785272498be36ab26bf34875fa3baea5dc318d73ea3be67d1 + +imageVlc: + repository: tccr.io/truecharts/neko-vlc + pullPolicy: IfNotPresent + tag: latest@sha256:ee4e2414167726106608a6bd3c27de3c1bb8d3257ee930aa54bc631316a3bf8b + +imageVncviewer: + repository: tccr.io/truecharts/neko-vncviewer + pullPolicy: IfNotPresent + tag: latest@sha256:9d6680979372ae561fd157cc973d8e73a826ccf68773314169d2d761564c184d + +imageXfce: + repository: tccr.io/truecharts/neko-xfce + pullPolicy: IfNotPresent + tag: latest@sha256:96347d6d5f055a172f7c383d871c61b6674d37c93177194e4a0beed127d1bc05 + +imageSelector: "image" + podSecurityContext: runAsGroup: 0 runAsUser: 0 + securityContext: readOnlyRootFilesystem: false runAsNonRoot: false + +secretEnv: + NEKO_PASSWORD: userpass + NEKO_PASSWORD_ADMIN: adminpass + +env: + NEKO_UDPMUX: 52100 + NEKO_TCPMUX: 52100 + # User Defined + NEKO_SCREEN: 1920x1080@30 + NEKO_CONTROL_PROTECTION: false + NEKO_IMPLICIT_CONTROL: false + NEKO_LOCKS: "" + NEKO_NAT1TO1: "" + NEKO_IPFETCH: "" + NEKO_PROXY: true + service: main: - enabled: true ports: main: - enabled: true - port: 6530 + port: 10294 protocol: HTTP targetPort: 8080 - port52000: + mux-udp: enabled: true ports: - port52000: + mux-udp: enabled: true - port: 52000 + port: 52100 protocol: UDP - targetPort: 52000 + targetPort: 52100 + mux-tcp: + enabled: true + ports: + mux-tcp: + enabled: true + port: 52100 + protocol: TCP + targetPort: 52100 portal: enabled: true diff --git a/charts/incubator/rickroll/Chart.yaml b/charts/incubator/rickroll/Chart.yaml index bd17ecc7d52..e1c64cd1e7c 100644 --- a/charts/incubator/rickroll/Chart.yaml +++ b/charts/incubator/rickroll/Chart.yaml @@ -26,4 +26,4 @@ sources: - https://github.com/modem7/docker-rickroll - https://hub.docker.com/r/modem7/docker-rickroll type: application -version: 0.0.18 +version: 0.0.19 diff --git a/charts/incubator/rickroll/values.yaml b/charts/incubator/rickroll/values.yaml index f5b2308ce1f..e4a89f890da 100644 --- a/charts/incubator/rickroll/values.yaml +++ b/charts/incubator/rickroll/values.yaml @@ -1,23 +1,23 @@ image: repository: tccr.io/truecharts/rickroll pullPolicy: IfNotPresent - tag: latest@sha256:d4469d8ba498111620fe57d4b5865f49ed3a36cf85490943cd8602a370222d29 + tag: latest@sha256:5de6651a14cb07a422d8d594399248d769632c944bb2cfb7efafa038e0a7fbcd imagefhd: repository: tccr.io/truecharts/rickroll-fhd pullPolicy: IfNotPresent - tag: latest@sha256:e9fa8994f11ec9143ba3d8cff5e5ae454a069acf71e0f614dcbe12eb0b9fc541 + tag: latest@sha256:a3eeb420f238b02f9d34f840d65dfc67799d5d100ff8e3570c2a5ea2f8f44cb4 imagefhdgame: repository: tccr.io/truecharts/rickroll-fhd-game pullPolicy: IfNotPresent - tag: latest@sha256:6290d3022f6969ce64278aef10a8bf4ad84b2c4438f43d6fe4366862b250be9c + tag: latest@sha256:2013fd035653bdcecff9ef5f808ab94b9ecd378b8d73404259a795a313b83248 imagefhdonclick: repository: tccr.io/truecharts/rickroll-fhd-onclick pullPolicy: IfNotPresent - tag: latest@sha256:d99dba2a6f73426d6404d9ef3bdeeb2af4440d98f039f8614260aa7d7ecfeaa2 + tag: latest@sha256:5ab14514f33d67423e7cf2e408a89d350a942b899b5734f122e791cfbae50487 imageonclick: repository: tccr.io/truecharts/rickroll-onclick pullPolicy: IfNotPresent - tag: latest@sha256:8b3c9444e7acaed9d8799dff317770cd549a4e12e0903f29eb2ba5c8d2c44f51 + tag: latest@sha256:849f0824bf5e83b424abea3245136e404fc95d559a8c51fac2a41bc3255118ef imageSelector: "image" diff --git a/cspell.config.yaml b/cspell.config.yaml index 5760b190101..83f98070e33 100644 --- a/cspell.config.yaml +++ b/cspell.config.yaml @@ -63,6 +63,7 @@ words: - modelstore - modports - mountpoint + - neko - nextcloud - nobind - nodeport