diff --git a/stable/drone/Chart.yaml b/stable/drone/Chart.yaml index 801a2a0dbe..c930c918eb 100644 --- a/stable/drone/Chart.yaml +++ b/stable/drone/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: drone home: https://drone.io/ icon: https://drone.io/apple-touch-icon.png -version: 2.3.2 +version: 2.4.0 appVersion: 1.6.1 description: Drone is a Continuous Delivery system built on container technology keywords: diff --git a/stable/drone/templates/_provider-envs.yaml b/stable/drone/templates/_provider-envs.yaml index 693e9820d6..bb981e8fbc 100644 --- a/stable/drone/templates/_provider-envs.yaml +++ b/stable/drone/templates/_provider-envs.yaml @@ -22,8 +22,15 @@ key: {{ .Values.sourceControl.gitlab.clientSecretKey }} {{- end -}} {{- if eq .Values.sourceControl.provider "gitea" -}} + - name: DRONE_GITEA_CLIENT_ID + value: {{ .Values.sourceControl.gitea.clientID }} - name: DRONE_GITEA_SERVER value: {{ .Values.sourceControl.gitea.server }} + - name: DRONE_GITEA_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: {{ template "drone.sourceControlSecret" . }} + key: {{ .Values.sourceControl.gitea.clientSecretKey }} {{- end -}} {{- if eq .Values.sourceControl.provider "gogs" -}} - name: DRONE_GOGS_SERVER diff --git a/stable/drone/templates/secrets.yaml b/stable/drone/templates/secrets.yaml index 144cb3eb30..5a021ab2db 100644 --- a/stable/drone/templates/secrets.yaml +++ b/stable/drone/templates/secrets.yaml @@ -32,6 +32,8 @@ data: {{ .Values.sourceControl.github.clientSecretKey }}: {{ .Values.sourceControl.github.clientSecretValue | b64enc | quote }} {{- else if eq .Values.sourceControl.provider "gitlab" -}} {{ .Values.sourceControl.gitlab.clientSecretKey }}: {{ .Values.sourceControl.gitlab.clientSecretValue | b64enc | quote }} + {{- else if eq .Values.sourceControl.provider "gitea" -}} + {{ .Values.sourceControl.gitea.clientSecretKey }}: {{ .Values.sourceControl.gitea.clientSecretValue | b64enc | quote }} {{- else if eq .Values.sourceControl.provider "bitbucketCloud" -}} {{ .Values.sourceControl.bitbucketCloud.clientSecretKey }}: {{ .Values.sourceControl.bitbucketCloud.clientSecretValue | b64enc | quote }} {{ end }} diff --git a/stable/drone/values.yaml b/stable/drone/values.yaml index 6cda9c27b4..47fee3d143 100644 --- a/stable/drone/values.yaml +++ b/stable/drone/values.yaml @@ -58,12 +58,10 @@ ingress: # annotations: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: 'true' - ## Drone hostnames must be provided if Ingress is enabled ## # hosts: # - drone.domain.io - ## Drone Ingress TLS configuration secrets ## Must be manually created in the namespace ## @@ -94,6 +92,9 @@ sourceControl: clientSecretValue: server: gitea: + clientID: + clientSecretKey: clientSecret + clientSecretValue: server: gogs: server: @@ -138,7 +139,6 @@ server: ## you can run pipeline jobs in another namespace, if you choose to do this ## you'll need to create that namespace manually. # namespace: - ## alternative service account to create to create drone pipelines. this account ## will be given cluster-admin rights. ## if not set the rights will be given to the default drone service account name.