From e1c82bf4757f70ca0d3371de2ffefc161b03a147 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 12:42:11 -0400 Subject: [PATCH 1/6] tag 2.19.1 Signed-off-by: Kingdon Barrett --- charts/router/Chart.yaml | 2 +- charts/router/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/router/Chart.yaml b/charts/router/Chart.yaml index ecb0509..7eef09a 100644 --- a/charts/router/Chart.yaml +++ b/charts/router/Chart.yaml @@ -1,6 +1,6 @@ name: router home: https://github.com/teamhephy/router -version: +version: 2.19.1 description: Edge router for Hephy Workflow. maintainers: - email: team@teamhephy.com diff --git a/charts/router/values.yaml b/charts/router/values.yaml index 4e331b6..f4b9c1b 100644 --- a/charts/router/values.yaml +++ b/charts/router/values.yaml @@ -1,6 +1,6 @@ org: "hephy" -pull_policy: "Always" -docker_tag: canary +pull_policy: "IfNotPresent" +docker_tag: v2.19.0 platform_domain: "" dhparam: "" # limits_cpu: "100m" From 8567159740fc4aa64855687bd54a30419cea5fb3 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 13:35:59 -0400 Subject: [PATCH 2/6] fix template issue (nil dereference!) Signed-off-by: Kingdon Barrett --- charts/router/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/router/values.yaml b/charts/router/values.yaml index f4b9c1b..8787b2a 100644 --- a/charts/router/values.yaml +++ b/charts/router/values.yaml @@ -7,9 +7,9 @@ dhparam: "" # 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" From df2024796c1d0ef2d2a444574ccfbb0e27003da0 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 13:36:24 -0400 Subject: [PATCH 3/6] tag 2.19.2 Signed-off-by: Kingdon Barrett --- charts/router/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/router/Chart.yaml b/charts/router/Chart.yaml index 7eef09a..4425678 100644 --- a/charts/router/Chart.yaml +++ b/charts/router/Chart.yaml @@ -1,6 +1,6 @@ name: router home: https://github.com/teamhephy/router -version: 2.19.1 +version: 2.19.2 description: Edge router for Hephy Workflow. maintainers: - email: team@teamhephy.com From 964d2f8a72e58ab06e57144111097a814a9d7c02 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 15:51:44 -0400 Subject: [PATCH 4/6] use_native_ingress Signed-off-by: Kingdon Barrett --- charts/router/templates/router-deployment.yaml | 4 ++-- charts/router/templates/router-dhparam-secret.yaml | 4 ++-- charts/router/templates/router-service-account.yaml | 4 ++-- charts/router/templates/router-service.yaml | 4 ++-- charts/router/values.yaml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) 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 8787b2a..92cf15e 100644 --- a/charts/router/values.yaml +++ b/charts/router/values.yaml @@ -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 From c6227c64b6b98ecedcaedb5a2b616cd87c0187db Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 15:53:17 -0400 Subject: [PATCH 5/6] tag 2.19.3 Signed-off-by: Kingdon Barrett --- charts/router/Chart.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/router/Chart.yaml b/charts/router/Chart.yaml index 4425678..dd36585 100644 --- a/charts/router/Chart.yaml +++ b/charts/router/Chart.yaml @@ -1,6 +1,7 @@ +apiVersion: v2 name: router home: https://github.com/teamhephy/router -version: 2.19.2 +version: 2.19.3 description: Edge router for Hephy Workflow. maintainers: - email: team@teamhephy.com From 878b687d2aebc2db4c08e068e0d0af8cb012f872 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 16:34:58 -0400 Subject: [PATCH 6/6] tag 2.19.4 Signed-off-by: Kingdon Barrett --- charts/router/Chart.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/router/Chart.yaml b/charts/router/Chart.yaml index dd36585..78a0df8 100644 --- a/charts/router/Chart.yaml +++ b/charts/router/Chart.yaml @@ -1,7 +1,8 @@ apiVersion: v2 name: router home: https://github.com/teamhephy/router -version: 2.19.3 +version: 2.19.4 description: Edge router for Hephy Workflow. maintainers: - - email: team@teamhephy.com +- name: Team Hephy + email: team@teamhephy.com