diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a7338eaff..fd78e9cf80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,97 @@ +# [2022-06-14] (Chart Release 4.14.0) + +## Release notes + + +* The `nginz{-tcp,-http}` services have been unified into a `nginz` service, and + moved into the nginz chart. + + The nginz-ingress-services chart simply targets the `nginz` service, so there's + no need to set matching `service.nginz.external{Http,Tcp}Port` inside the + `nginx-ingress-services` chart anymore. + + The `config.http.httpPort` and `config.ws.wsPort` values in the `nginz` chart + still configure the ports the `nginz` service is listening on. + + The `nginz` chart also gained support for `metrics.serviceMonitor.enabled`, + creating a `ServiceMonitor` resource to scrape metrics, like for other wire + services. + + (#2476) + +* Upgrade team-settings version to 4.10.0-v0.29.7-0-3be8ca3 (#2180) + +* Upgrade webapp version to 2022-06-13-production.0-v0.29.7-0-2819b90 (#2302) + +* In the helm charts, the `wireService` label has been removed. + + In some cases, we were already setting the `app` label too. + + Now we consistently use the `app` label to label different wire services. + + The `wireService` label was also used in the `spec.selector.matchLabels` field + on existing `Deployment` / `StatefulSet` resources. + As these fields being immutable, changing them isn't possible without recreation. + + If you encounter an issue like + + > field is immutable && cannot patch "*" with kind * + + you need to manually delete these StatefulSet and Deployment resources, and apply helm again, which will recreate them. + + This means downtime, so plan a maintenance window for it. + + The `wire-server-metrics` chart was previously running some custom + configuration to automatically add all payloads with a `wireService` label into + metrics scraping. + + With the removal of the `wireService` label, this custom configuration has been + removed. + + Instead, all services that expose metrics will now create `ServiceMonitor` + resources, if their helm chart is applied with `metrics.serviceMonitor.enable` + set to true. + + This prevents scraping agents from querying services that don't expose metrics + at /i/metrics unnecessarily. + + Additionally, makes it easier to run other metric scraping operators, like + `grafana-agent-operator`, without the need to also create some custom + `wireService` label config there. + + Generally, if you have any monitoring solution installed in your cluster that + uses the Prometheus CRDs, set `metrics.serviceMonitor.enable` for the following charts: + + - brig + - cannon + - cargohold + - galley + - gundeck + - proxy + - spar (#2413) + + +## Features + + +* MLS implementation progress: + - Remote users can be added to MLS conversations + - MLS messages (both handshake and application) are now propagates to remote + conversation participants. (#2415) + +* `GET teams/:tid` response now contains an optional field `splash_screen` which contains the asset key of the team's splash screen. `PUT teams/:tid` now supports updating the splash screen asset key. (#2474) + + +## Internal changes + + +* Forward /i/users/:uid/features/:feature to brig (#2468) + +* charts/nginz: Forward `/i/legalhold/whitelisted-teams` to galley instead of brig (#2460) + +* Add AWS security token metrics to brig (#2473) + + # [2022-06-08] (Chart Release 4.13.0) ## Release notes diff --git a/Makefile b/Makefile index 8ccab6b483..6b6852351f 100644 --- a/Makefile +++ b/Makefile @@ -360,8 +360,8 @@ kube-integration-teardown-sans-federation: .PHONY: kube-restart-% kube-restart-%: - kubectl delete pod -n $(NAMESPACE) -l wireService=$(*) - kubectl delete pod -n $(NAMESPACE)-fed2 -l wireService=$(*) + kubectl delete pod -n $(NAMESPACE) -l app=$(*) + kubectl delete pod -n $(NAMESPACE)-fed2 -l app=$(*) .PHONY: latest-tag latest-tag: @@ -522,8 +522,8 @@ kind-restart-nginx-ingress: .local/kind-kubeconfig kind-restart-%: .local/kind-kubeconfig export KUBECONFIG=$(CURDIR)/.local/kind-kubeconfig && \ - kubectl delete pod -n $(NAMESPACE) -l wireService=$(*) && \ - kubectl delete pod -n $(NAMESPACE)-fed2 -l wireService=$(*) + kubectl delete pod -n $(NAMESPACE) -l app=$(*) && \ + kubectl delete pod -n $(NAMESPACE)-fed2 -l app=$(*) # This target can be used to template a helm chart with values filled in from # hack/helm_vars (what CI uses) as overrrides, if available. This allows debugging helm diff --git a/cassandra-schema.cql b/cassandra-schema.cql index 5afd359b05..07f6cd1b01 100644 --- a/cassandra-schema.cql +++ b/cassandra-schema.cql @@ -267,6 +267,7 @@ CREATE TABLE galley_test.member_remote_user ( user_remote_domain text, user_remote_id uuid, conversation_role text, + mls_clients set, PRIMARY KEY (conv, user_remote_domain, user_remote_id) ) WITH CLUSTERING ORDER BY (user_remote_domain ASC, user_remote_id ASC) AND bloom_filter_fp_chance = 0.1 @@ -480,6 +481,7 @@ CREATE TABLE galley_test.team ( icon_key text, name text, search_visibility int, + splash_screen text, status int ) WITH bloom_filter_fp_chance = 0.1 AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'} diff --git a/charts/account-pages/templates/deployment.yaml b/charts/account-pages/templates/deployment.yaml index 138e0ce4dd..10001c35fe 100644 --- a/charts/account-pages/templates/deployment.yaml +++ b/charts/account-pages/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: account-pages labels: - wireService: account-pages + app: account-pages chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,12 +16,10 @@ spec: maxSurge: {{ .Values.replicaCount | mul 2 }} selector: matchLabels: - wireService: account-pages app: account-pages template: metadata: labels: - wireService: account-pages app: account-pages release: {{ .Release.Name }} spec: diff --git a/charts/aws-ingress/templates/ELB_account_pages_https.yaml b/charts/aws-ingress/templates/ELB_account_pages_https.yaml index 02ef360501..4613cdffe5 100644 --- a/charts/aws-ingress/templates/ELB_account_pages_https.yaml +++ b/charts/aws-ingress/templates/ELB_account_pages_https.yaml @@ -14,7 +14,7 @@ metadata: spec: type: LoadBalancer selector: - wireService: account-pages + app: account-pages ports: - name: https protocol: TCP diff --git a/charts/aws-ingress/templates/ELB_nginz_https.yaml b/charts/aws-ingress/templates/ELB_nginz_https.yaml index 64a0798fdb..cb5c511466 100644 --- a/charts/aws-ingress/templates/ELB_nginz_https.yaml +++ b/charts/aws-ingress/templates/ELB_nginz_https.yaml @@ -13,7 +13,7 @@ metadata: spec: type: LoadBalancer selector: - wireService: nginz + app: nginz ports: - name: https protocol: TCP diff --git a/charts/aws-ingress/templates/ELB_nginz_wss.yaml b/charts/aws-ingress/templates/ELB_nginz_wss.yaml index 10e6afb526..ce6c8a2c1c 100644 --- a/charts/aws-ingress/templates/ELB_nginz_wss.yaml +++ b/charts/aws-ingress/templates/ELB_nginz_wss.yaml @@ -14,7 +14,7 @@ metadata: spec: type: LoadBalancer selector: - wireService: nginz + app: nginz ports: - name: wss protocol: TCP diff --git a/charts/aws-ingress/templates/ELB_team_settings_https.yaml b/charts/aws-ingress/templates/ELB_team_settings_https.yaml index 3476bad0fe..c0d4e2fa69 100644 --- a/charts/aws-ingress/templates/ELB_team_settings_https.yaml +++ b/charts/aws-ingress/templates/ELB_team_settings_https.yaml @@ -14,7 +14,7 @@ metadata: spec: type: LoadBalancer selector: - wireService: team-settings + app: team-settings ports: - name: https protocol: TCP diff --git a/charts/aws-ingress/templates/ELB_webapp_https.yaml b/charts/aws-ingress/templates/ELB_webapp_https.yaml index 7924e2a8a2..ab52913f51 100644 --- a/charts/aws-ingress/templates/ELB_webapp_https.yaml +++ b/charts/aws-ingress/templates/ELB_webapp_https.yaml @@ -13,7 +13,7 @@ metadata: spec: type: LoadBalancer selector: - wireService: webapp + app: webapp ports: - name: https protocol: TCP diff --git a/charts/backoffice/templates/deployment.yaml b/charts/backoffice/templates/deployment.yaml index ce5fe28801..172e3fc135 100644 --- a/charts/backoffice/templates/deployment.yaml +++ b/charts/backoffice/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: backoffice labels: - wireService: backoffice + app: backoffice chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,11 +16,11 @@ spec: maxSurge: {{ .Values.replicaCount }} selector: matchLabels: - wireService: backoffice + app: backoffice template: metadata: labels: - wireService: backoffice + app: backoffice release: {{ .Release.Name }} annotations: # An annotation of the configmap checksum ensures changes to the configmap cause a redeployment upon `helm upgrade` diff --git a/charts/backoffice/templates/service.yaml b/charts/backoffice/templates/service.yaml index de343846e3..3422d81a77 100644 --- a/charts/backoffice/templates/service.yaml +++ b/charts/backoffice/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: backoffice labels: - wireService: backoffice + app: backoffice chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -14,5 +14,5 @@ spec: port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} selector: - wireService: backoffice + app: backoffice release: {{ .Release.Name }} diff --git a/charts/brig/templates/configmap.yaml b/charts/brig/templates/configmap.yaml index 7b06eb9b55..210fa59a26 100644 --- a/charts/brig/templates/configmap.yaml +++ b/charts/brig/templates/configmap.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: "brig" labels: - wireService: brig + app: brig chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/charts/brig/templates/deployment.yaml b/charts/brig/templates/deployment.yaml index 531f816948..860b7acf51 100644 --- a/charts/brig/templates/deployment.yaml +++ b/charts/brig/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: brig labels: - wireService: brig + app: brig chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,11 +16,11 @@ spec: maxSurge: {{ .Values.replicaCount }} selector: matchLabels: - wireService: brig + app: brig template: metadata: labels: - wireService: brig + app: brig release: {{ .Release.Name }} annotations: # An annotation of the configmap checksum ensures changes to the configmap cause a redeployment upon `helm upgrade` diff --git a/charts/brig/templates/geoip-secret.yaml b/charts/brig/templates/geoip-secret.yaml index db6df8a1ee..8e96ea70c9 100644 --- a/charts/brig/templates/geoip-secret.yaml +++ b/charts/brig/templates/geoip-secret.yaml @@ -4,7 +4,7 @@ kind: Secret metadata: name: brig-geoip labels: - wireService: brig + app: brig chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/charts/brig/templates/secret.yaml b/charts/brig/templates/secret.yaml index 55d90ff9eb..2ffebba629 100644 --- a/charts/brig/templates/secret.yaml +++ b/charts/brig/templates/secret.yaml @@ -3,7 +3,7 @@ kind: Secret metadata: name: brig labels: - wireService: brig + app: brig chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/charts/brig/templates/service.yaml b/charts/brig/templates/service.yaml index 9a12b07bad..432be27dd1 100644 --- a/charts/brig/templates/service.yaml +++ b/charts/brig/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: brig labels: - wireService: brig + app: brig chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -14,5 +14,5 @@ spec: port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} selector: - wireService: brig + app: brig release: {{ .Release.Name }} diff --git a/charts/brig/templates/serviceaccount.yaml b/charts/brig/templates/serviceaccount.yaml index 48800b82bd..bc120b624d 100644 --- a/charts/brig/templates/serviceaccount.yaml +++ b/charts/brig/templates/serviceaccount.yaml @@ -4,7 +4,7 @@ kind: ServiceAccount metadata: name: {{ .Values.serviceAccount.name }} labels: - wireService: brig + app: brig chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/charts/brig/templates/servicemonitor.yaml b/charts/brig/templates/servicemonitor.yaml new file mode 100644 index 0000000000..03c0b87244 --- /dev/null +++ b/charts/brig/templates/servicemonitor.yaml @@ -0,0 +1,19 @@ +{{- if .Values.metrics.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: brig + labels: + app: brig + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + endpoints: + - port: http + path: /i/metrics + selector: + matchLabels: + app: brig + release: {{ .Release.Name }} +{{- end }} diff --git a/charts/brig/templates/tests/brig-integration.yaml b/charts/brig/templates/tests/brig-integration.yaml index dc2018a0d7..17921894bf 100644 --- a/charts/brig/templates/tests/brig-integration.yaml +++ b/charts/brig/templates/tests/brig-integration.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: "brig-integration" labels: - wireService: brig-integration + app: brig-integration chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -13,7 +13,7 @@ spec: - port: 9000 targetPort: 9000 selector: - wireService: brig-integration + app: brig-integration release: {{ .Release.Name }} --- apiVersion: v1 @@ -23,7 +23,7 @@ metadata: annotations: "helm.sh/hook": test-success labels: - wireService: brig-integration + app: brig-integration release: {{ .Release.Name }} spec: volumes: diff --git a/charts/brig/templates/tests/nginz-service.yaml b/charts/brig/templates/tests/nginz-service.yaml index 598ff296db..c31128667c 100644 --- a/charts/brig/templates/tests/nginz-service.yaml +++ b/charts/brig/templates/tests/nginz-service.yaml @@ -11,4 +11,4 @@ spec: - port: 8080 targetPort: 8080 selector: - wireService: nginz + app: nginz diff --git a/charts/brig/templates/turnconfigmap.yaml b/charts/brig/templates/turnconfigmap.yaml index 3f4ef4f54c..7a62071b57 100644 --- a/charts/brig/templates/turnconfigmap.yaml +++ b/charts/brig/templates/turnconfigmap.yaml @@ -4,7 +4,7 @@ kind: ConfigMap metadata: name: "turn" labels: - wireService: brig + app: brig chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/charts/brig/values.yaml b/charts/brig/values.yaml index 0106d38620..82d215da49 100644 --- a/charts/brig/values.yaml +++ b/charts/brig/values.yaml @@ -12,6 +12,9 @@ resources: limits: memory: "512Mi" cpu: "500m" +metrics: + serviceMonitor: + enable: false config: logLevel: Info logFormat: JSON diff --git a/charts/cannon/templates/headless-service.yaml b/charts/cannon/templates/headless-service.yaml index e8b0e2b368..5c107d0bc2 100644 --- a/charts/cannon/templates/headless-service.yaml +++ b/charts/cannon/templates/headless-service.yaml @@ -9,7 +9,7 @@ kind: Service metadata: name: {{ .Values.service.name }} labels: - wireService: cannon + app: cannon chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -23,5 +23,5 @@ spec: targetPort: {{ .Values.service.internalPort }} protocol: TCP selector: - wireService: cannon + app: cannon release: {{ .Release.Name }} diff --git a/charts/cannon/templates/nginz-certificate-secret.yaml b/charts/cannon/templates/nginz-certificate-secret.yaml index 4531ad19e3..8394ebd8c0 100644 --- a/charts/cannon/templates/nginz-certificate-secret.yaml +++ b/charts/cannon/templates/nginz-certificate-secret.yaml @@ -4,7 +4,6 @@ kind: Secret metadata: name: {{ .Values.service.nginz.tls.secretName }} labels: - wireService: cannon-nginz app: cannon-nginz chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" diff --git a/charts/cannon/templates/nginz-secret.yaml b/charts/cannon/templates/nginz-secret.yaml index 23dd7c7d0c..0670f7fe27 100644 --- a/charts/cannon/templates/nginz-secret.yaml +++ b/charts/cannon/templates/nginz-secret.yaml @@ -4,7 +4,6 @@ kind: Secret metadata: name: cannon-nginz labels: - wireService: cannon-nginz app: cannon-nginz chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" diff --git a/charts/cannon/templates/nginz-service.yaml b/charts/cannon/templates/nginz-service.yaml index fd820c2b75..704e2e2a25 100644 --- a/charts/cannon/templates/nginz-service.yaml +++ b/charts/cannon/templates/nginz-service.yaml @@ -13,7 +13,7 @@ kind: Service metadata: name: {{ .Values.service.nginz.name }} labels: - wireService: cannon + app: cannon chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -35,6 +35,6 @@ spec: targetPort: {{ .Values.service.nginz.internalPort }} protocol: TCP selector: - wireService: cannon + app: cannon release: {{ .Release.Name }} {{- end }} diff --git a/charts/cannon/templates/servicemonitor.yaml b/charts/cannon/templates/servicemonitor.yaml new file mode 100644 index 0000000000..df91d18654 --- /dev/null +++ b/charts/cannon/templates/servicemonitor.yaml @@ -0,0 +1,19 @@ +{{- if .Values.metrics.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: cannon + labels: + app: cannon + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + endpoints: + - port: http + path: /i/metrics + selector: + matchLabels: + app: cannon + release: {{ .Release.Name }} +{{- end }} diff --git a/charts/cannon/templates/statefulset.yaml b/charts/cannon/templates/statefulset.yaml index c9adaae62b..01eebcf2ba 100644 --- a/charts/cannon/templates/statefulset.yaml +++ b/charts/cannon/templates/statefulset.yaml @@ -9,7 +9,7 @@ kind: StatefulSet metadata: name: cannon labels: - wireService: cannon + app: cannon chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -17,7 +17,7 @@ spec: serviceName: {{ .Values.service.name }} selector: matchLabels: - wireService: cannon + app: cannon replicas: {{ .Values.replicaCount }} updateStrategy: type: RollingUpdate @@ -25,7 +25,7 @@ spec: template: metadata: labels: - wireService: cannon + app: cannon release: {{ .Release.Name }} annotations: checksum/configmap: {{ include (print .Template.BasePath "/configmap.yaml") . | sha256sum }} diff --git a/charts/cannon/values.yaml b/charts/cannon/values.yaml index f5f4970df2..16c77ee347 100644 --- a/charts/cannon/values.yaml +++ b/charts/cannon/values.yaml @@ -20,6 +20,10 @@ config: millisecondsBetweenBatches: 50 minBatchSize: 20 +metrics: + serviceMonitor: + enable: false + nginx_conf: user: nginx group: nginx diff --git a/charts/cargohold/templates/deployment.yaml b/charts/cargohold/templates/deployment.yaml index 25146020f5..771d97f94f 100644 --- a/charts/cargohold/templates/deployment.yaml +++ b/charts/cargohold/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: cargohold labels: - wireService: cargohold + app: cargohold chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,11 +16,11 @@ spec: maxSurge: {{ .Values.replicaCount }} selector: matchLabels: - wireService: cargohold + app: cargohold template: metadata: labels: - wireService: cargohold + app: cargohold release: {{ .Release.Name }} annotations: # An annotation of the configmap checksum ensures changes to the configmap cause a redeployment upon `helm upgrade` diff --git a/charts/cargohold/templates/service.yaml b/charts/cargohold/templates/service.yaml index 3621ea652f..af4957e907 100644 --- a/charts/cargohold/templates/service.yaml +++ b/charts/cargohold/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: cargohold labels: - wireService: cargohold + app: cargohold chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -14,5 +14,5 @@ spec: port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} selector: - wireService: cargohold + app: cargohold release: {{ .Release.Name }} diff --git a/charts/cargohold/templates/serviceaccount.yaml b/charts/cargohold/templates/serviceaccount.yaml index 0460ce90d4..199206e427 100644 --- a/charts/cargohold/templates/serviceaccount.yaml +++ b/charts/cargohold/templates/serviceaccount.yaml @@ -4,7 +4,7 @@ kind: ServiceAccount metadata: name: {{ .Values.serviceAccount.name }} labels: - wireService: cargohold + app: cargohold chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/charts/cargohold/templates/servicemonitor.yaml b/charts/cargohold/templates/servicemonitor.yaml new file mode 100644 index 0000000000..106fad9ff3 --- /dev/null +++ b/charts/cargohold/templates/servicemonitor.yaml @@ -0,0 +1,19 @@ +{{- if .Values.metrics.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: cargohold + labels: + app: cargohold + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + endpoints: + - port: http + path: /i/metrics + selector: + matchLabels: + app: cargohold + release: {{ .Release.Name }} +{{- end }} diff --git a/charts/cargohold/values.yaml b/charts/cargohold/values.yaml index b72ebb6b7b..b9cc40ff5c 100644 --- a/charts/cargohold/values.yaml +++ b/charts/cargohold/values.yaml @@ -5,6 +5,9 @@ image: service: externalPort: 8080 internalPort: 8080 +metrics: + serviceMonitor: + enable: false resources: requests: memory: "256Mi" diff --git a/charts/cassandra-migrations/templates/galley-migrate-data.yaml b/charts/cassandra-migrations/templates/galley-migrate-data.yaml index 3800615d2b..69a15f8238 100644 --- a/charts/cassandra-migrations/templates/galley-migrate-data.yaml +++ b/charts/cassandra-migrations/templates/galley-migrate-data.yaml @@ -7,7 +7,7 @@ kind: Job metadata: name: galley-migrate-data labels: - wireService: "cassandra-migrations" + app: "cassandra-migrations" chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -20,7 +20,7 @@ spec: metadata: name: "{{.Release.Name}}" labels: - wireService: galley-migrate-data + app: galley-migrate-data app: galley-migrate-data heritage: {{.Release.Service | quote }} release: {{.Release.Name | quote }} diff --git a/charts/cassandra-migrations/templates/migrate-schema.yaml b/charts/cassandra-migrations/templates/migrate-schema.yaml index b64815b655..5bd3c06055 100644 --- a/charts/cassandra-migrations/templates/migrate-schema.yaml +++ b/charts/cassandra-migrations/templates/migrate-schema.yaml @@ -3,7 +3,7 @@ kind: Job metadata: name: cassandra-migrations labels: - wireService: cassandra-migrations + app: cassandra-migrations chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -15,7 +15,7 @@ spec: template: metadata: labels: - wireService: cassandra-migrations + app: cassandra-migrations release: {{ .Release.Name }} spec: restartPolicy: OnFailure diff --git a/charts/cassandra-migrations/templates/spar-migrate-data.yaml b/charts/cassandra-migrations/templates/spar-migrate-data.yaml index 26710c7369..1b9c48e066 100644 --- a/charts/cassandra-migrations/templates/spar-migrate-data.yaml +++ b/charts/cassandra-migrations/templates/spar-migrate-data.yaml @@ -7,7 +7,7 @@ kind: Job metadata: name: spar-migrate-data labels: - wireService: "cassandra-migrations" + app: "cassandra-migrations" chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -20,7 +20,6 @@ spec: metadata: name: "{{.Release.Name}}" labels: - wireService: spar-migrate-data app: spar-migrate-data heritage: {{.Release.Service | quote }} release: {{.Release.Name | quote }} diff --git a/charts/elasticsearch-ephemeral/templates/es-svc.yaml b/charts/elasticsearch-ephemeral/templates/es-svc.yaml index b8189bcf8c..499652ee77 100644 --- a/charts/elasticsearch-ephemeral/templates/es-svc.yaml +++ b/charts/elasticsearch-ephemeral/templates/es-svc.yaml @@ -3,7 +3,6 @@ kind: Service metadata: name: {{ template "fullname" . }} labels: - wireService: {{ template "fullname" . }} app: {{ template "fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" diff --git a/charts/elasticsearch-ephemeral/templates/es.yaml b/charts/elasticsearch-ephemeral/templates/es.yaml index 855c4488bb..79526560ad 100644 --- a/charts/elasticsearch-ephemeral/templates/es.yaml +++ b/charts/elasticsearch-ephemeral/templates/es.yaml @@ -3,7 +3,6 @@ kind: Deployment metadata: name: {{ template "fullname" . }} labels: - wireService: {{ template "fullname" . }} app: {{ template "fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" diff --git a/charts/elasticsearch-index/templates/create-index.yaml b/charts/elasticsearch-index/templates/create-index.yaml index 4a1d8db107..804ed4af83 100644 --- a/charts/elasticsearch-index/templates/create-index.yaml +++ b/charts/elasticsearch-index/templates/create-index.yaml @@ -3,7 +3,6 @@ kind: Job metadata: name: elasticsearch-index-create labels: - wireService: elasticsearch-index-create app: elasticsearch-index-create heritage: {{.Release.Service | quote }} release: {{.Release.Name | quote }} @@ -16,7 +15,6 @@ spec: metadata: name: "{{.Release.Name}}" labels: - wireService: elasticsearch-index-create app: elasticsearch-index-create heritage: {{.Release.Service | quote }} release: {{.Release.Name | quote }} diff --git a/charts/elasticsearch-index/templates/migrate-data.yaml b/charts/elasticsearch-index/templates/migrate-data.yaml index 2e5ae1f7e8..3ef47bcf5e 100644 --- a/charts/elasticsearch-index/templates/migrate-data.yaml +++ b/charts/elasticsearch-index/templates/migrate-data.yaml @@ -3,7 +3,6 @@ kind: Job metadata: name: brig-index-migrate-data labels: - wireService: elasticsearch-index-migrate-data app: elasticsearch-index-migrate-data heritage: {{.Release.Service | quote }} release: {{.Release.Name | quote }} @@ -16,7 +15,6 @@ spec: metadata: name: "{{.Release.Name}}" labels: - wireService: elasticsearch-index-migrate-data app: elasticsearch-index-migrate-data heritage: {{.Release.Service | quote }} release: {{.Release.Name | quote }} diff --git a/charts/federator/templates/ca.yaml b/charts/federator/templates/ca.yaml index 8363507e1b..2a14449224 100644 --- a/charts/federator/templates/ca.yaml +++ b/charts/federator/templates/ca.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: "federator-ca" labels: - wireService: federator + app: federator chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/charts/federator/templates/configmap.yaml b/charts/federator/templates/configmap.yaml index 58c1310684..287e4a9ac7 100644 --- a/charts/federator/templates/configmap.yaml +++ b/charts/federator/templates/configmap.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: "federator" labels: - wireService: federator + app: federator chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/charts/federator/templates/deployment.yaml b/charts/federator/templates/deployment.yaml index c09a239710..b87dc660ef 100644 --- a/charts/federator/templates/deployment.yaml +++ b/charts/federator/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: federator labels: - wireService: federator + app: federator chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,11 +16,11 @@ spec: maxSurge: {{ .Values.replicaCount }} selector: matchLabels: - wireService: federator + app: federator template: metadata: labels: - wireService: federator + app: federator release: {{ .Release.Name }} annotations: # An annotation of the configmap checksum ensures changes to the configmap cause a redeployment upon `helm upgrade` diff --git a/charts/federator/templates/secret.yaml b/charts/federator/templates/secret.yaml index f1337b952d..201b5c83bd 100644 --- a/charts/federator/templates/secret.yaml +++ b/charts/federator/templates/secret.yaml @@ -4,7 +4,7 @@ kind: Secret metadata: name: "federator-secret" labels: - wireService: federator + app: federator chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/charts/federator/templates/service.yaml b/charts/federator/templates/service.yaml index 65da250677..5394e54b1a 100644 --- a/charts/federator/templates/service.yaml +++ b/charts/federator/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: federator labels: - wireService: federator + app: federator chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -18,5 +18,5 @@ spec: port: {{ .Values.service.externalFederatorPort }} targetPort: {{ .Values.service.externalFederatorPort }} selector: - wireService: federator + app: federator release: {{ .Release.Name }} diff --git a/charts/galley/templates/deployment.yaml b/charts/galley/templates/deployment.yaml index 3f8f4344fe..ca23d99967 100644 --- a/charts/galley/templates/deployment.yaml +++ b/charts/galley/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: galley labels: - wireService: galley + app: galley chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,11 +16,11 @@ spec: maxSurge: {{ .Values.replicaCount }} selector: matchLabels: - wireService: galley + app: galley template: metadata: labels: - wireService: galley + app: galley release: {{ .Release.Name }} annotations: # An annotation of the configmap checksum ensures changes to the configmap cause a redeployment upon `helm upgrade` diff --git a/charts/galley/templates/service.yaml b/charts/galley/templates/service.yaml index 805ea9a89f..f79d3a70e9 100644 --- a/charts/galley/templates/service.yaml +++ b/charts/galley/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: galley labels: - wireService: galley + app: galley chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -14,5 +14,5 @@ spec: port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} selector: - wireService: galley + app: galley release: {{ .Release.Name }} diff --git a/charts/galley/templates/serviceaccount.yaml b/charts/galley/templates/serviceaccount.yaml index 32c155679f..29b763c398 100644 --- a/charts/galley/templates/serviceaccount.yaml +++ b/charts/galley/templates/serviceaccount.yaml @@ -4,7 +4,7 @@ kind: ServiceAccount metadata: name: {{ .Values.serviceAccount.name }} labels: - wireService: galley + app: galley chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/charts/galley/templates/servicemonitor.yaml b/charts/galley/templates/servicemonitor.yaml new file mode 100644 index 0000000000..8d9e43f8e5 --- /dev/null +++ b/charts/galley/templates/servicemonitor.yaml @@ -0,0 +1,19 @@ +{{- if .Values.metrics.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: galley + labels: + app: galley + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + endpoints: + - port: http + path: /i/metrics + selector: + matchLabels: + app: galley + release: {{ .Release.Name }} +{{- end }} diff --git a/charts/galley/templates/tests/galley-integration.yaml b/charts/galley/templates/tests/galley-integration.yaml index 33034050bf..a688764dfe 100644 --- a/charts/galley/templates/tests/galley-integration.yaml +++ b/charts/galley/templates/tests/galley-integration.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: "galley-integration" labels: - wireService: galley-integration + app: galley-integration chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -13,7 +13,7 @@ spec: - port: 9000 targetPort: 9000 selector: - wireService: galley-integration + app: galley-integration release: {{ .Release.Name }} --- apiVersion: v1 @@ -23,7 +23,7 @@ metadata: annotations: "helm.sh/hook": test-success labels: - wireService: galley-integration + app: galley-integration release: {{ .Release.Name }} spec: volumes: diff --git a/charts/galley/values.yaml b/charts/galley/values.yaml index a070ebea49..1ff14e4123 100644 --- a/charts/galley/values.yaml +++ b/charts/galley/values.yaml @@ -6,6 +6,9 @@ image: service: externalPort: 8080 internalPort: 8080 +metrics: + serviceMonitor: + enable: false resources: requests: memory: "256Mi" diff --git a/charts/gundeck/templates/deployment.yaml b/charts/gundeck/templates/deployment.yaml index 4ff4ef0185..a083addfb9 100644 --- a/charts/gundeck/templates/deployment.yaml +++ b/charts/gundeck/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: gundeck labels: - wireService: gundeck + app: gundeck chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,11 +16,11 @@ spec: maxSurge: {{ .Values.replicaCount }} selector: matchLabels: - wireService: gundeck + app: gundeck template: metadata: labels: - wireService: gundeck + app: gundeck release: {{ .Release.Name }} annotations: # An annotation of the configmap checksum ensures changes to the configmap cause a redeployment upon `helm upgrade` diff --git a/charts/gundeck/templates/secret.yaml b/charts/gundeck/templates/secret.yaml index e9de2b6979..459ab0f24f 100644 --- a/charts/gundeck/templates/secret.yaml +++ b/charts/gundeck/templates/secret.yaml @@ -4,7 +4,7 @@ kind: Secret metadata: name: gundeck labels: - wireService: gundeck + app: gundeck chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/charts/gundeck/templates/service.yaml b/charts/gundeck/templates/service.yaml index 14921fc655..0d27085f1a 100644 --- a/charts/gundeck/templates/service.yaml +++ b/charts/gundeck/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: gundeck labels: - wireService: gundeck + app: gundeck chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -14,5 +14,5 @@ spec: port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} selector: - wireService: gundeck + app: gundeck release: {{ .Release.Name }} diff --git a/charts/gundeck/templates/serviceaccount.yaml b/charts/gundeck/templates/serviceaccount.yaml index 93de4b25f5..59bdd51128 100644 --- a/charts/gundeck/templates/serviceaccount.yaml +++ b/charts/gundeck/templates/serviceaccount.yaml @@ -4,7 +4,7 @@ kind: ServiceAccount metadata: name: {{ .Values.serviceAccount.name }} labels: - wireService: gundeck + app: gundeck chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/charts/gundeck/templates/servicemonitor.yaml b/charts/gundeck/templates/servicemonitor.yaml new file mode 100644 index 0000000000..bd1adc4c1d --- /dev/null +++ b/charts/gundeck/templates/servicemonitor.yaml @@ -0,0 +1,19 @@ +{{- if .Values.metrics.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: gundeck + labels: + app: gundeck + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + endpoints: + - port: http + path: /i/metrics + selector: + matchLabels: + app: gundeck + release: {{ .Release.Name }} +{{- end }} diff --git a/charts/gundeck/values.yaml b/charts/gundeck/values.yaml index 618c7cf867..9e8f022004 100644 --- a/charts/gundeck/values.yaml +++ b/charts/gundeck/values.yaml @@ -5,6 +5,9 @@ image: service: externalPort: 8080 internalPort: 8080 +metrics: + serviceMonitor: + enable: false resources: requests: memory: "256Mi" diff --git a/charts/ldap-scim-bridge/templates/cronjob.yaml b/charts/ldap-scim-bridge/templates/cronjob.yaml index fbd10986a2..d5592b49ad 100644 --- a/charts/ldap-scim-bridge/templates/cronjob.yaml +++ b/charts/ldap-scim-bridge/templates/cronjob.yaml @@ -3,7 +3,7 @@ kind: CronJob metadata: name: ldap-scim-bridge labels: - wireService: ldap-scim-bridge + app: ldap-scim-bridge chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -13,7 +13,7 @@ spec: jobTemplate: metadata: labels: - wireService: ldap-scim-bridge + app: ldap-scim-bridge release: {{ .Release.Name }} annotations: # An annotation of the configmap checksum ensures changes to the configmap cause a redeployment upon `helm upgrade` diff --git a/charts/ldap-scim-bridge/templates/secret.yaml b/charts/ldap-scim-bridge/templates/secret.yaml index 01e8bc3568..93f979cecb 100644 --- a/charts/ldap-scim-bridge/templates/secret.yaml +++ b/charts/ldap-scim-bridge/templates/secret.yaml @@ -3,11 +3,11 @@ kind: Secret metadata: name: ldap-scim-bridge labels: - wireService: ldap-scim-bridge + app: ldap-scim-bridge chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" type: Opaque stringData: config.yaml: | -{{ toYaml .Values.config | indent 4 }} \ No newline at end of file +{{ toYaml .Values.config | indent 4 }} diff --git a/charts/nginx-ingress-services/templates/ingress.yaml b/charts/nginx-ingress-services/templates/ingress.yaml index 39fe2e3318..6cc9d019e4 100644 --- a/charts/nginx-ingress-services/templates/ingress.yaml +++ b/charts/nginx-ingress-services/templates/ingress.yaml @@ -32,16 +32,16 @@ spec: paths: - path: / backend: - serviceName: nginz-http - servicePort: {{ .Values.service.nginz.externalHttpPort }} + serviceName: nginz + servicePort: http {{- if .Values.websockets.enabled }} - host: {{ .Values.config.dns.ssl }} http: paths: - path: / backend: - serviceName: nginz-tcp - servicePort: {{ .Values.service.nginz.externalTcpPort }} + serviceName: nginz + servicePort: ws {{- end }} {{- if .Values.webapp.enabled }} - host: {{ .Values.config.dns.webapp }} diff --git a/charts/nginx-ingress-services/templates/service.yaml b/charts/nginx-ingress-services/templates/service.yaml index 236789b856..8355178922 100644 --- a/charts/nginx-ingress-services/templates/service.yaml +++ b/charts/nginx-ingress-services/templates/service.yaml @@ -1,29 +1,4 @@ # FUTUREWORK: move services into the respective charts -apiVersion: v1 -kind: Service -metadata: - name: nginz-http -spec: - type: ClusterIP - ports: - - port: {{ .Values.service.nginz.externalHttpPort }} - targetPort: 8080 - selector: - wireService: nginz -{{- if .Values.websockets.enabled }} ---- -apiVersion: v1 -kind: Service -metadata: - name: nginz-tcp -spec: - type: ClusterIP - ports: - - port: {{ .Values.service.nginz.externalTcpPort }} - targetPort: 8081 - selector: - wireService: nginz -{{- end }} {{- if .Values.webapp.enabled }} --- apiVersion: v1 @@ -36,7 +11,7 @@ spec: - port: {{ .Values.service.webapp.externalPort }} targetPort: 8080 selector: - wireService: webapp + app: webapp {{- end }} {{- if not .Values.service.s3.externallyCreated }} --- @@ -50,7 +25,7 @@ spec: - port: {{ .Values.service.s3.externalPort }} targetPort: 9000 selector: - wireService: {{ .Values.service.s3.serviceName }} + app: {{ .Values.service.s3.serviceName }} {{- end }} {{- if .Values.teamSettings.enabled }} --- @@ -64,7 +39,7 @@ spec: - port: {{ .Values.service.teamSettings.externalPort }} targetPort: 8080 selector: - wireService: team-settings + app: team-settings {{- end }} {{- if .Values.accountPages.enabled }} --- @@ -78,5 +53,5 @@ spec: - port: {{ .Values.service.accountPages.externalPort }} targetPort: 8080 selector: - wireService: account-pages + app: account-pages {{- end }} diff --git a/charts/nginx-ingress-services/values.yaml b/charts/nginx-ingress-services/values.yaml index 44f49f0847..cdad4fc02c 100644 --- a/charts/nginx-ingress-services/values.yaml +++ b/charts/nginx-ingress-services/values.yaml @@ -80,9 +80,6 @@ certManager: customSolvers: service: - nginz: - externalHttpPort: 8080 - externalTcpPort: 8081 webapp: externalPort: 8080 s3: diff --git a/charts/nginz/templates/deployment.yaml b/charts/nginz/templates/deployment.yaml index d790e22913..3abda67744 100644 --- a/charts/nginz/templates/deployment.yaml +++ b/charts/nginz/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: nginz labels: - wireService: nginz + app: nginz chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,12 +16,10 @@ spec: maxSurge: {{ .Values.replicaCount | mul 2 }} selector: matchLabels: - wireService: nginz app: nginz template: metadata: labels: - wireService: nginz app: nginz release: {{ .Release.Name }} annotations: diff --git a/charts/nginz/templates/secret.yaml b/charts/nginz/templates/secret.yaml index 2dc5ab8509..12779270f6 100644 --- a/charts/nginz/templates/secret.yaml +++ b/charts/nginz/templates/secret.yaml @@ -3,7 +3,6 @@ kind: Secret metadata: name: nginz labels: - wireService: nginz app: nginz chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" diff --git a/charts/nginz/templates/service.yaml b/charts/nginz/templates/service.yaml new file mode 100644 index 0000000000..3a5172b404 --- /dev/null +++ b/charts/nginz/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: nginz +spec: + type: ClusterIP + ports: + - name: http + port: {{ .Values.config.http.httpPort }} + targetPort: 8080 + - name: ws + port: {{ .Values.config.ws.wsPort }} + targetPort: 8081 + selector: + app: nginz diff --git a/charts/nginz/templates/servicemonitor.yaml b/charts/nginz/templates/servicemonitor.yaml new file mode 100644 index 0000000000..441d4f3f9a --- /dev/null +++ b/charts/nginz/templates/servicemonitor.yaml @@ -0,0 +1,19 @@ +{{- if .Values.metrics.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: nginz + labels: + app: nginz + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + endpoints: + - port: http + path: /vts/status/format/prometheus + selector: + matchLabels: + app: nginz + release: {{ .Release.Name }} +{{- end }} diff --git a/charts/nginz/values.yaml b/charts/nginz/values.yaml index 4b860e400e..981bfdbb23 100644 --- a/charts/nginz/values.yaml +++ b/charts/nginz/values.yaml @@ -6,6 +6,9 @@ resources: limits: memory: "1024Mi" cpu: "2" +metrics: + serviceMonitor: + enabled: false images: nginzDisco: repository: quay.io/wire/nginz_disco @@ -270,27 +273,27 @@ nginx_conf: disable_zauth: true basic_auth: true versioned: false - - path: /i/teams/([^/]*)/suspend + - path: /i/users/([^/]*)/features/([^/])* envs: - staging disable_zauth: true basic_auth: true versioned: false - - path: /i/teams/([^/]*)/unsuspend + - path: /i/teams/([^/]*)/suspend envs: - staging disable_zauth: true basic_auth: true versioned: false - - path: /i/provider/activation-code + - path: /i/teams/([^/]*)/unsuspend envs: - staging disable_zauth: true basic_auth: true versioned: false - - path: /i/legalhold/whitelisted-teams(.*) + - path: /i/provider/activation-code envs: - - staging + - staging disable_zauth: true basic_auth: true versioned: false @@ -418,6 +421,12 @@ nginx_conf: envs: - staging versioned: false + - path: /i/legalhold/whitelisted-teams(.*) + envs: + - staging + disable_zauth: true + basic_auth: true + versioned: false - path: /teams/api-docs envs: - all diff --git a/charts/openldap/templates/openldap.yaml b/charts/openldap/templates/openldap.yaml index 0e2281d27d..28ed001aa6 100644 --- a/charts/openldap/templates/openldap.yaml +++ b/charts/openldap/templates/openldap.yaml @@ -3,7 +3,7 @@ kind: Pod metadata: name: "openldap" labels: - wireService: openldap + app: openldap chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -51,4 +51,4 @@ spec: - name: LDAP_ORGANISATION value: "People" - name: LDAP_ADMIN_PASSWORD - value: "admin" \ No newline at end of file + value: "admin" diff --git a/charts/openldap/templates/secret-newusers.yaml b/charts/openldap/templates/secret-newusers.yaml index b78ef5a220..0397cb0af5 100644 --- a/charts/openldap/templates/secret-newusers.yaml +++ b/charts/openldap/templates/secret-newusers.yaml @@ -3,7 +3,7 @@ kind: Secret metadata: name: openldap-newusers-ldif labels: - wireService: ldap-scim-bridge + app: ldap-scim-bridge chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/charts/openldap/templates/service.yaml b/charts/openldap/templates/service.yaml index 356597c605..b140faf368 100644 --- a/charts/openldap/templates/service.yaml +++ b/charts/openldap/templates/service.yaml @@ -4,9 +4,9 @@ metadata: name: openldap spec: selector: - wireService: openldap + app: openldap ports: - name: openldap protocol: TCP port: 389 - targetPort: 389 \ No newline at end of file + targetPort: 389 diff --git a/charts/proxy/templates/deployment.yaml b/charts/proxy/templates/deployment.yaml index bedb30e16f..d2f1f4f6a8 100644 --- a/charts/proxy/templates/deployment.yaml +++ b/charts/proxy/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: proxy labels: - wireService: proxy + app: proxy chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,11 +16,11 @@ spec: maxSurge: {{ .Values.replicaCount }} selector: matchLabels: - wireService: proxy + app: proxy template: metadata: labels: - wireService: proxy + app: proxy release: {{ .Release.Name }} annotations: # An annotation of the configmap checksum ensures changes to the configmap cause a redeployment upon `helm upgrade` diff --git a/charts/proxy/templates/service.yaml b/charts/proxy/templates/service.yaml index 0b60d66f6d..2bda5053b2 100644 --- a/charts/proxy/templates/service.yaml +++ b/charts/proxy/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: proxy labels: - wireService: proxy + app: proxy chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -14,5 +14,5 @@ spec: port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} selector: - wireService: proxy + app: proxy release: {{ .Release.Name }} diff --git a/charts/proxy/templates/servicemonitor.yaml b/charts/proxy/templates/servicemonitor.yaml new file mode 100644 index 0000000000..88120fe7cd --- /dev/null +++ b/charts/proxy/templates/servicemonitor.yaml @@ -0,0 +1,19 @@ +{{- if .Values.metrics.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: proxy + labels: + app: proxy + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + endpoints: + - port: http + path: /i/metrics + selector: + matchLabels: + app: proxy + release: {{ .Release.Name }} +{{- end }} diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml index ec7b8a8182..f7de774ea0 100644 --- a/charts/proxy/values.yaml +++ b/charts/proxy/values.yaml @@ -5,6 +5,9 @@ image: service: externalPort: 8080 internalPort: 8080 +metrics: + serviceMonitor: + enable: false resources: requests: memory: "128Mi" @@ -14,4 +17,4 @@ resources: cpu: "500m" config: logLevel: Debug - proxy: {} \ No newline at end of file + proxy: {} diff --git a/charts/reaper/templates/deployment.yaml b/charts/reaper/templates/deployment.yaml index 1601a2acbe..8a11b60b4f 100644 --- a/charts/reaper/templates/deployment.yaml +++ b/charts/reaper/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: reaper labels: - wireService: reaper + app: reaper chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -11,12 +11,12 @@ spec: replicas: 1 selector: matchLabels: - wireService: reaper + app: reaper release: {{ .Release.Name }} template: metadata: labels: - wireService: reaper + app: reaper release: {{ .Release.Name }} spec: serviceAccountName: reaper-role diff --git a/charts/spar/templates/deployment.yaml b/charts/spar/templates/deployment.yaml index a6b86f8bbd..874caafc42 100644 --- a/charts/spar/templates/deployment.yaml +++ b/charts/spar/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: spar labels: - wireService: spar + app: spar chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,11 +16,11 @@ spec: maxSurge: {{ .Values.replicaCount }} selector: matchLabels: - wireService: spar + app: spar template: metadata: labels: - wireService: spar + app: spar release: {{ .Release.Name }} annotations: # An annotation of the configmap checksum ensures changes to the configmap cause a redeployment upon `helm upgrade` diff --git a/charts/spar/templates/service.yaml b/charts/spar/templates/service.yaml index e360ac0f3d..711967459f 100644 --- a/charts/spar/templates/service.yaml +++ b/charts/spar/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: spar labels: - wireService: spar + app: spar chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -14,5 +14,5 @@ spec: port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} selector: - wireService: spar + app: spar release: {{ .Release.Name }} diff --git a/charts/spar/templates/servicemonitor.yaml b/charts/spar/templates/servicemonitor.yaml new file mode 100644 index 0000000000..f2b23703b6 --- /dev/null +++ b/charts/spar/templates/servicemonitor.yaml @@ -0,0 +1,19 @@ +{{- if .Values.metrics.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: spar + labels: + app: spar + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + endpoints: + - port: http + path: /i/metrics + selector: + matchLabels: + app: spar + release: {{ .Release.Name }} +{{- end }} diff --git a/charts/spar/templates/tests/spar-integration.yaml b/charts/spar/templates/tests/spar-integration.yaml index 19646326a7..c4735ffd15 100644 --- a/charts/spar/templates/tests/spar-integration.yaml +++ b/charts/spar/templates/tests/spar-integration.yaml @@ -5,7 +5,7 @@ metadata: annotations: "helm.sh/hook": test-success labels: - wireService: spar-integration + app: spar-integration release: {{ .Release.Name }} spec: volumes: diff --git a/charts/spar/values.yaml b/charts/spar/values.yaml index 60f7e8d10d..3cdd3b8490 100644 --- a/charts/spar/values.yaml +++ b/charts/spar/values.yaml @@ -2,6 +2,9 @@ replicaCount: 3 image: repository: quay.io/wire/spar tag: do-not-use +metrics: + serviceMonitor: + enable: false resources: requests: memory: "128Mi" @@ -20,4 +23,4 @@ config: logLevel: Info maxttlAuthreq: 7200 maxttlAuthresp: 7200 - proxy: {} \ No newline at end of file + proxy: {} diff --git a/charts/team-settings/templates/deployment.yaml b/charts/team-settings/templates/deployment.yaml index 467d632445..b560d8ca57 100644 --- a/charts/team-settings/templates/deployment.yaml +++ b/charts/team-settings/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: team-settings labels: - wireService: team-settings + app: team-settings chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,12 +16,10 @@ spec: maxSurge: {{ .Values.replicaCount | mul 2 }} selector: matchLabels: - wireService: team-settings app: team-settings template: metadata: labels: - wireService: team-settings app: team-settings release: {{ .Release.Name }} spec: diff --git a/charts/team-settings/values.yaml b/charts/team-settings/values.yaml index b4285adb49..abdcfdd60f 100644 --- a/charts/team-settings/values.yaml +++ b/charts/team-settings/values.yaml @@ -9,7 +9,7 @@ resources: cpu: "1" image: repository: quay.io/wire/team-settings - tag: "4.9.0-v0.29.7-0-142a76f" + tag: "4.10.0-v0.29.7-0-3be8ca3" service: https: externalPort: 443 diff --git a/charts/webapp/templates/deployment.yaml b/charts/webapp/templates/deployment.yaml index 14c8f15c78..457d9547b9 100644 --- a/charts/webapp/templates/deployment.yaml +++ b/charts/webapp/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: webapp labels: - wireService: webapp + app: webapp chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -16,12 +16,10 @@ spec: maxSurge: {{ .Values.replicaCount | mul 2 }} selector: matchLabels: - wireService: webapp app: webapp template: metadata: labels: - wireService: webapp app: webapp release: {{ .Release.Name }} spec: diff --git a/charts/webapp/values.yaml b/charts/webapp/values.yaml index ef6d6b9d35..a639cd046a 100644 --- a/charts/webapp/values.yaml +++ b/charts/webapp/values.yaml @@ -9,7 +9,7 @@ resources: cpu: "1" image: repository: quay.io/wire/webapp - tag: "2022-05-04-production.0-v0.29.7-0-a6f2ded" + tag: "2022-06-13-production.0-v0.29.7-0-2819b90" service: https: externalPort: 443 diff --git a/charts/wire-server-metrics/values.yaml b/charts/wire-server-metrics/values.yaml index 44bac846a3..7a9a8b8763 100644 --- a/charts/wire-server-metrics/values.yaml +++ b/charts/wire-server-metrics/values.yaml @@ -1,29 +1,4 @@ kube-prometheus-stack: - prometheus: - additionalServiceMonitors: - - name: wire-services - # We copy these labels from the pod onto the collected metrics from that pod - targetLabels: - - wireService - endpoints: - - path: '/i/metrics' - port: http - interval: 10s - metricRelabelings: - # Rename 'service' to 'role' to allow sharing of grafana dashboards - # between k8s and AWS services. - - sourceLabels: [service] - targetLabel: role - # This monitors _all_ namespaces and selects all - # pods that with a wireServices selector - namespaceSelector: - any: true - selector: - matchExpressions: - # select any pod with a 'wireService' label - - key: wireService - operator: Exists - prometheusOperator: # Don't try to create custom resource types; we prefer to do it manually # Otherwise we run into race conditions when installing helm charts diff --git a/docs/src/_templates/layout.html b/docs/src/_templates/layout.html index cdf6b5c4a8..357a7a120b 100644 --- a/docs/src/_templates/layout.html +++ b/docs/src/_templates/layout.html @@ -2,7 +2,11 @@ {% block sidebartitle %} + {%- if logo %} + + {%- else %} + {%- endif %}