Skip to content

Commit 3176b00

Browse files
authored
Merge pull request #2 from kingdonb/k8s-1-16-chart-update
chore(registry-proxy): permit umbrella override api group
2 parents 77a27b4 + bca00d4 commit 3176b00

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{{/*
2+
Set apiVersion based on .Capabilities.APIVersions
3+
*/}}
4+
{{- define "APIVersion" -}}
5+
{{- if .Capabilities.APIVersions.Has "apps/v1" -}}
6+
apps/v1
7+
{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" -}}
8+
extensions/v1beta1
9+
{{- else -}}
10+
apps/v1
11+
{{- end -}}
12+
{{- end -}}

charts/registry-proxy/templates/registry-proxy-daemon.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if eq .Values.global.registry_location "on-cluster" }}
2-
apiVersion: extensions/v1beta1
2+
apiVersion: {{ template "APIVersion" . }}
33
kind: DaemonSet
44
metadata:
55
name: deis-registry-proxy

0 commit comments

Comments
 (0)