From 2c4a969eec537f5ec0f349bcd936e43649c62628 Mon Sep 17 00:00:00 2001 From: Gabe Cook Date: Mon, 10 Apr 2023 21:54:40 -0500 Subject: [PATCH] :truck: (ascii-movie): Rename ascii-telnet to ascii-movie --- README.md | 2 +- .../{ascii-telnet => ascii-movie}/.helmignore | 0 .../{ascii-telnet => ascii-movie}/Chart.lock | 0 charts/ascii-movie/Chart.yaml | 34 +++++++++++++++++++ .../{ascii-telnet => ascii-movie}/README.md | 33 +++++++++--------- .../README_CONFIG.md.gotmpl | 0 .../templates/NOTES.txt | 0 charts/ascii-movie/templates/common.yaml | 13 +++++++ .../{ascii-telnet => ascii-movie}/values.yaml | 9 ++--- charts/ascii-telnet/Chart.yaml | 30 ---------------- charts/ascii-telnet/templates/common.yaml | 1 - 11 files changed, 69 insertions(+), 53 deletions(-) rename charts/{ascii-telnet => ascii-movie}/.helmignore (100%) rename charts/{ascii-telnet => ascii-movie}/Chart.lock (100%) create mode 100644 charts/ascii-movie/Chart.yaml rename charts/{ascii-telnet => ascii-movie}/README.md (65%) rename charts/{ascii-telnet => ascii-movie}/README_CONFIG.md.gotmpl (100%) rename charts/{ascii-telnet => ascii-movie}/templates/NOTES.txt (100%) create mode 100644 charts/ascii-movie/templates/common.yaml rename charts/{ascii-telnet => ascii-movie}/values.yaml (69%) delete mode 100644 charts/ascii-telnet/Chart.yaml delete mode 100644 charts/ascii-telnet/templates/common.yaml diff --git a/README.md b/README.md index b6b05dfbc..ce0853de3 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ helm delete my- | Chart | Description | | ----- | ----------- | | [adguard-home adguard-home icon](charts/adguard-home/) | Free and open source, powerful network-wide ads & trackers blocking DNS server. | -| [ascii-telnet ascii-telnet icon](charts/ascii-telnet/) | Star Wars telnet server | +| [ascii-movie ascii-movie icon](charts/ascii-movie/) | Star Wars movie SSH and Telnet server | | [bookstack bookstack icon](charts/bookstack/) | A simple, self-hosted, easy-to-use platform for organising and storing information. | | [borgmatic borgmatic icon](charts/borgmatic/) | borgmatic is simple, configuration-driven backup software for servers and workstations. Protect your files with client-side encryption. Backup your databases too. Monitor it all with integrated third-party services. | | [changedetection-io changedetection-io icon](charts/changedetection-io/) | Live your data-life pro-actively, track website content changes and receive notifications via Discord, Email, Slack, Telegram and 70+ more. | diff --git a/charts/ascii-telnet/.helmignore b/charts/ascii-movie/.helmignore similarity index 100% rename from charts/ascii-telnet/.helmignore rename to charts/ascii-movie/.helmignore diff --git a/charts/ascii-telnet/Chart.lock b/charts/ascii-movie/Chart.lock similarity index 100% rename from charts/ascii-telnet/Chart.lock rename to charts/ascii-movie/Chart.lock diff --git a/charts/ascii-movie/Chart.yaml b/charts/ascii-movie/Chart.yaml new file mode 100644 index 000000000..491414bee --- /dev/null +++ b/charts/ascii-movie/Chart.yaml @@ -0,0 +1,34 @@ +apiVersion: v2 +name: ascii-movie +description: Star Wars movie SSH and Telnet server +home: https://charts.gabe565.com/charts/ascii-movie +icon: https://raw.githubusercontent.com/gabe565/ascii-movie/a1fd5c9df2fb3a177949c9511b62407c83aedefe/assets/icon.svg +type: application +version: 0.6.0 +# renovate datasource=docker depName=ghcr.io/gabe565/ascii-movie +appVersion: 1.2.0 +kubeVersion: ">=1.22.0-0" +keywords: + - ascii-art + - star-wars + - telnet + - ssh +dependencies: + - name: common + repository: https://bjw-s.github.io/helm-charts + version: 1.3.2 +sources: + - https://github.com/gabe565/ascii-movie +annotations: + artifacthub.io/changes: |- + - kind: changed + description: Rename chart from gabe565/ascii-telnet-go to gabe565/ascii-movie + - kind: added + description: Add SSH port + - kind: removed + description: Remove reference to ghcr.io/gabe565/ascii-telnet-rust + artifacthub.io/links: |- + - name: App Source + url: https://github.com/gabe565/ascii-movie + - name: Chart Source + url: https://github.com/gabe565/charts/tree/main/charts/ascii-movie diff --git a/charts/ascii-telnet/README.md b/charts/ascii-movie/README.md similarity index 65% rename from charts/ascii-telnet/README.md rename to charts/ascii-movie/README.md index 90212831d..6ce54140a 100644 --- a/charts/ascii-telnet/README.md +++ b/charts/ascii-movie/README.md @@ -1,22 +1,21 @@ -# ascii-telnet +# ascii-movie -ascii-telnet logo +ascii-movie logo -![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat) +![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat) -Star Wars telnet server +Star Wars movie SSH and Telnet server -**Homepage:** +**Homepage:** **This chart is not maintained by the upstream project and any issues with the chart should be raised -[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=ascii-telnet&version=0.5.0)** +[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=ascii-movie&version=0.6.0)** ## Source Code -* -* +* ## Requirements @@ -33,23 +32,23 @@ Kubernetes: `>=1.22.0-0` ```console helm repo add gabe565 https://charts.gabe565.com helm repo update -helm install ascii-telnet gabe565/ascii-telnet +helm install ascii-movie gabe565/ascii-movie ``` ## Installing the Chart -To install the chart with the release name `ascii-telnet` +To install the chart with the release name `ascii-movie` ```console -helm install ascii-telnet gabe565/ascii-telnet +helm install ascii-movie gabe565/ascii-movie ``` ## Uninstalling the Chart -To uninstall the `ascii-telnet` deployment +To uninstall the `ascii-movie` deployment ```console -helm uninstall ascii-telnet +helm uninstall ascii-movie ``` The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release. @@ -62,15 +61,15 @@ Other values may be used from the [values.yaml](https://github.com/bjw-s/helm-ch Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. ```console -helm install ascii-telnet \ +helm install ascii-movie \ --set env.TZ="America/New York" \ - gabe565/ascii-telnet + gabe565/ascii-movie ``` Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. ```console -helm install ascii-telnet gabe565/ascii-telnet -f values.yaml +helm install ascii-movie gabe565/ascii-movie -f values.yaml ``` ## Custom configuration @@ -85,7 +84,7 @@ N/A |-----|------|---------|-------------| | controller.strategy | string | `"RollingUpdate"` | Set the controller upgrade strategy | | image.pullPolicy | string | `"Always"` | image pull policy | -| image.repository | string | `"ghcr.io/gabe565/ascii-telnet-go"` | image repository. Defaults to Go implementation at [`ghcr.io/gabe565/ascii-telnet-go`](https://ghcr.io/gabe565/ascii-telnet-go), but can also be set to [`ghcr.io/gabe565/ascii-telnet-rust`](https://ghcr.io/gabe565/ascii-telnet-rust). | +| image.repository | string | `"ghcr.io/gabe565/ascii-movie"` | image repository. | | image.tag | string | `"1.2.0"` | image tag | | service | object | See [values.yaml](./values.yaml) | Configures service settings for the chart. | diff --git a/charts/ascii-telnet/README_CONFIG.md.gotmpl b/charts/ascii-movie/README_CONFIG.md.gotmpl similarity index 100% rename from charts/ascii-telnet/README_CONFIG.md.gotmpl rename to charts/ascii-movie/README_CONFIG.md.gotmpl diff --git a/charts/ascii-telnet/templates/NOTES.txt b/charts/ascii-movie/templates/NOTES.txt similarity index 100% rename from charts/ascii-telnet/templates/NOTES.txt rename to charts/ascii-movie/templates/NOTES.txt diff --git a/charts/ascii-movie/templates/common.yaml b/charts/ascii-movie/templates/common.yaml new file mode 100644 index 000000000..9d87499f2 --- /dev/null +++ b/charts/ascii-movie/templates/common.yaml @@ -0,0 +1,13 @@ +{{/* Append the hardcoded settings */}} +{{- define "asciiMovie.harcodedValues" -}} +env: + ASCII_MOVIE_SSH_ENABLED: {{ .Values.service.main.ports.ssh.enabled }} + ASCII_MOVIE_SSH_ADDRESS: :{{ .Values.service.main.ports.ssh.port }} + + ASCII_MOVIE_TELNET_ENABLED: {{ .Values.service.main.ports.telnet.enabled }} + ASCII_MOVIE_TELNET_ADDRESS: :{{ .Values.service.main.ports.telnet.port }} +{{- end -}} +{{- $_ := merge .Values (include "asciiMovie.harcodedValues" . | fromYaml) -}} + +{{/* Render the templates */}} +{{ include "bjw-s.common.loader.all" . }} diff --git a/charts/ascii-telnet/values.yaml b/charts/ascii-movie/values.yaml similarity index 69% rename from charts/ascii-telnet/values.yaml rename to charts/ascii-movie/values.yaml index 2a92a60e3..8b7bd5d11 100644 --- a/charts/ascii-telnet/values.yaml +++ b/charts/ascii-movie/values.yaml @@ -7,9 +7,7 @@ image: # -- image repository. - # Defaults to Go implementation at [`ghcr.io/gabe565/ascii-telnet-go`](https://ghcr.io/gabe565/ascii-telnet-go), - # but can also be set to [`ghcr.io/gabe565/ascii-telnet-rust`](https://ghcr.io/gabe565/ascii-telnet-rust). - repository: ghcr.io/gabe565/ascii-telnet-go + repository: ghcr.io/gabe565/ascii-movie # -- image pull policy pullPolicy: Always # -- image tag @@ -29,7 +27,10 @@ service: http: enabled: false primary: false + ssh: + enabled: true + port: 22 telnet: + enabled: true primary: true - protocol: TCP port: 23 diff --git a/charts/ascii-telnet/Chart.yaml b/charts/ascii-telnet/Chart.yaml deleted file mode 100644 index df42815d6..000000000 --- a/charts/ascii-telnet/Chart.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v2 -name: ascii-telnet -description: Star Wars telnet server -home: https://charts.gabe565.com/charts/ascii-telnet -icon: https://raw.githubusercontent.com/gabe565/ascii-telnet-go/a1fd5c9df2fb3a177949c9511b62407c83aedefe/assets/icon.svg -type: application -version: 0.5.0 -# renovate datasource=docker depName=ghcr.io/gabe565/ascii-telnet-go -appVersion: 1.2.0 -kubeVersion: ">=1.22.0-0" -keywords: - - ascii-art - - star-wars - - telnet -dependencies: - - name: common - repository: https://bjw-s.github.io/helm-charts - version: 1.3.2 -sources: - - https://github.com/gabe565/ascii-telnet-go - - https://github.com/gabe565/ascii-telnet-rust -annotations: - artifacthub.io/changes: |- - - kind: changed - description: Update ghcr.io/gabe565/ascii-telnet-go Docker tag to v1.2.0 - artifacthub.io/links: |- - - name: App Source - url: https://github.com/gabe565/ascii-telnet-go - - name: Chart Source - url: https://github.com/gabe565/charts/tree/main/charts/ascii-telnet diff --git a/charts/ascii-telnet/templates/common.yaml b/charts/ascii-telnet/templates/common.yaml deleted file mode 100644 index 6eb9b68ff..000000000 --- a/charts/ascii-telnet/templates/common.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "bjw-s.common.loader.all" . }}