From 73976996aeec2ee4e21df7656f448a356690ddce Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Tue, 10 Nov 2020 04:12:40 -0500 Subject: [PATCH] [incubator/gogs] add repo archive notice (#24044) * [incubator/gogs] add repo archive notice Signed-off-by: Scott Rigby * [incubator/gogs] use apps/v1 Signed-off-by: Carlos Panato * [incubator/gogs] update dependencies Signed-off-by: Carlos Panato * [incubator/gogs] update variables for postgres Signed-off-by: Carlos Panato Co-authored-by: Carlos Panato --- incubator/gogs/Chart.yaml | 2 +- incubator/gogs/README.md | 5 +++++ incubator/gogs/requirements.lock | 6 +++--- incubator/gogs/requirements.yaml | 2 +- incubator/gogs/templates/_helpers.tpl | 6 +++--- incubator/gogs/templates/deployment.yaml | 13 +++++++++---- incubator/gogs/templates/secrets.yaml | 2 +- incubator/gogs/values.yaml | 6 +++--- 8 files changed, 26 insertions(+), 16 deletions(-) diff --git a/incubator/gogs/Chart.yaml b/incubator/gogs/Chart.yaml index bc84253470..7baacaa02f 100644 --- a/incubator/gogs/Chart.yaml +++ b/incubator/gogs/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: 'Gogs: Go Git Service' name: gogs -version: 0.7.12 +version: 0.7.13 appVersion: 0.11.86 home: https://gogs.io/ icon: https://gogs.io/img/favicon.ico diff --git a/incubator/gogs/README.md b/incubator/gogs/README.md index bb3820dace..4257428149 100644 --- a/incubator/gogs/README.md +++ b/incubator/gogs/README.md @@ -1,3 +1,8 @@ +# ⚠️ Repo Archive Notice + +As of Nov 13, 2020, charts in this repo will no longer be updated. +For more information, see the Helm Charts [Deprecation and Archive Notice](https://github.com/helm/charts#%EF%B8%8F-deprecation-and-archive-notice), and [Update](https://helm.sh/blog/charts-repo-deprecation/). + # Gogs Helm Chart [Gogs][] is a painless self-hosted Git service. diff --git a/incubator/gogs/requirements.lock b/incubator/gogs/requirements.lock index fd515f1b09..9f5117c7af 100644 --- a/incubator/gogs/requirements.lock +++ b/incubator/gogs/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: postgresql repository: https://charts.helm.sh/stable - version: 0.6.0 -digest: sha256:7d9d94bb19520594608f84a4d0d4a2e5abc7562f611b9036573c08138f78e164 -generated: "2020-10-30T00:42:51.047908-04:00" + version: 8.6.4 +digest: sha256:2d4a4a26bf590dadca1597ac0a53e039d4489b77e0c7044bd20f3af8c895ffac +generated: "2020-11-10T09:49:00.301004+01:00" diff --git a/incubator/gogs/requirements.yaml b/incubator/gogs/requirements.yaml index 52b920e4d7..a242d55429 100644 --- a/incubator/gogs/requirements.yaml +++ b/incubator/gogs/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: postgresql - version: 0.6.0 + version: 8.6.4 repository: https://charts.helm.sh/stable condition: postgresql.install diff --git a/incubator/gogs/templates/_helpers.tpl b/incubator/gogs/templates/_helpers.tpl index f270ff055e..983f21daea 100644 --- a/incubator/gogs/templates/_helpers.tpl +++ b/incubator/gogs/templates/_helpers.tpl @@ -48,7 +48,7 @@ Determine database user based on use of postgresql dependency. */}} {{- define "gogs.database.user" -}} {{- if .Values.postgresql.install -}} -{{- .Values.postgresql.postgresUser | quote -}} +{{- .Values.postgresql.postgresqlUsername | quote -}} {{- else -}} {{- .Values.service.gogs.databaseUser | quote -}} {{- end -}} @@ -59,7 +59,7 @@ Determine database password based on use of postgresql dependency. */}} {{- define "gogs.database.password" -}} {{- if .Values.postgresql.install -}} -{{- .Values.postgresql.postgresPassword | quote -}} +{{- .Values.postgresql.postgresqlPassword | quote -}} {{- else -}} {{- .Values.service.gogs.databasePassword | quote -}} {{- end -}} @@ -70,7 +70,7 @@ Determine database name based on use of postgresql dependency. */}} {{- define "gogs.database.name" -}} {{- if .Values.postgresql.install -}} -{{- .Values.postgresql.postgresDatabase | quote -}} +{{- .Values.postgresql.postgresqlDatabase | quote -}} {{- else -}} {{- .Values.service.gogs.databaseName | quote -}} {{- end -}} diff --git a/incubator/gogs/templates/deployment.yaml b/incubator/gogs/templates/deployment.yaml index 25230402ea..bc4d7f4ae8 100644 --- a/incubator/gogs/templates/deployment.yaml +++ b/incubator/gogs/templates/deployment.yaml @@ -1,20 +1,25 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "gogs.fullname" . }} + name: {{ include "gogs.fullname" . }} labels: + app: {{ include "gogs.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} spec: replicas: 1 strategy: type: RollingUpdate selector: matchLabels: - app: {{ template "gogs.fullname" . }} + app: {{ include "gogs.fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" template: metadata: labels: - app: {{ template "gogs.fullname" . }} + app: {{ include "gogs.fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: {{- with .Values.securityContext }} securityContext: diff --git a/incubator/gogs/templates/secrets.yaml b/incubator/gogs/templates/secrets.yaml index fa6d87d3c3..c8cc47f96c 100644 --- a/incubator/gogs/templates/secrets.yaml +++ b/incubator/gogs/templates/secrets.yaml @@ -9,4 +9,4 @@ metadata: heritage: "{{ .Release.Service }}" type: Opaque data: - postgresql-user: {{ .Values.postgresql.postgresUser | b64enc | quote }} + postgresql-user: {{ .Values.postgresql.postgresqlUsername | b64enc | quote }} diff --git a/incubator/gogs/values.yaml b/incubator/gogs/values.yaml index 8aba2efddf..2a5939111e 100644 --- a/incubator/gogs/values.yaml +++ b/incubator/gogs/values.yaml @@ -358,16 +358,16 @@ postgresql: ### PostgreSQL User to create. ## - postgresUser: gogs + postgresqlUsername: gogs ## PostgreSQL Password for the new user. ## If not set, a random 10 characters password will be used. ## - postgresPassword: gogs + postgresqlPassword: gogs ## PostgreSQL Database to create. ## - postgresDatabase: gogs + postgresqlDatabase: gogs ## PostgreSQL SSL Mode ##