Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/drone] fixing server.protocol and NOTES.txt #10971

Merged
merged 1 commit into from
Jan 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[stable/drone] fixing server.protocol and NOTES.txt
Signed-off-by: Max Williams <max.williams@deliveryhero.com>
  • Loading branch information
max-rocket-internet committed Jan 29, 2019
commit 7d8ba90daed7057c8b2c2d9ba465ddfe5ec24516
2 changes: 1 addition & 1 deletion stable/drone/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: drone
home: https://drone.io/
icon: https://drone.io/apple-touch-icon.png
version: 2.0.0-rc.2
version: 2.0.0-rc.3
appVersion: 1.0.0-rc.4
description: Drone is a Continuous Delivery system built on container technology
keywords:
Expand Down
4 changes: 2 additions & 2 deletions stable/drone/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{{- if .Values.ingress.enabled }}
From outside the cluster, the server URL(s) are:
{{- range .Values.ingress.hosts }}
http://{{ . }}
{{ $.Values.server.protocol }}://{{ . }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the $ before .Values.server.protocol?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of the scope. Here we are in a loop so you can't access the parent scope without it. You get this error without it:

Error: render error in "drone/templates/NOTES.txt": template: drone/templates/NOTES.txt:9:8: executing "drone/templates/NOTES.txt" at <.>: can't give argument to non-function .

{{- end }}

{{- else if contains "NodePort" .Values.service.type }}
Expand Down Expand Up @@ -76,4 +76,4 @@ By setting `server.kubernetes.enabled=false` you've disabled kubernetes
pipelines and are instead using the legacy agent method which utilizes
either docker-in-docker or host mounting in the docker socket. This is
not recommended due to the additional security concerns.
{{- end }}
{{- end }}
4 changes: 2 additions & 2 deletions stable/drone/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ server:
##
# host: "drone.domain.io"

## protocol should be http:// or https://
protocol: http://
## protocol should be http or https
protocol: http

## Initial admin user
## Leaving this blank may make it impossible to log into drone.
Expand Down