Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: test release #175

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
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
6 changes: 4 additions & 2 deletions charts/controller/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: v2
name: controller
home: https://github.com/teamhephy/controller
version: <Will be populated by the ci before publishing the chart>
version: 2.22.3
description: Hephy Workflow Controller (API).
maintainers:
- email: team@teamhephy.com
- name: Team Hephy
email: team@teamhephy.com
2 changes: 1 addition & 1 deletion charts/controller/templates/controller-clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ rules:
- apiGroups: ["extensions", "autoscaling"]
resources: ["horizontalpodautoscalers"]
verbs: ["get", "list", "create", "update", "delete"]
{{ if .Values.global.native_ingress }}
{{ if .Values.global.use_native_ingress }}
- apiGroups: ["networking.k8s.io"]
resources: ["ingresses"]
verbs: ["get", "list", "watch", "create", "update", "delete"]
Expand Down
2 changes: 1 addition & 1 deletion charts/controller/templates/controller-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
value: "127.0.0.1"
# Environmental variable value for $NATIVE_INGRESS
- name: "NATIVE_INGRESS"
value: "{{ .Values.global.native_ingress }}"
value: "{{ .Values.global.use_native_ingress }}"
- name: "NATIVE_INGRESS_HOSTNAME"
value: "{{ .Values.platform_domain }}"
- name: "K8S_API_VERIFY_TLS"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if .Values.global.native_ingress }}
{{ if .Values.global.use_native_ingress }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand Down
8 changes: 4 additions & 4 deletions charts/controller/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org: "deisci"
pull_policy: "Always"
docker_tag: canary
org: "hephy"
pull_policy: "IfNotPresent"
docker_tag: v2.22.0
app_pull_policy: "Always"
# A comma-separated list of URLs to send app release information to
# See https://deis.com/docs/workflow/managing-workflow/deploy-hooks
Expand Down Expand Up @@ -71,6 +71,6 @@ global:
# Valid values are:
# - true: The deis controller will now create Kubernetes ingress rules for each app, and ingress rules will automatically be created for the controller itself.
# - false: The default mode, and the default behavior of Deis workflow.
native_ingress: false
use_native_ingress: false
# Role-Based Access Control for Kubernetes >= 1.5
use_rbac: false
Loading