diff --git a/charts/router/Chart.yaml b/charts/router/Chart.yaml index ecb0509..78a0df8 100644 --- a/charts/router/Chart.yaml +++ b/charts/router/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 name: router home: https://github.com/teamhephy/router -version: +version: 2.19.4 description: Edge router for Hephy Workflow. maintainers: - - email: team@teamhephy.com +- name: Team Hephy + email: team@teamhephy.com diff --git a/charts/router/templates/router-deployment.yaml b/charts/router/templates/router-deployment.yaml index 7c60381..37cb7c2 100644 --- a/charts/router/templates/router-deployment.yaml +++ b/charts/router/templates/router-deployment.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.global.experimental_native_ingress }} +{{- if not .Values.global.use_native_ingress }} apiVersion: {{ template "APIVersion" . }} kind: Deployment metadata: @@ -97,4 +97,4 @@ spec: port: 9090 initialDelaySeconds: 1 timeoutSeconds: 1 -{{ end }}{{/* if not .Values.global.experimental_native_ingress */}} +{{ end }}{{/* if not .Values.global.use_native_ingress */}} diff --git a/charts/router/templates/router-dhparam-secret.yaml b/charts/router/templates/router-dhparam-secret.yaml index 703dae0..d53db74 100644 --- a/charts/router/templates/router-dhparam-secret.yaml +++ b/charts/router/templates/router-dhparam-secret.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.global.experimental_native_ingress }} +{{- if not .Values.global.use_native_ingress }} apiVersion: v1 kind: Secret metadata: @@ -8,4 +8,4 @@ metadata: type: Opaque data: dhparam: {{ if not (empty .Values.dhparam) }}{{ .Values.dhparam }}{{ else }}LS0tLS1CRUdJTiBESCBQQVJBTUVURVJTLS0tLS0KTUlJQ0NBS0NBZ0VBMTV6UHBQcElsaTYyUC9aTHFUcHhYdnNHMUtZU2hnbzJUOFpFZ1VzM0NxTjZiSU4xSHU1VwpXNnNVdDRYWXpJNExkSWxRanlFOHZjeWhxdEl6ajIyM1hLalhXQVE1WU5ud2NZU05jVUlyTjh1YThQN2ZmNlF2CnhiWlFMbjRUY1k3N2VWMm1Ecm9MSU5TUlFzZFZGVlpiRUpmK1lOZEFOa2w4dlg5UDlIelVrdm5SaGI5cDJJOXEKWGY5dll1cEVVbXd1K1I2d2pzNnFzUTJ4akVmTGxmcnczaEdrUi9jdjBtT2QvUmVrWWRjbVlISjlUelpkM3NSZgp6cTl3ckw0RWRDNzBUSmNQcERZZXRaWUdKV3Fxa3hpKzM4eGtuV2dtNkN0cE1TdEFHMk5UVWJ2ZmRoTGpid2tmCmU4a2o4M01HalZ5ajNlTktTd0VQYlo5bXJWTFR3VWh6WkQ2bFV3eG1rQ1ZBVXl2MEZmb3BhT29PSXJuNnRUaVIKRWhmdkxZVXQvWkVZK2hPOWpFalp6alAvbEcrOFFpZWpFaW16bjFIbkt4S041WE55bkRraUxwR3p4TjNBK2RreAo0NUpuUGZDODZVTS9ZRnpRVy9zdWszTUhLTk5MSVRtVXNHZzRiTTdSYWNCT29OTm94S0hYTTI5aUE4UU9YRytBCnF2eW4wQ2lNbWN4K0NvSTN2anN2NW83Yk5OU2xvWEtCUlExMFY4VVlXZDd4eENzeDc4cTFLMHRHQUhnZWE0eEoKTW1FRGpRN2I4UXEzZC94Y05EM05ja0JGbU1VbnRVSjlUTHJSYU9WM0V2bDVYcG1JMnl1ZENHVXRuUVhleVgyRApRSHFyOEtiQmJNMGZkUFg4dUJJWVNFL0U4NVYzT294eUJ2UFJLRzRtdUN5OVp1QWFjb0Z5aG1NQ0FRST0KLS0tLS1FTkQgREggUEFSQU1FVEVSUy0tLS0tCg=={{ end }} -{{ end }}{{/* if not .Values.global.experimental_native_ingress */}} +{{ end }}{{/* if not .Values.global.use_native_ingress */}} diff --git a/charts/router/templates/router-service-account.yaml b/charts/router/templates/router-service-account.yaml index 5fa7a12..f4f2cb9 100644 --- a/charts/router/templates/router-service-account.yaml +++ b/charts/router/templates/router-service-account.yaml @@ -1,8 +1,8 @@ -{{- if not .Values.global.experimental_native_ingress }} +{{- if not .Values.global.use_native_ingress }} apiVersion: v1 kind: ServiceAccount metadata: name: deis-router labels: heritage: deis -{{ end }}{{/* if not .Values.global.experimental_native_ingress */}} +{{ end }}{{/* if not .Values.global.use_native_ingress */}} diff --git a/charts/router/templates/router-service.yaml b/charts/router/templates/router-service.yaml index 23463b9..6b7cc26 100644 --- a/charts/router/templates/router-service.yaml +++ b/charts/router/templates/router-service.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.global.experimental_native_ingress }} +{{- if not .Values.global.use_native_ingress }} apiVersion: v1 kind: Service metadata: @@ -27,4 +27,4 @@ spec: - name: healthz port: 9090 targetPort: 9090 -{{ end }}{{/* if not .Values.global.experimental_native_ingress */}} +{{ end }}{{/* if not .Values.global.use_native_ingress */}} diff --git a/charts/router/values.yaml b/charts/router/values.yaml index 4e331b6..92cf15e 100644 --- a/charts/router/values.yaml +++ b/charts/router/values.yaml @@ -1,15 +1,15 @@ org: "hephy" -pull_policy: "Always" -docker_tag: canary +pull_policy: "IfNotPresent" +docker_tag: v2.19.0 platform_domain: "" dhparam: "" # limits_cpu: "100m" # limits_memory: "50Mi" # requests_cpu: "100m" # requests_memory: "50Mi" -# rate_limit: -# qps: "50.0" -# burst: "50" +rate_limit: {} +# qps: "50.0" +# burst: "50" # Any custom router annotations(https://github.com/teamhephy/router#annotations) # which need to be applied can be specified as key-value pairs under "deployment_annotations" @@ -34,6 +34,6 @@ global: # Valid values are: # - true: The Deis router will NOT be deployed. Inherently workflow will not be usable until a Kubernetes ingress controller is installed. # - false: The default mode, and the default behavior of Deis workflow. - experimental_native_ingress: false + use_native_ingress: false # Role-Based Access Control for Kubernetes >= 1.5 use_rbac: false