Skip to content

Commit

Permalink
chore(charts): update the charts to reflect new api/v1
Browse files Browse the repository at this point in the history
Signed-off-by: Cryptophobia <[email protected]>
  • Loading branch information
Cryptophobia committed Sep 27, 2020
1 parent 6ddeac0 commit 5ce91b9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
5 changes: 2 additions & 3 deletions charts/router/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: router
home: https://github.com/teamhephy/router
version: <Will be populated by the ci before publishing the chart>
description: Edge router for Deis Workflow.
description: Edge router for Hephy Workflow.
maintainers:
- name: Deis Team
email: [email protected]
- email: [email protected]
9 changes: 9 additions & 0 deletions charts/router/templates/_helpers.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,12 @@ rbac.authorization.k8s.io/v1alpha1
rbac.authorization.k8s.io/v1
{{- end -}}
{{- end -}}
{{- define "APIVersion" -}}
{{- if .Capabilities.APIVersions.Has "apps/v1" -}}
apps/v1
{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" -}}
extensions/v1beta1
{{- else -}}
apps/v1
{{- end -}}
{{- end -}}
4 changes: 2 additions & 2 deletions charts/router/templates/router-deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if not .Values.global.experimental_native_ingress }}
apiVersion: extensions/v1beta1
apiVersion: {{ template "APIVersion" . }}
kind: Deployment
metadata:
name: deis-router
Expand Down Expand Up @@ -31,7 +31,7 @@ spec:
serviceAccount: deis-router
containers:
- name: deis-router
image: quay.io/{{.Values.org}}/router:{{.Values.docker_tag}}
image: {{.Values.org}}/router:{{.Values.docker_tag}}
imagePullPolicy: {{.Values.pull_policy}}
{{- if or (.Values.limits_cpu) (.Values.limits_memory) (.Values.requests_cpu) (.Values.requests_memory)}}
resources:
Expand Down
2 changes: 1 addition & 1 deletion charts/router/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org: "deisci"
org: "hephy"
pull_policy: "Always"
docker_tag: canary
platform_domain: ""
Expand Down

0 comments on commit 5ce91b9

Please sign in to comment.