Skip to content
This repository has been archived by the owner on Jul 16, 2021. It is now read-only.

Move all ingress annotations to values #297

Merged
merged 2 commits into from
Jun 29, 2017
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
2 changes: 1 addition & 1 deletion deployment/monocular/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: monocular
description: Monocular is a search and discovery front end for Helm Charts Repositories.
version: 0.4.3
version: 0.4.4
appVersion: v0.2.1
home: https://github.com/helm/monocular
sources:
Expand Down
2 changes: 0 additions & 2 deletions deployment/monocular/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ metadata:
{{- range $key, $value := .Values.ingress.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
ingress.kubernetes.io/rewrite-target: /
kubernetes.io/ingress.class: nginx
labels:
app: {{ template "fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
Expand Down
4 changes: 3 additions & 1 deletion deployment/monocular/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ ingress:
## Ingress annotations
##
annotations:
# kubernetes.io/tls-acme: 'true'
ingress.kubernetes.io/rewrite-target: /
kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: 'true'

## Ingress TLS configuration
## Secrets must be manually created in the namespace
Expand Down