From 42cd23cece7419ef40c982f2643b2073963ae6af Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 17:54:55 -0500 Subject: [PATCH] :arrow_up: Update ghcr.io/gabe565/ascii-movie Docker tag to v1.4.0 (#123) * :arrow_up: Update ghcr.io/gabe565/ascii-movie Docker tag to v1.4.0 * :wrench: Update chart metadata * :sparkles: (ascii-movie): Add internal API service * :memo: (ascii-movie): Remove deprecated envs from examples * :wrench: (ascii-movie): Use API service for health check --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] Co-authored-by: Gabe Cook --- charts/ascii-movie/Chart.yaml | 10 ++++++---- charts/ascii-movie/README.md | 8 ++++---- charts/ascii-movie/templates/common.yaml | 16 +++++++++++++++- charts/ascii-movie/values.yaml | 12 +++++++----- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/charts/ascii-movie/Chart.yaml b/charts/ascii-movie/Chart.yaml index d66ef8a66..a0c7cf33b 100644 --- a/charts/ascii-movie/Chart.yaml +++ b/charts/ascii-movie/Chart.yaml @@ -4,9 +4,9 @@ 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.8.1 +version: 0.9.0 # renovate datasource=docker depName=ghcr.io/gabe565/ascii-movie -appVersion: 1.3.1 +appVersion: 1.4.0 kubeVersion: ">=1.22.0-0" keywords: - ascii-art @@ -22,9 +22,11 @@ sources: annotations: artifacthub.io/changes: |- - kind: changed - description: Update ghcr.io/gabe565/ascii-movie Docker tag to v1.3.1 + description: Update ghcr.io/gabe565/ascii-movie Docker tag to v1.4.0 - kind: added - description: Exclude probe logs via duration flag instead of gateway IP + description: Add internal API service + - kind: changed + description: Use API service for health check artifacthub.io/links: |- - name: App Source url: https://github.com/gabe565/ascii-movie diff --git a/charts/ascii-movie/README.md b/charts/ascii-movie/README.md index 7aa047c95..00473aa4b 100644 --- a/charts/ascii-movie/README.md +++ b/charts/ascii-movie/README.md @@ -2,16 +2,16 @@ ascii-movie logo -![Version: 0.8.1](https://img.shields.io/badge/Version-0.8.1-informational?style=flat) +![Version: 0.9.0](https://img.shields.io/badge/Version-0.9.0-informational?style=flat) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat) -![AppVersion: 1.3.1](https://img.shields.io/badge/AppVersion-1.3.1-informational?style=flat) +![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat) Star Wars movie SSH and Telnet server **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-movie&version=0.8.1)** +[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=ascii-movie&version=0.9.0)** ## Source Code @@ -86,7 +86,7 @@ N/A | env | string | See [values.yaml](./values.yaml) | Environment variables. [[ref]](https://github.com/gabe565/ascii-movie/blob/main/docs/ascii-movie_serve.md) | | image.pullPolicy | string | `"Always"` | image pull policy | | image.repository | string | `"ghcr.io/gabe565/ascii-movie"` | image repository. | -| image.tag | string | `"1.3.1"` | image tag | +| image.tag | string | `"1.4.0"` | image tag | | secrets.ssh.enabled | string | `true` if SSH port is enabled, else `false` | Enables SSH host key volume. | | secrets.ssh.stringData.ssh_host_ed25519_key | string | Generated | SSH Ed25519 host key. | | secrets.ssh.stringData.ssh_host_rsa_key | string | Generated | SSH RSA host key. | diff --git a/charts/ascii-movie/templates/common.yaml b/charts/ascii-movie/templates/common.yaml index 786767f0c..97254990f 100644 --- a/charts/ascii-movie/templates/common.yaml +++ b/charts/ascii-movie/templates/common.yaml @@ -7,7 +7,7 @@ env: ASCII_MOVIE_TELNET_ENABLED: {{ .Values.service.main.ports.telnet.enabled }} ASCII_MOVIE_TELNET_ADDRESS: :{{ .Values.service.main.ports.telnet.port }} - ASCII_MOVIE_LOG_EXCLUDE_FASTER: "100ms" + ASCII_MOVIE_API_ADDRESS: :{{ .Values.service.api.ports.http.port }} {{- if or .Values.service.main.ports.ssh.enabled .Values.secrets.ssh.enabled }} ASCII_MOVIE_SSH_HOST_KEY: /etc/ssh/ssh_host_rsa_key,/etc/ssh/ssh_host_ed25519_key @@ -38,6 +38,20 @@ secrets: {{- genPrivateKey "rsa" | toYaml | indent 8 }} {{- end }} {{- end }} + +probes: + liveness: + type: HTTP + port: http + path: /health + readiness: + type: HTTP + port: http + path: /health + startup: + type: HTTP + port: http + path: /health {{- end -}} {{- $_ := merge .Values (include "asciiMovie.harcodedValues" . | fromYaml) -}} diff --git a/charts/ascii-movie/values.yaml b/charts/ascii-movie/values.yaml index 99504a4dd..46f3aac32 100644 --- a/charts/ascii-movie/values.yaml +++ b/charts/ascii-movie/values.yaml @@ -11,7 +11,7 @@ image: # -- image pull policy pullPolicy: Always # -- image tag - tag: 1.3.1 + tag: 1.4.0 controller: # -- Set the controller upgrade strategy @@ -20,10 +20,6 @@ controller: # -- Environment variables. [[ref]](https://github.com/gabe565/ascii-movie/blob/main/docs/ascii-movie_serve.md) # @default -- See [values.yaml](./values.yaml) env: - # ASCII_MOVIE_PAD_TOP: - # ASCII_MOVIE_PAD_BOTTOM: - # ASCII_MOVIE_PAD_LEFT: - # ASCII_MOVIE_PROGRESS_PAD_BOTTOM: # ASCII_MOVIE_SPEED: # -- Configures service settings for the chart. @@ -43,6 +39,12 @@ service: enabled: true primary: true port: 23 + api: + enabled: true + ports: + http: + enabled: true + port: 1977 secrets: ssh: