From 0f80960305b6278ea4a4a954771865092ade868e Mon Sep 17 00:00:00 2001 From: Tiago Manuel Ventura Loureiro Date: Mon, 9 Mar 2020 12:47:04 +0100 Subject: [PATCH 1/7] Use 'teams' as the default url, not 'team' (#193) --- ansible/roles/minio-static-files/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/minio-static-files/defaults/main.yml b/ansible/roles/minio-static-files/defaults/main.yml index 27e69d60b..282717145 100644 --- a/ansible/roles/minio-static-files/defaults/main.yml +++ b/ansible/roles/minio-static-files/defaults/main.yml @@ -10,7 +10,7 @@ assetsURL: "https://{{ prefix }}assets.{{ domain }}" deeplink_config_json: "{{ assetsURL }}/public/deeplink.json" backendURL: "https://{{ prefix }}https.{{ domain }}" backendWSURL: "https://{{ prefix }}ssl.{{ domain }}" -teamsURL: "https://{{ prefix }}team.{{ domain }}" +teamsURL: "https://{{ prefix }}teams.{{ domain }}" accountsURL: "https://{{ prefix }}account.{{ domain }}" # FUTUREWORK: From 397a389de8de5dff1f5bf2180484672813804e35 Mon Sep 17 00:00:00 2001 From: kvaps Date: Tue, 17 Mar 2020 12:37:58 +0100 Subject: [PATCH 2/7] Move hardcoded AWS_REGION env var value into chart values file (#197) --- charts/brig/templates/deployment.yaml | 2 +- charts/brig/values.yaml | 1 + charts/galley/templates/deployment.yaml | 2 +- charts/galley/values.yaml | 2 ++ charts/gundeck/templates/deployment.yaml | 2 +- charts/gundeck/values.yaml | 2 ++ 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/charts/brig/templates/deployment.yaml b/charts/brig/templates/deployment.yaml index 643e2508e..81d1c2c95 100644 --- a/charts/brig/templates/deployment.yaml +++ b/charts/brig/templates/deployment.yaml @@ -65,7 +65,7 @@ spec: key: awsSecretKey # TODO: Is this the best way to do this? - name: AWS_REGION - value: "eu-west-1" + value: "{{ .Values.config.aws.region }}" ports: - containerPort: {{ .Values.service.internalPort }} livenessProbe: diff --git a/charts/brig/values.yaml b/charts/brig/values.yaml index bdaf0cc29..5d08dbcc8 100644 --- a/charts/brig/values.yaml +++ b/charts/brig/values.yaml @@ -22,6 +22,7 @@ config: port: 9200 index: directory aws: + region: "eu-west-1" sesEndpoint: https://email.eu-west-1.amazonaws.com sqsEndpoint: https://sqs.eu-west-1.amazonaws.com dynamoDBEndpoint: https://dynamodb.eu-west-1.amazonaws.com diff --git a/charts/galley/templates/deployment.yaml b/charts/galley/templates/deployment.yaml index 3161fb1df..5e7fe7218 100644 --- a/charts/galley/templates/deployment.yaml +++ b/charts/galley/templates/deployment.yaml @@ -55,7 +55,7 @@ spec: name: galley key: awsSecretKey - name: AWS_REGION - value: eu-west-1 + value: "{{ .Values.config.aws.region }}" ports: - containerPort: {{ .Values.service.internalPort }} livenessProbe: diff --git a/charts/galley/values.yaml b/charts/galley/values.yaml index 31bc87058..0f96a8641 100644 --- a/charts/galley/values.yaml +++ b/charts/galley/values.yaml @@ -26,3 +26,5 @@ config: featureFlags: # see #RefConfigOptions in `/docs/reference` (https://github.com/wireapp/wire-server/) sso: disabled-by-default legalhold: disabled-by-default + aws: + region: "eu-west-1" diff --git a/charts/gundeck/templates/deployment.yaml b/charts/gundeck/templates/deployment.yaml index 4e010360b..97606fbeb 100644 --- a/charts/gundeck/templates/deployment.yaml +++ b/charts/gundeck/templates/deployment.yaml @@ -55,7 +55,7 @@ spec: name: gundeck key: awsSecretKey - name: AWS_REGION - value: "eu-west-1" + value: "{{ .Values.config.aws.region }}" ports: - containerPort: {{ .Values.service.internalPort }} livenessProbe: diff --git a/charts/gundeck/values.yaml b/charts/gundeck/values.yaml index c240b8c20..315acb9c6 100644 --- a/charts/gundeck/values.yaml +++ b/charts/gundeck/values.yaml @@ -20,3 +20,5 @@ config: host: redis-ephemeral port: 6379 bulkPush: false + aws: + region: "eu-west-1" From 5230ea87b1e2db7d2ca8f1bd6aed1e7a04b45d26 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 17 Mar 2020 13:25:35 +0100 Subject: [PATCH 3/7] Use apps/v1 for all deployments (attempt 2) (#201) * Use apps/v1 for all deployments * Add selectors to deployments without selectors Co-authored-by: jschaul --- charts/account-pages/templates/deployment.yaml | 2 +- charts/backoffice/templates/deployment.yaml | 2 +- charts/brig/templates/deployment.yaml | 2 +- charts/cargohold/templates/deployment.yaml | 2 +- charts/demo-smtp/templates/deployment.yaml | 2 +- charts/elasticsearch-ephemeral/templates/es.yaml | 5 ++++- charts/fake-aws-dynamodb/templates/deployment.yaml | 5 ++++- charts/fake-aws-ses/templates/deployment.yaml | 5 ++++- charts/fake-aws-sns/templates/deployment.yaml | 5 ++++- charts/fake-aws-sqs/templates/deployment.yaml | 5 ++++- charts/galley/templates/deployment.yaml | 2 +- charts/gundeck/templates/deployment.yaml | 2 +- charts/nginz/templates/deployment.yaml | 2 +- charts/proxy/templates/deployment.yaml | 2 +- charts/reaper/templates/deployment.yaml | 6 +++++- charts/spar/templates/deployment.yaml | 2 +- charts/team-settings/templates/deployment.yaml | 2 +- charts/webapp/templates/deployment.yaml | 2 +- 18 files changed, 37 insertions(+), 18 deletions(-) diff --git a/charts/account-pages/templates/deployment.yaml b/charts/account-pages/templates/deployment.yaml index a18b76a60..f9fd55868 100644 --- a/charts/account-pages/templates/deployment.yaml +++ b/charts/account-pages/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: account-pages diff --git a/charts/backoffice/templates/deployment.yaml b/charts/backoffice/templates/deployment.yaml index 5aed1e772..ce5fe2880 100644 --- a/charts/backoffice/templates/deployment.yaml +++ b/charts/backoffice/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: backoffice diff --git a/charts/brig/templates/deployment.yaml b/charts/brig/templates/deployment.yaml index 81d1c2c95..4b01f1bf4 100644 --- a/charts/brig/templates/deployment.yaml +++ b/charts/brig/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: brig diff --git a/charts/cargohold/templates/deployment.yaml b/charts/cargohold/templates/deployment.yaml index d56eda6d8..1aeb4cd51 100644 --- a/charts/cargohold/templates/deployment.yaml +++ b/charts/cargohold/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: cargohold diff --git a/charts/demo-smtp/templates/deployment.yaml b/charts/demo-smtp/templates/deployment.yaml index 827eff73f..2107016df 100644 --- a/charts/demo-smtp/templates/deployment.yaml +++ b/charts/demo-smtp/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "demo-smtp.fullname" . }} diff --git a/charts/elasticsearch-ephemeral/templates/es.yaml b/charts/elasticsearch-ephemeral/templates/es.yaml index a7cfabed2..9c9f00fca 100644 --- a/charts/elasticsearch-ephemeral/templates/es.yaml +++ b/charts/elasticsearch-ephemeral/templates/es.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "fullname" . }} @@ -11,6 +11,9 @@ metadata: component: {{ template "fullname" . }} spec: replicas: 1 + selector: + matchLabels: + component: {{ template "fullname" . }} template: metadata: labels: diff --git a/charts/fake-aws-dynamodb/templates/deployment.yaml b/charts/fake-aws-dynamodb/templates/deployment.yaml index d521e97c2..73c7bcaba 100644 --- a/charts/fake-aws-dynamodb/templates/deployment.yaml +++ b/charts/fake-aws-dynamodb/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "fullname" . }} @@ -9,6 +9,9 @@ metadata: heritage: "{{ .Release.Service }}" spec: replicas: 1 + selector: + matchLabels: + app: {{ template "fullname" . }} template: metadata: labels: diff --git a/charts/fake-aws-ses/templates/deployment.yaml b/charts/fake-aws-ses/templates/deployment.yaml index c7486a60b..11ec6b550 100644 --- a/charts/fake-aws-ses/templates/deployment.yaml +++ b/charts/fake-aws-ses/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "fullname" . }} @@ -9,6 +9,9 @@ metadata: heritage: "{{ .Release.Service }}" spec: replicas: 1 + selector: + matchLabels: + app: {{ template "fullname" . }} template: metadata: labels: diff --git a/charts/fake-aws-sns/templates/deployment.yaml b/charts/fake-aws-sns/templates/deployment.yaml index 970d9592f..f93bfc621 100644 --- a/charts/fake-aws-sns/templates/deployment.yaml +++ b/charts/fake-aws-sns/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "fullname" . }} @@ -9,6 +9,9 @@ metadata: heritage: "{{ .Release.Service }}" spec: replicas: 1 + selector: + matchLabels: + app: {{ template "fullname" . }} template: metadata: labels: diff --git a/charts/fake-aws-sqs/templates/deployment.yaml b/charts/fake-aws-sqs/templates/deployment.yaml index 899d2874c..24055e126 100644 --- a/charts/fake-aws-sqs/templates/deployment.yaml +++ b/charts/fake-aws-sqs/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "fullname" . }} @@ -9,6 +9,9 @@ metadata: heritage: "{{ .Release.Service }}" spec: replicas: 1 + selector: + matchLabels: + app: {{ template "fullname" . }} template: metadata: labels: diff --git a/charts/galley/templates/deployment.yaml b/charts/galley/templates/deployment.yaml index 5e7fe7218..74122345b 100644 --- a/charts/galley/templates/deployment.yaml +++ b/charts/galley/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: galley diff --git a/charts/gundeck/templates/deployment.yaml b/charts/gundeck/templates/deployment.yaml index 97606fbeb..0914c21e7 100644 --- a/charts/gundeck/templates/deployment.yaml +++ b/charts/gundeck/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: gundeck diff --git a/charts/nginz/templates/deployment.yaml b/charts/nginz/templates/deployment.yaml index 2a81f76fb..0472c82c0 100644 --- a/charts/nginz/templates/deployment.yaml +++ b/charts/nginz/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginz diff --git a/charts/proxy/templates/deployment.yaml b/charts/proxy/templates/deployment.yaml index 4466b3048..ee6d09403 100644 --- a/charts/proxy/templates/deployment.yaml +++ b/charts/proxy/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: proxy diff --git a/charts/reaper/templates/deployment.yaml b/charts/reaper/templates/deployment.yaml index 3c3651249..1c2d9b250 100644 --- a/charts/reaper/templates/deployment.yaml +++ b/charts/reaper/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: reaper @@ -9,6 +9,10 @@ metadata: heritage: {{ .Release.Service }} spec: replicas: 1 + selector: + matchLabels: + wireService: reaper + release: {{ .Release.Name }} template: metadata: labels: diff --git a/charts/spar/templates/deployment.yaml b/charts/spar/templates/deployment.yaml index b209cc1c3..3d66fbe86 100644 --- a/charts/spar/templates/deployment.yaml +++ b/charts/spar/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: spar diff --git a/charts/team-settings/templates/deployment.yaml b/charts/team-settings/templates/deployment.yaml index 411687cf5..b9bce38d4 100644 --- a/charts/team-settings/templates/deployment.yaml +++ b/charts/team-settings/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: team-settings diff --git a/charts/webapp/templates/deployment.yaml b/charts/webapp/templates/deployment.yaml index 307b5280a..a619b18f9 100644 --- a/charts/webapp/templates/deployment.yaml +++ b/charts/webapp/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: webapp From 6d5ee69f9d417bc81c7b3307d931f11b5f4b0eef Mon Sep 17 00:00:00 2001 From: Tiago Manuel Ventura Loureiro Date: Tue, 17 Mar 2020 15:55:24 +0100 Subject: [PATCH 4/7] Fix elasticsearch-external endpoint (#198) --- charts/elasticsearch-external/templates/endpoint.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/elasticsearch-external/templates/endpoint.yaml b/charts/elasticsearch-external/templates/endpoint.yaml index 882aef2ad..04a4b1a04 100644 --- a/charts/elasticsearch-external/templates/endpoint.yaml +++ b/charts/elasticsearch-external/templates/endpoint.yaml @@ -32,4 +32,7 @@ subsets: - ip: {{ . }} {{- end }} ports: - - port: {{ .Values.portHttp }} + # port and name in the endpoint must match port and name in the service + # see also https://docs.openshift.com/enterprise/3.0/dev_guide/integrating_external_services.html + - name: http + port: {{ .Values.portHttp }} From 94a67f0bdf85b98ff130f9671b4a9a5fd86cfa72 Mon Sep 17 00:00:00 2001 From: Lucendio Date: Thu, 19 Mar 2020 17:45:14 +0100 Subject: [PATCH 5/7] Remove unused/dead chart values (#202) * add missing values that are actually used in templates * remove values that are nowhere referred to --- charts/brig/values.yaml | 1 - charts/galley/values.yaml | 1 - values/wire-server/prod-secrets.example.yaml | 5 ----- 3 files changed, 7 deletions(-) diff --git a/charts/brig/values.yaml b/charts/brig/values.yaml index 5d08dbcc8..60718e19d 100644 --- a/charts/brig/values.yaml +++ b/charts/brig/values.yaml @@ -61,7 +61,6 @@ config: retryAfter: 86400 setRichInfoLimit: 5000 setDefaultLocale: en - setMaxConvAndTeamSize: 500 setMaxTeamSize: 500 setMaxConvSize: 500 setEmailVisibility: visible_to_self diff --git a/charts/galley/values.yaml b/charts/galley/values.yaml index 0f96a8641..c078a956a 100644 --- a/charts/galley/values.yaml +++ b/charts/galley/values.yaml @@ -20,7 +20,6 @@ config: host: aws-cassandra replicaCount: 3 settings: - maxConvAndTeamSize: 500 maxTeamSize: 500 maxConvSize: 500 featureFlags: # see #RefConfigOptions in `/docs/reference` (https://github.com/wireapp/wire-server/) diff --git a/values/wire-server/prod-secrets.example.yaml b/values/wire-server/prod-secrets.example.yaml index 6885f532c..ef2c5b7b4 100644 --- a/values/wire-server/prod-secrets.example.yaml +++ b/values/wire-server/prod-secrets.example.yaml @@ -67,8 +67,3 @@ team-settings: secrets: # Required if you want to use team-settings configJson: - -account-pages: - secrets: - # Required if you want to use account-pages - configJson: From bbb7a542905c50ecd94a106cdff8c8772507fb71 Mon Sep 17 00:00:00 2001 From: jschaul Date: Mon, 23 Mar 2020 11:12:41 +0100 Subject: [PATCH 6/7] avs-nwtesttool / calling-test (#204) * WIP: avs-nwtesttool chart * fix parsing * tmp: point to staging * rename * fix port, use latest version * example.com as default * remove some superfluous configuration * Switch to using port 8080 * Add note about nameOverride --- charts/calling-test/.helmignore | 23 ++++++++ charts/calling-test/Chart.yaml | 21 ++++++++ charts/calling-test/templates/NOTES.txt | 5 ++ charts/calling-test/templates/_helpers.tpl | 52 +++++++++++++++++++ charts/calling-test/templates/deployment.yaml | 39 ++++++++++++++ charts/calling-test/templates/service.yaml | 15 ++++++ charts/calling-test/values.yaml | 27 ++++++++++ charts/nginz/values.yaml | 5 ++ 8 files changed, 187 insertions(+) create mode 100644 charts/calling-test/.helmignore create mode 100644 charts/calling-test/Chart.yaml create mode 100644 charts/calling-test/templates/NOTES.txt create mode 100644 charts/calling-test/templates/_helpers.tpl create mode 100644 charts/calling-test/templates/deployment.yaml create mode 100644 charts/calling-test/templates/service.yaml create mode 100644 charts/calling-test/values.yaml diff --git a/charts/calling-test/.helmignore b/charts/calling-test/.helmignore new file mode 100644 index 000000000..0e8a0eb36 --- /dev/null +++ b/charts/calling-test/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/calling-test/Chart.yaml b/charts/calling-test/Chart.yaml new file mode 100644 index 000000000..2a0fb9844 --- /dev/null +++ b/charts/calling-test/Chart.yaml @@ -0,0 +1,21 @@ +apiVersion: v2 +name: calling-test +description: Network testing tool for audio/video/signalling. See https://github.com/wireapp/avs-nwtesttool for more details. + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. +appVersion: 1.0.14 diff --git a/charts/calling-test/templates/NOTES.txt b/charts/calling-test/templates/NOTES.txt new file mode 100644 index 000000000..06a208ae4 --- /dev/null +++ b/charts/calling-test/templates/NOTES.txt @@ -0,0 +1,5 @@ +1. Get the application URL by running these commands: + + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "calling-test.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:8080 diff --git a/charts/calling-test/templates/_helpers.tpl b/charts/calling-test/templates/_helpers.tpl new file mode 100644 index 000000000..d6f2ba6b4 --- /dev/null +++ b/charts/calling-test/templates/_helpers.tpl @@ -0,0 +1,52 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "calling-test.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "calling-test.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "calling-test.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Common labels +*/}} +{{- define "calling-test.labels" -}} +helm.sh/chart: {{ include "calling-test.chart" . }} +{{ include "calling-test.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end -}} + +{{/* +Selector labels +*/}} +{{- define "calling-test.selectorLabels" -}} +app.kubernetes.io/name: {{ include "calling-test.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end -}} diff --git a/charts/calling-test/templates/deployment.yaml b/charts/calling-test/templates/deployment.yaml new file mode 100644 index 000000000..a8acfa18b --- /dev/null +++ b/charts/calling-test/templates/deployment.yaml @@ -0,0 +1,39 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "calling-test.fullname" . }} + labels: + {{- include "calling-test.labels" . | nindent 4 }} +spec: + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + {{- include "calling-test.selectorLabels" . | nindent 6 }} + template: + metadata: + labels: + {{- include "calling-test.selectorLabels" . | nindent 8 }} + spec: + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + {{- range $key, $val := .Values.envVars }} + - name: {{ $key }} + value: {{ $val | quote }} + {{- end }} + ports: + - name: http + containerPort: 8080 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: / + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} diff --git a/charts/calling-test/templates/service.yaml b/charts/calling-test/templates/service.yaml new file mode 100644 index 000000000..f414c9694 --- /dev/null +++ b/charts/calling-test/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "calling-test.fullname" . }} + labels: + {{- include "calling-test.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "calling-test.selectorLabels" . | nindent 4 }} diff --git a/charts/calling-test/values.yaml b/charts/calling-test/values.yaml new file mode 100644 index 000000000..14b693ef1 --- /dev/null +++ b/charts/calling-test/values.yaml @@ -0,0 +1,27 @@ +replicaCount: 1 +image: + # note: the docker image tag is configured as 'appVersion' in Chart.yaml + repository: quay.io/wire/avs-nwtesttool + pullPolicy: IfNotPresent + +envVars: + # note: this should be overridden in every deployment + BACKEND_HTTPS_URL: https://nginz-https.example.com + +# These name overrides are used also for routing. +# Wire-server's nginz subchart will route /calling-test to this chart +# If you change this name, that functionality will break. +nameOverride: "calling-test" +fullnameOverride: "calling-test" + +service: + type: ClusterIP + port: 8080 + +resources: + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi diff --git a/charts/nginz/values.yaml b/charts/nginz/values.yaml index ef078a357..fb58dd910 100644 --- a/charts/nginz/values.yaml +++ b/charts/nginz/values.yaml @@ -361,3 +361,8 @@ nginx_conf: - path: ~* ^/teams/([^/]*)/billing(.*) envs: - all + calling-test: + - path: /calling-test + envs: + - all + disable_zauth: true From 5899e3a1aa5351efe51cd4444f73921bdb29385c Mon Sep 17 00:00:00 2001 From: jschaul Date: Wed, 25 Mar 2020 13:13:41 +0100 Subject: [PATCH 7/7] update changelog --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 700d3f0c3..a85ae361d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# 2020-03-25 + +## Features + +- `calling-test` chart using the wire-nwtesttool (#204) + +## Internal changes + +- Move hardcoded AWS_REGION env var value into chart values file (#197) - thanks @kvaps +- Use apps/v1 for all deployments (#201) +- Fix elasticsearch-external endpoint (#198) +- Minor improvements to consistency with naming and settings. + # 2020-03-06 ## Bug fixes