From 35f59cd907f32b8cfd7218ac02ff5c49d8a7f8ff Mon Sep 17 00:00:00 2001 From: mattermod Date: Thu, 16 Feb 2023 10:14:43 +0000 Subject: [PATCH 01/52] Bump mattermost-enterprise-edition App Version to 7.8.0 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 57b82480..40178262 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.18 -appVersion: 7.7.1 +version: 2.6.19 +appVersion: 7.8.0 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index 384cab6d..ed823ad0 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 7.7.1@sha256:d66f763d17a04c02916c425c03e67310925ff0e2ffccb14382a9044b116c39c6 + tag: 7.8.0@sha256:8524f585e59771c53fc4cd7c2d7f7cc3331bcdc8a267e847ee7aa73ebfcaa8be pullPolicy: IfNotPresent strategy: From 094973fce31a78ec3471d378f05540213f407ef7 Mon Sep 17 00:00:00 2001 From: mattermod Date: Thu, 16 Feb 2023 10:14:45 +0000 Subject: [PATCH 02/52] Bump mattermost-team-edition App Version to 7.8.0 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index 23effab0..2877a3db 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.18 -appVersion: 7.7.1 +version: 6.6.19 +appVersion: 7.8.0 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 8a39cf3a..93e6614a 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 7.7.1@sha256:94d382c9cb06f0d0194bbebb9e20f285b29338c3cd0d46444b3e46b9fd16913d + tag: 7.8.0@sha256:ef19a03c4cff42fee0dee26a1ffb11bb68fbf17ec376cb89cd01c0147dbfaecf imagePullPolicy: IfNotPresent initContainerImage: From 4f95a9ca2820af316075888a3a69c3829cb8d6c7 Mon Sep 17 00:00:00 2001 From: mattermod Date: Mon, 6 Mar 2023 14:01:28 +0000 Subject: [PATCH 03/52] Bump mattermost-enterprise-edition App Version to 7.8.1 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 40178262..48168f54 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.19 -appVersion: 7.8.0 +version: 2.6.20 +appVersion: 7.8.1 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index ed823ad0..534ad234 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 7.8.0@sha256:8524f585e59771c53fc4cd7c2d7f7cc3331bcdc8a267e847ee7aa73ebfcaa8be + tag: 7.8.1@sha256:5d28ddf0313a071578321d5f996ab8befa9f56e6e82d6ea92477c424bb6f4c70 pullPolicy: IfNotPresent strategy: From a1235b8925f5ce022fe86b4f2da4a2e3f8c4d7e9 Mon Sep 17 00:00:00 2001 From: mattermod Date: Mon, 6 Mar 2023 14:01:29 +0000 Subject: [PATCH 04/52] Bump mattermost-team-edition App Version to 7.8.1 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index 2877a3db..5ac17201 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.19 -appVersion: 7.8.0 +version: 6.6.20 +appVersion: 7.8.1 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 93e6614a..99ad8aac 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 7.8.0@sha256:ef19a03c4cff42fee0dee26a1ffb11bb68fbf17ec376cb89cd01c0147dbfaecf + tag: 7.8.1@sha256:da979c5c250847ff6a2723695b0dcf554a1be09a3e68fadfad416e865b3097c3 imagePullPolicy: IfNotPresent initContainerImage: From 6343cf3b381149e8d9fc07af068b654c19b97c57 Mon Sep 17 00:00:00 2001 From: mattermod Date: Thu, 16 Mar 2023 10:34:27 +0000 Subject: [PATCH 05/52] Bump mattermost-enterprise-edition App Version to 7.9.0 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 48168f54..4846f816 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.20 -appVersion: 7.8.1 +version: 2.6.21 +appVersion: 7.9.0 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index 534ad234..e921f78b 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 7.8.1@sha256:5d28ddf0313a071578321d5f996ab8befa9f56e6e82d6ea92477c424bb6f4c70 + tag: 7.9.0@sha256:f7aede33240926f11bf13b4c51ebc5fd3866500f1063f385807439502634c9d7 pullPolicy: IfNotPresent strategy: From f134fdd7937de407598aba5fa3b45205135bd673 Mon Sep 17 00:00:00 2001 From: mattermod Date: Thu, 16 Mar 2023 10:34:28 +0000 Subject: [PATCH 06/52] Bump mattermost-team-edition App Version to 7.9.0 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index 5ac17201..e5ace592 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.20 -appVersion: 7.8.1 +version: 6.6.21 +appVersion: 7.9.0 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 99ad8aac..8e672765 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 7.8.1@sha256:da979c5c250847ff6a2723695b0dcf554a1be09a3e68fadfad416e865b3097c3 + tag: 7.9.0@sha256:edbbc9e28763e1dd94e6580e63cf5c9cc544022d4c5e2eb44b7eea6bcc044394 imagePullPolicy: IfNotPresent initContainerImage: From 136c138a5b2fe05e9bd063f0a115b4c09f822184 Mon Sep 17 00:00:00 2001 From: mattermod Date: Tue, 21 Mar 2023 11:45:37 +0000 Subject: [PATCH 07/52] Bump mattermost-enterprise-edition App Version to 7.9.1 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 4846f816..353f04d8 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.21 -appVersion: 7.9.0 +version: 2.6.22 +appVersion: 7.9.1 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index e921f78b..dcb24994 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 7.9.0@sha256:f7aede33240926f11bf13b4c51ebc5fd3866500f1063f385807439502634c9d7 + tag: 7.9.1@sha256:fbd6465dd9ee98a4ff28c4aa29a344129096c98401757e705dcb83689fc9e0d3 pullPolicy: IfNotPresent strategy: From fde173d503d2995ef32b8665ab6a94a0fd9aea60 Mon Sep 17 00:00:00 2001 From: mattermod Date: Tue, 21 Mar 2023 11:45:38 +0000 Subject: [PATCH 08/52] Bump mattermost-team-edition App Version to 7.9.1 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index e5ace592..d66dd731 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.21 -appVersion: 7.9.0 +version: 6.6.22 +appVersion: 7.9.1 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 8e672765..9da0d939 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 7.9.0@sha256:edbbc9e28763e1dd94e6580e63cf5c9cc544022d4c5e2eb44b7eea6bcc044394 + tag: 7.9.1@sha256:7a7acbc25c1948081eedb3c1f98f5a7ffb75f7bc84359ab8e457f94766d9a014 imagePullPolicy: IfNotPresent initContainerImage: From f258f28828a4201666f2bcffada815f3ea4e9ab2 Mon Sep 17 00:00:00 2001 From: Gabe Jackson <3694686+gabrieljackson@users.noreply.github.com> Date: Wed, 29 Mar 2023 13:29:08 -0400 Subject: [PATCH 09/52] Update Mattermost Operator to v1.20.0 (#393) The change includes chart updates that support our newest release of the Mattermost Operator. --- charts/mattermost-operator/Chart.yaml | 5 +- charts/mattermost-operator/README.md | 2 +- .../crds/crd-clusterinstallations.yaml | 52 +- .../crds/crd-mattermosts.yaml | 453 +++++++++++++++++- .../mattermost-operator/clusterrole.yaml | 1 + .../mattermost-operator/deployment.yaml | 5 + charts/mattermost-operator/values.yaml | 8 +- 7 files changed, 508 insertions(+), 18 deletions(-) diff --git a/charts/mattermost-operator/Chart.yaml b/charts/mattermost-operator/Chart.yaml index 426ac301..7668392b 100644 --- a/charts/mattermost-operator/Chart.yaml +++ b/charts/mattermost-operator/Chart.yaml @@ -2,10 +2,11 @@ apiVersion: v2 name: mattermost-operator description: A Helm chart for Mattermost Operator type: application -version: 0.3.3 -appVersion: 1.18.0 +version: 0.3.4 +appVersion: 1.20.0 keywords: - operator - mattermost maintainers: - name: stylianosrigas + - name: gabrieljackson diff --git a/charts/mattermost-operator/README.md b/charts/mattermost-operator/README.md index 69142fd8..57bebbfd 100644 --- a/charts/mattermost-operator/README.md +++ b/charts/mattermost-operator/README.md @@ -9,7 +9,7 @@ The Mattermost Operator source code lives [here](https://github.com/mattermost/m ## 1.1 Kubernetes Cluster -You need a running Kubernetes cluster v1.16+. If you do not have one, find options and installation instructions here: +You need a running Kubernetes cluster v1.22+. If you do not have one, find options and installation instructions here: https://kubernetes.io/docs/home/ diff --git a/charts/mattermost-operator/crds/crd-clusterinstallations.yaml b/charts/mattermost-operator/crds/crd-clusterinstallations.yaml index 7cd37251..218c4936 100644 --- a/charts/mattermost-operator/crds/crd-clusterinstallations.yaml +++ b/charts/mattermost-operator/crds/crd-clusterinstallations.yaml @@ -1090,8 +1090,7 @@ spec: running. properties: exec: - description: One and only one of the following should be specified. - Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: Command is the command line to execute inside @@ -1111,6 +1110,25 @@ spec: value is 1. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC port. This + is an alpha field and requires enabling GRPCContainerProbe feature + gate. + properties: + port: + description: Port number of the gRPC service. Number must + be in the range 1 to 65535. + format: int32 + type: integer + service: + description: "Service is the name of the service to place + in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). + \n If this is not specified, the default behavior is defined + by gRPC." + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1171,9 +1189,7 @@ spec: format: int32 type: integer tcpSocket: - description: 'TCPSocket specifies an action involving a TCP port. - TCP hooks not yet supported TODO: implement a realistic TCP - lifecycle hook' + description: TCPSocket specifies an action involving a TCP port. properties: host: description: 'Optional: Host name to connect to, defaults @@ -1396,8 +1412,7 @@ spec: to accept traffic. properties: exec: - description: One and only one of the following should be specified. - Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: Command is the command line to execute inside @@ -1417,6 +1432,25 @@ spec: value is 1. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC port. This + is an alpha field and requires enabling GRPCContainerProbe feature + gate. + properties: + port: + description: Port number of the gRPC service. Number must + be in the range 1 to 65535. + format: int32 + type: integer + service: + description: "Service is the name of the service to place + in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). + \n If this is not specified, the default behavior is defined + by gRPC." + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1477,9 +1511,7 @@ spec: format: int32 type: integer tcpSocket: - description: 'TCPSocket specifies an action involving a TCP port. - TCP hooks not yet supported TODO: implement a realistic TCP - lifecycle hook' + description: TCPSocket specifies an action involving a TCP port. properties: host: description: 'Optional: Host name to connect to, defaults diff --git a/charts/mattermost-operator/crds/crd-mattermosts.yaml b/charts/mattermost-operator/crds/crd-mattermosts.yaml index 4ee57d76..b99ceeaa 100644 --- a/charts/mattermost-operator/crds/crd-mattermosts.yaml +++ b/charts/mattermost-operator/crds/crd-mattermosts.yaml @@ -1,5 +1,3 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -55,6 +53,38 @@ spec: spec: description: MattermostSpec defines the desired state of Mattermost properties: + awsLoadBalancerController: + properties: + annotations: + additionalProperties: + type: string + description: Annotations defines annotations passed to the Ingress + associated with Mattermost. + type: object + certificateARN: + description: Certificate arn for the ALB, required if SSL enabled + type: string + enabled: + description: An AWS ALB Ingress will be created instead of nginx + type: boolean + hosts: + description: Hosts allows specifying additional domain names for + Mattermost to use. + items: + description: IngressHost specifies additional hosts configuration. + properties: + hostName: + type: string + type: object + type: array + ingressClassName: + description: IngressClassName for your ingress + type: string + internetFacing: + description: Whether the Ingress will be internetfacing, default + is false + type: boolean + type: object database: description: External Services properties: @@ -151,6 +181,16 @@ spec: type: string type: object type: object + deploymentTemplate: + description: DeploymentTemplate defines configuration for the template + for Mattermost deployment. + properties: + revisionHistoryLimit: + description: Defines the revision history limit for the mattermost + deployment. + format: int32 + type: integer + type: object dnsConfig: description: Custom DNS configuration to use for the Mattermost Installation pods. @@ -218,6 +258,35 @@ spec: url: description: Set to use an external MinIO deployment or S3. type: string + useServiceAccount: + description: Optionally use service account with IAM role + to access AWS services, like S3. + type: boolean + type: object + externalVolume: + description: Defines the configuration of externally managed PVC + backed storage. + properties: + volumeClaimName: + description: The name of the matching volume claim for the + externally managed volume. + type: string + type: object + local: + description: Defines the configuration of PVC backed storage (local). + This is NOT recommended for production environments. + properties: + enabled: + description: Set to use local (PVC) storage, require explicit + enabled to prevent accidental misconfiguration. + type: boolean + storageSize: + description: Defines the storage size for the PVC. (default + 50Gi) + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + type: string + required: + - enabled type: object operatorManaged: description: Defines the configuration of file store managed by @@ -1696,6 +1765,365 @@ spec: type: object type: array type: object + podTemplate: + description: PodTemplate defines configuration for the template for + Mattermost pods. + properties: + containerSecurityContext: + description: Defines the security context for the Mattermost app + server container. + properties: + allowPrivilegeEscalation: + description: 'AllowPrivilegeEscalation controls whether a + process can gain more privileges than its parent process. + This bool directly controls if the no_new_privs flag will + be set on the container process. AllowPrivilegeEscalation + is true always when the container is: 1) run as Privileged + 2) has CAP_SYS_ADMIN Note that this field cannot be set + when spec.os.name is windows.' + type: boolean + capabilities: + description: The capabilities to add/drop when running containers. + Defaults to the default set of capabilities granted by the + container runtime. Note that this field cannot be set when + spec.os.name is windows. + properties: + add: + description: Added capabilities + items: + description: Capability represent POSIX capabilities + type + type: string + type: array + drop: + description: Removed capabilities + items: + description: Capability represent POSIX capabilities + type + type: string + type: array + type: object + privileged: + description: Run container in privileged mode. Processes in + privileged containers are essentially equivalent to root + on the host. Defaults to false. Note that this field cannot + be set when spec.os.name is windows. + type: boolean + procMount: + description: procMount denotes the type of proc mount to use + for the containers. The default is DefaultProcMount which + uses the container runtime defaults for readonly paths and + masked paths. This requires the ProcMountType feature flag + to be enabled. Note that this field cannot be set when spec.os.name + is windows. + type: string + readOnlyRootFilesystem: + description: Whether this container has a read-only root filesystem. + Default is false. Note that this field cannot be set when + spec.os.name is windows. + type: boolean + runAsGroup: + description: The GID to run the entrypoint of the container + process. Uses runtime default if unset. May also be set + in PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext + takes precedence. Note that this field cannot be set when + spec.os.name is windows. + format: int64 + type: integer + runAsNonRoot: + description: Indicates that the container must run as a non-root + user. If true, the Kubelet will validate the image at runtime + to ensure that it does not run as UID 0 (root) and fail + to start the container if it does. If unset or false, no + such validation will be performed. May also be set in PodSecurityContext. If + set in both SecurityContext and PodSecurityContext, the + value specified in SecurityContext takes precedence. + type: boolean + runAsUser: + description: The UID to run the entrypoint of the container + process. Defaults to user specified in image metadata if + unspecified. May also be set in PodSecurityContext. If + set in both SecurityContext and PodSecurityContext, the + value specified in SecurityContext takes precedence. Note + that this field cannot be set when spec.os.name is windows. + format: int64 + type: integer + seLinuxOptions: + description: The SELinux context to be applied to the container. + If unspecified, the container runtime will allocate a random + SELinux context for each container. May also be set in + PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext + takes precedence. Note that this field cannot be set when + spec.os.name is windows. + properties: + level: + description: Level is SELinux level label that applies + to the container. + type: string + role: + description: Role is a SELinux role label that applies + to the container. + type: string + type: + description: Type is a SELinux type label that applies + to the container. + type: string + user: + description: User is a SELinux user label that applies + to the container. + type: string + type: object + seccompProfile: + description: The seccomp options to use by this container. + If seccomp options are provided at both the pod & container + level, the container options override the pod options. Note + that this field cannot be set when spec.os.name is windows. + properties: + localhostProfile: + description: localhostProfile indicates a profile defined + in a file on the node should be used. The profile must + be preconfigured on the node to work. Must be a descending + path, relative to the kubelet's configured seccomp profile + location. Must only be set if type is "Localhost". + type: string + type: + description: "type indicates which kind of seccomp profile + will be applied. Valid options are: \n Localhost - a + profile defined in a file on the node should be used. + RuntimeDefault - the container runtime default profile + should be used. Unconfined - no profile should be applied." + type: string + required: + - type + type: object + windowsOptions: + description: The Windows specific settings applied to all + containers. If unspecified, the options from the PodSecurityContext + will be used. If set in both SecurityContext and PodSecurityContext, + the value specified in SecurityContext takes precedence. + Note that this field cannot be set when spec.os.name is + linux. + properties: + gmsaCredentialSpec: + description: GMSACredentialSpec is where the GMSA admission + webhook (https://github.com/kubernetes-sigs/windows-gmsa) + inlines the contents of the GMSA credential spec named + by the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: + description: GMSACredentialSpecName is the name of the + GMSA credential spec to use. + type: string + hostProcess: + description: HostProcess determines if a container should + be run as a 'Host Process' container. This field is + alpha-level and will only be honored by components that + enable the WindowsHostProcessContainers feature flag. + Setting this field without the feature flag will result + in errors when validating the Pod. All of a Pod's containers + must have the same effective HostProcess value (it is + not allowed to have a mix of HostProcess containers + and non-HostProcess containers). In addition, if HostProcess + is true then HostNetwork must also be set to true. + type: boolean + runAsUserName: + description: The UserName in Windows to run the entrypoint + of the container process. Defaults to the user specified + in image metadata if unspecified. May also be set in + PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext + takes precedence. + type: string + type: object + type: object + extraAnnotations: + additionalProperties: + type: string + description: Defines annotations to add to the Mattermost app + server pods. Overrides of default prometheus annotations are + ignored. + type: object + extraLabels: + additionalProperties: + type: string + description: Defines labels to add to the Mattermost app server + pods. Overrides what is set in ResourceLabels, does not override + default labels (app and cluster labels). + type: object + securityContext: + description: Defines the security context for the Mattermost app + server pods. + properties: + fsGroup: + description: "A special supplemental group that applies to + all containers in a pod. Some volume types allow the Kubelet + to change the ownership of that volume to be owned by the + pod: \n 1. The owning GID will be the FSGroup 2. The setgid + bit is set (new files created in the volume will be owned + by FSGroup) 3. The permission bits are OR'd with rw-rw---- + \n If unset, the Kubelet will not modify the ownership and + permissions of any volume. Note that this field cannot be + set when spec.os.name is windows." + format: int64 + type: integer + fsGroupChangePolicy: + description: 'fsGroupChangePolicy defines behavior of changing + ownership and permission of the volume before being exposed + inside Pod. This field will only apply to volume types which + support fsGroup based ownership(and permissions). It will + have no effect on ephemeral volume types such as: secret, + configmaps and emptydir. Valid values are "OnRootMismatch" + and "Always". If not specified, "Always" is used. Note that + this field cannot be set when spec.os.name is windows.' + type: string + runAsGroup: + description: The GID to run the entrypoint of the container + process. Uses runtime default if unset. May also be set + in SecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext + takes precedence for that container. Note that this field + cannot be set when spec.os.name is windows. + format: int64 + type: integer + runAsNonRoot: + description: Indicates that the container must run as a non-root + user. If true, the Kubelet will validate the image at runtime + to ensure that it does not run as UID 0 (root) and fail + to start the container if it does. If unset or false, no + such validation will be performed. May also be set in SecurityContext. If + set in both SecurityContext and PodSecurityContext, the + value specified in SecurityContext takes precedence. + type: boolean + runAsUser: + description: The UID to run the entrypoint of the container + process. Defaults to user specified in image metadata if + unspecified. May also be set in SecurityContext. If set + in both SecurityContext and PodSecurityContext, the value + specified in SecurityContext takes precedence for that container. + Note that this field cannot be set when spec.os.name is + windows. + format: int64 + type: integer + seLinuxOptions: + description: The SELinux context to be applied to all containers. + If unspecified, the container runtime will allocate a random + SELinux context for each container. May also be set in + SecurityContext. If set in both SecurityContext and PodSecurityContext, + the value specified in SecurityContext takes precedence + for that container. Note that this field cannot be set when + spec.os.name is windows. + properties: + level: + description: Level is SELinux level label that applies + to the container. + type: string + role: + description: Role is a SELinux role label that applies + to the container. + type: string + type: + description: Type is a SELinux type label that applies + to the container. + type: string + user: + description: User is a SELinux user label that applies + to the container. + type: string + type: object + seccompProfile: + description: The seccomp options to use by the containers + in this pod. Note that this field cannot be set when spec.os.name + is windows. + properties: + localhostProfile: + description: localhostProfile indicates a profile defined + in a file on the node should be used. The profile must + be preconfigured on the node to work. Must be a descending + path, relative to the kubelet's configured seccomp profile + location. Must only be set if type is "Localhost". + type: string + type: + description: "type indicates which kind of seccomp profile + will be applied. Valid options are: \n Localhost - a + profile defined in a file on the node should be used. + RuntimeDefault - the container runtime default profile + should be used. Unconfined - no profile should be applied." + type: string + required: + - type + type: object + supplementalGroups: + description: A list of groups applied to the first process + run in each container, in addition to the container's primary + GID. If unspecified, no groups will be added to any container. + Note that this field cannot be set when spec.os.name is + windows. + items: + format: int64 + type: integer + type: array + sysctls: + description: Sysctls hold a list of namespaced sysctls used + for the pod. Pods with unsupported sysctls (by the container + runtime) might fail to launch. Note that this field cannot + be set when spec.os.name is windows. + items: + description: Sysctl defines a kernel parameter to be set + properties: + name: + description: Name of a property to set + type: string + value: + description: Value of a property to set + type: string + required: + - name + - value + type: object + type: array + windowsOptions: + description: The Windows specific settings applied to all + containers. If unspecified, the options within a container's + SecurityContext will be used. If set in both SecurityContext + and PodSecurityContext, the value specified in SecurityContext + takes precedence. Note that this field cannot be set when + spec.os.name is linux. + properties: + gmsaCredentialSpec: + description: GMSACredentialSpec is where the GMSA admission + webhook (https://github.com/kubernetes-sigs/windows-gmsa) + inlines the contents of the GMSA credential spec named + by the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: + description: GMSACredentialSpecName is the name of the + GMSA credential spec to use. + type: string + hostProcess: + description: HostProcess determines if a container should + be run as a 'Host Process' container. This field is + alpha-level and will only be honored by components that + enable the WindowsHostProcessContainers feature flag. + Setting this field without the feature flag will result + in errors when validating the Pod. All of a Pod's containers + must have the same effective HostProcess value (it is + not allowed to have a mix of HostProcess containers + and non-HostProcess containers). In addition, if HostProcess + is true then HostNetwork must also be set to true. + type: boolean + runAsUserName: + description: The UserName in Windows to run the entrypoint + of the container process. Defaults to the user specified + in image metadata if unspecified. May also be set in + PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext + takes precedence. + type: string + type: object + type: object + type: object probes: description: Probes defines configuration of liveness and readiness probe for Mattermost pods. These settings generally don't need to @@ -2998,6 +3426,27 @@ spec: Setting new Size will override previous values regardless if set by Size or manually.' type: string + updateJob: + description: UpdateJob defines configuration for the template for + the update job. + properties: + disabled: + description: Determines whether to disable the Operator's creation + of the update job. + type: boolean + extraAnnotations: + additionalProperties: + type: string + description: Defines annotations to add to the update job pod. + type: object + extraLabels: + additionalProperties: + type: string + description: Defines labels to add to the update job pod. Overrides + what is set in ResourceLabels, does not override default label + (app label). + type: object + type: object useIngressTLS: description: 'UseIngressTLS specifies whether TLS secret should be configured for Ingress. Deprecated: Use Spec.Ingress.TLSSecret.' diff --git a/charts/mattermost-operator/templates/mattermost-operator/clusterrole.yaml b/charts/mattermost-operator/templates/mattermost-operator/clusterrole.yaml index 89daaa3c..d405c965 100644 --- a/charts/mattermost-operator/templates/mattermost-operator/clusterrole.yaml +++ b/charts/mattermost-operator/templates/mattermost-operator/clusterrole.yaml @@ -58,6 +58,7 @@ rules: - networking.k8s.io resources: - ingresses + - ingressclasses verbs: - '*' - apiGroups: diff --git a/charts/mattermost-operator/templates/mattermost-operator/deployment.yaml b/charts/mattermost-operator/templates/mattermost-operator/deployment.yaml index 01105730..b0200fdc 100644 --- a/charts/mattermost-operator/templates/mattermost-operator/deployment.yaml +++ b/charts/mattermost-operator/templates/mattermost-operator/deployment.yaml @@ -36,11 +36,16 @@ spec: env: - name: MAX_RECONCILING_INSTALLATIONS value: "{{ .Values.mattermostOperator.env.maxReconcilingInstallations }}" + - name: MAX_RECONCILE_CONCURRENCY + value: "{{ .Values.mattermostOperator.env.maxReconcilingConcurrency }}" - name: REQUEUE_ON_LIMIT_DELAY value: "{{ .Values.mattermostOperator.env.requeuOnLimitDelay }}" image: "{{ .Values.mattermostOperator.image.repository }}:{{ .Values.mattermostOperator.image.tag }}" imagePullPolicy: "{{ .Values.mattermostOperator.image.pullPolicy }}" name: {{ template "mattermost-operator.name" . }} + ports: + - containerPort: 8383 + name: metrics serviceAccountName: {{ template "mattermost-operator.name" . }} {{- if .Values.mattermostOperator.privateRegistry.enabled }} imagePullSecrets: diff --git a/charts/mattermost-operator/values.yaml b/charts/mattermost-operator/values.yaml index efa6e07b..4d7a42e3 100644 --- a/charts/mattermost-operator/values.yaml +++ b/charts/mattermost-operator/values.yaml @@ -2,7 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -# The values below are for mattermost Custom Resource +# The values below are for Mattermost Custom Resource # Full spec example can be found here: https://github.com/mattermost/mattermost-operator/blob/master/docs/examples/mattermost_full.yaml # Examples for mattermost spec can be found here: https://github.com/mattermost/mattermost-operator/tree/master/docs/examples # Enable the database, file storage operatorManaged below to run with in cluster database and file storage (not recommended for production scenario). @@ -10,7 +10,7 @@ mattermostCR: enabled: false name: mattermost-example spec: - version: 7.2.0 + version: 7.9.1 replicas: 1 ingress: enabled: true @@ -43,13 +43,15 @@ mattermostOperator: create: true env: maxReconcilingInstallations: 20 + maxReconcilingConcurrency: 10 requeuOnLimitDelay: 20s image: repository: mattermost/mattermost-operator - tag: v1.18.0 + tag: v1.20.0 pullPolicy: IfNotPresent args: - --enable-leader-election + - --metrics-addr=0.0.0.0:8383 ## Specify image pull secret for private repository ## From ed5b362359551ad841853b7966cd270d23ba3424 Mon Sep 17 00:00:00 2001 From: Gabe Jackson <3694686+gabrieljackson@users.noreply.github.com> Date: Wed, 29 Mar 2023 15:14:20 -0400 Subject: [PATCH 10/52] Run CI/CD on master branch (#395) This change updates some github action imports and runs the normal CI/CD checks on the master branch. --- .github/workflows/pull-request.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 83fc15a5..b20b94e3 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -2,16 +2,18 @@ name: "Validate PR" on: pull_request: - branches: [ master ] + push: + branches: + - master jobs: lint: name: Lint Project - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: # Checkout everything since ct uses git diff to determine charts - name: Checkout - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b #v3.0.2 + uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 with: fetch-depth: 0 - name: Execute Lint @@ -19,16 +21,14 @@ jobs: test: name: Test - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: - lint steps: # Checkout everything since ct uses git diff to determine charts - name: Checkout - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b #v3.0.2 + uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 with: fetch-depth: 0 - name: Execute Tests run: make test - - From d61fd187e6aba34d87ae0bc8932ea120ae07d1b2 Mon Sep 17 00:00:00 2001 From: mattermod Date: Tue, 18 Apr 2023 10:19:11 +0000 Subject: [PATCH 11/52] Bump mattermost-enterprise-edition App Version to 7.9.2 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 353f04d8..5b7ae347 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.22 -appVersion: 7.9.1 +version: 2.6.23 +appVersion: 7.9.2 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index dcb24994..f68f27bf 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 7.9.1@sha256:fbd6465dd9ee98a4ff28c4aa29a344129096c98401757e705dcb83689fc9e0d3 + tag: 7.9.2@sha256:48a8aac8d44ea00316db5eec7add0d15c126792c70dd972d3aad4ea8e7e4e63f pullPolicy: IfNotPresent strategy: From 1f917699ab8cbe8b841c5e498bddcc20248f7225 Mon Sep 17 00:00:00 2001 From: mattermod Date: Tue, 18 Apr 2023 10:19:12 +0000 Subject: [PATCH 12/52] Bump mattermost-team-edition App Version to 7.9.2 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index d66dd731..b76cc528 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.22 -appVersion: 7.9.1 +version: 6.6.23 +appVersion: 7.9.2 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 9da0d939..ed8c54dd 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 7.9.1@sha256:7a7acbc25c1948081eedb3c1f98f5a7ffb75f7bc84359ab8e457f94766d9a014 + tag: 7.9.2@sha256:0c179ccd87f71af7059f67ea2e1586eea58d396cd4e9d8dda587c28a8a3fad21 imagePullPolicy: IfNotPresent initContainerImage: From cb3ef13375cb1ec53f1dc917817de51aadb26dfc Mon Sep 17 00:00:00 2001 From: mattermod Date: Wed, 19 Apr 2023 09:48:40 +0000 Subject: [PATCH 13/52] Bump mattermost-enterprise-edition App Version to 7.10.0 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 5b7ae347..32b10f54 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.23 -appVersion: 7.9.2 +version: 2.6.24 +appVersion: 7.10.0 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index f68f27bf..51ab6d87 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 7.9.2@sha256:48a8aac8d44ea00316db5eec7add0d15c126792c70dd972d3aad4ea8e7e4e63f + tag: 7.10.0@sha256:6ac910121de030d6e8c619beb111075a9b4b9781d75f538b59aca07b00739d48 pullPolicy: IfNotPresent strategy: From 445ff75badbea89b017896651dde357ceb0f8d4f Mon Sep 17 00:00:00 2001 From: mattermod Date: Wed, 19 Apr 2023 09:48:42 +0000 Subject: [PATCH 14/52] Bump mattermost-team-edition App Version to 7.10.0 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index b76cc528..f8a21e30 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.23 -appVersion: 7.9.2 +version: 6.6.24 +appVersion: 7.10.0 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index ed8c54dd..a9ccf9a7 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 7.9.2@sha256:0c179ccd87f71af7059f67ea2e1586eea58d396cd4e9d8dda587c28a8a3fad21 + tag: 7.10.0@sha256:ae38cc8231e280ad79ec45588663cde66b7287b1c296b162b1d0922fe607a7ad imagePullPolicy: IfNotPresent initContainerImage: From 20eb672b482b6b2dffe5d2d4883e1c654f614af8 Mon Sep 17 00:00:00 2001 From: Daniel Wierdsma Date: Thu, 20 Apr 2023 11:19:35 -0400 Subject: [PATCH 15/52] Convert RTCD to deployments from Daemonsets (#397) * Convert RTCD to deployments from Daemonsets * Ensure that no two calls instances are ever on the same node * Add RTCD as deployment --- charts/mattermost-rtcd/Chart.yaml | 2 +- .../{daemonset.yaml => deployment.yaml} | 25 ++++++++--------- charts/mattermost-rtcd/values.yaml | 27 ++++++++++++++++--- 3 files changed, 38 insertions(+), 16 deletions(-) rename charts/mattermost-rtcd/templates/{daemonset.yaml => deployment.yaml} (76%) diff --git a/charts/mattermost-rtcd/Chart.yaml b/charts/mattermost-rtcd/Chart.yaml index b0008e5a..e01c07dc 100644 --- a/charts/mattermost-rtcd/Chart.yaml +++ b/charts/mattermost-rtcd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: mattermost-rtcd description: A Helm chart for Kubernetes to deploy Mattermost's RTCD type: application -version: 1.1.1 +version: 1.2.0 appVersion: latest keywords: - mattermost diff --git a/charts/mattermost-rtcd/templates/daemonset.yaml b/charts/mattermost-rtcd/templates/deployment.yaml similarity index 76% rename from charts/mattermost-rtcd/templates/daemonset.yaml rename to charts/mattermost-rtcd/templates/deployment.yaml index 66499fae..be9cc88c 100644 --- a/charts/mattermost-rtcd/templates/daemonset.yaml +++ b/charts/mattermost-rtcd/templates/deployment.yaml @@ -1,19 +1,20 @@ apiVersion: apps/v1 -kind: DaemonSet +kind: Deployment metadata: name: {{ include "mattermost-rtcd.fullname" . }} labels: {{- include "mattermost-rtcd.labels" . | nindent 4 }} spec: + replicas: {{ .Values.deployment.replicas }} selector: matchLabels: {{- include "mattermost-rtcd.selectorLabels" . | nindent 6 }} - updateStrategy: - {{- if eq .Values.daemonset.updateStrategy "RollingUpdate" }} + strategy: + {{- if eq .Values.deployment.updateStrategy "RollingUpdate" }} rollingUpdate: - maxUnavailable: {{ .Values.daemonset.maxUnavailable }} + maxUnavailable: {{ .Values.deployment.maxUnavailable }} {{- end }} - type: {{ .Values.daemonset.updateStrategy }} + type: {{ .Values.deployment.updateStrategy }} template: metadata: {{- with .Values.podAnnotations }} @@ -30,7 +31,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet hostNetwork: true serviceAccountName: {{ include "mattermost-rtcd.serviceAccountName" . }} - terminationGracePeriodSeconds: {{ .Values.daemonset.terminationGracePeriod }} + terminationGracePeriodSeconds: {{ .Values.deployment.terminationGracePeriod }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: @@ -39,15 +40,15 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - {{- if .Values.daemonset.environmentVariables }} + {{- if .Values.deployment.environmentVariables }} env: - {{- range $key, $val := .Values.daemonset.environmentVariables }} + {{- range $key, $val := .Values.deployment.environmentVariables }} - name: {{ $key }} value: {{ $val }} {{- end}} {{- end }} - {{- if .Values.daemonset.extraVolumeMounts }} - volumeMounts: {{ toYaml .Values.daemonset.extraVolumeMounts | nindent 12 }} + {{- if .Values.deployment.extraVolumeMounts }} + volumeMounts: {{ toYaml .Values.deployment.extraVolumeMounts | nindent 12 }} {{- end }} ports: - name: api @@ -84,6 +85,6 @@ spec: dnsConfig: {{- toYaml . | nindent 8 }} {{- end }} - {{- if .Values.daemonset.extraVolumes }} - volumes: {{ toYaml .Values.daemonset.extraVolumes | nindent 8 }} + {{- if .Values.deployment.extraVolumes }} + volumes: {{ toYaml .Values.deployment.extraVolumes | nindent 8 }} {{- end }} diff --git a/charts/mattermost-rtcd/values.yaml b/charts/mattermost-rtcd/values.yaml index 4a787d92..6e1d79f3 100644 --- a/charts/mattermost-rtcd/values.yaml +++ b/charts/mattermost-rtcd/values.yaml @@ -33,8 +33,10 @@ securityContext: {} # readOnlyRootFilesystem: true # runAsNonRoot: true # runAsUser: 1000 -daemonset: - environmentVariables: +deployment: + replicas: 2 + + environmentVariables: {} # All env vars that exist for RTCD: https://github.com/mattermost/rtcd/blob/master/docs/env_config.md # RTCD_API_SECURITY_ALLOWSELFREGISTRATION: "\"true\"" # RTCD_LOGGER_CONSOLELEVEL: "\"DEBUG\"" @@ -95,4 +97,23 @@ tolerations: {} dnsConfig: {} -affinity: {} +affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: In + values: + - mattermost-rtcd + topologyKey: topology.kubernetes.io/zone + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 100 + podAffinityTerm: + labelSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: In + values: + - mattermost-rtcd + topologyKey: topology.kubernetes.io/zone From 50394a899ce163868a82edc6fad59e57ec55509f Mon Sep 17 00:00:00 2001 From: Daniel Wierdsma Date: Mon, 24 Apr 2023 10:12:34 -0400 Subject: [PATCH 16/52] Add choice between deployment and daemonset for RTCD (#398) * Add choice between deployment and daemonset * Version bump * Fix lint * fix lint --- charts/mattermost-rtcd/Chart.yaml | 2 +- .../mattermost-rtcd/templates/daemonset.yaml | 91 +++++++++++++++++++ .../mattermost-rtcd/templates/deployment.yaml | 24 ++--- charts/mattermost-rtcd/values.yaml | 7 +- 4 files changed, 111 insertions(+), 13 deletions(-) create mode 100644 charts/mattermost-rtcd/templates/daemonset.yaml diff --git a/charts/mattermost-rtcd/Chart.yaml b/charts/mattermost-rtcd/Chart.yaml index e01c07dc..9948e333 100644 --- a/charts/mattermost-rtcd/Chart.yaml +++ b/charts/mattermost-rtcd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: mattermost-rtcd description: A Helm chart for Kubernetes to deploy Mattermost's RTCD type: application -version: 1.2.0 +version: 1.2.1 appVersion: latest keywords: - mattermost diff --git a/charts/mattermost-rtcd/templates/daemonset.yaml b/charts/mattermost-rtcd/templates/daemonset.yaml new file mode 100644 index 00000000..9e544110 --- /dev/null +++ b/charts/mattermost-rtcd/templates/daemonset.yaml @@ -0,0 +1,91 @@ +{{- if eq .Values.deploymentType "daemonset" -}} +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: {{ include "mattermost-rtcd.fullname" . }} + labels: + {{- include "mattermost-rtcd.labels" . | nindent 4 }} +spec: + selector: + matchLabels: + {{- include "mattermost-rtcd.selectorLabels" . | nindent 6 }} + updateStrategy: + {{- if eq .Values.configuration.updateStrategy "RollingUpdate" }} + rollingUpdate: + maxUnavailable: {{ .Values.configuration.maxUnavailable }} + {{- end }} + type: {{ .Values.configuration.updateStrategy }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "mattermost-rtcd.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + dnsPolicy: ClusterFirstWithHostNet + hostNetwork: true + serviceAccountName: {{ include "mattermost-rtcd.serviceAccountName" . }} + terminationGracePeriodSeconds: {{ .Values.configuration.terminationGracePeriod }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.configuration.environmentVariables }} + env: + {{- range $key, $val := .Values.configuration.environmentVariables }} + - name: {{ $key }} + value: {{ $val }} + {{- end}} + {{- end }} + {{- if .Values.configuration.extraVolumeMounts }} + volumeMounts: {{ toYaml .Values.configuration.extraVolumeMounts | nindent 12 }} + {{- end }} + ports: + - name: api + containerPort: {{ .Values.service.APIport }} + hostPort: {{ .Values.service.APIport }} + protocol: TCP + - name: rtc + containerPort: {{ .Values.service.RTCport }} + hostPort: {{ .Values.service.RTCport }} + protocol: UDP + livenessProbe: + httpGet: + path: /version + port: api + readinessProbe: + httpGet: + path: /version + port: api + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.dnsConfig }} + dnsConfig: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- if .Values.configuration.extraVolumes }} + volumes: {{ toYaml .Values.configuration.extraVolumes | nindent 8 }} + {{- end }} +{{- end }} diff --git a/charts/mattermost-rtcd/templates/deployment.yaml b/charts/mattermost-rtcd/templates/deployment.yaml index be9cc88c..6cae5ea9 100644 --- a/charts/mattermost-rtcd/templates/deployment.yaml +++ b/charts/mattermost-rtcd/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{- if eq .Values.deploymentType "deployment" -}} apiVersion: apps/v1 kind: Deployment metadata: @@ -5,16 +6,16 @@ metadata: labels: {{- include "mattermost-rtcd.labels" . | nindent 4 }} spec: - replicas: {{ .Values.deployment.replicas }} + replicas: {{ .Values.configuration.replicas }} selector: matchLabels: {{- include "mattermost-rtcd.selectorLabels" . | nindent 6 }} strategy: - {{- if eq .Values.deployment.updateStrategy "RollingUpdate" }} + {{- if eq .Values.configuration.updateStrategy "RollingUpdate" }} rollingUpdate: - maxUnavailable: {{ .Values.deployment.maxUnavailable }} + maxUnavailable: {{ .Values.configuration.maxUnavailable }} {{- end }} - type: {{ .Values.deployment.updateStrategy }} + type: {{ .Values.configuration.updateStrategy }} template: metadata: {{- with .Values.podAnnotations }} @@ -31,7 +32,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet hostNetwork: true serviceAccountName: {{ include "mattermost-rtcd.serviceAccountName" . }} - terminationGracePeriodSeconds: {{ .Values.deployment.terminationGracePeriod }} + terminationGracePeriodSeconds: {{ .Values.configuration.terminationGracePeriod }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: @@ -40,15 +41,15 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - {{- if .Values.deployment.environmentVariables }} + {{- if .Values.configuration.environmentVariables }} env: - {{- range $key, $val := .Values.deployment.environmentVariables }} + {{- range $key, $val := .Values.configuration.environmentVariables }} - name: {{ $key }} value: {{ $val }} {{- end}} {{- end }} - {{- if .Values.deployment.extraVolumeMounts }} - volumeMounts: {{ toYaml .Values.deployment.extraVolumeMounts | nindent 12 }} + {{- if .Values.configuration.extraVolumeMounts }} + volumeMounts: {{ toYaml .Values.configuration.extraVolumeMounts | nindent 12 }} {{- end }} ports: - name: api @@ -85,6 +86,7 @@ spec: dnsConfig: {{- toYaml . | nindent 8 }} {{- end }} - {{- if .Values.deployment.extraVolumes }} - volumes: {{ toYaml .Values.deployment.extraVolumes | nindent 8 }} + {{- if .Values.configuration.extraVolumes }} + volumes: {{ toYaml .Values.configuration.extraVolumes | nindent 8 }} {{- end }} +{{- end }} diff --git a/charts/mattermost-rtcd/values.yaml b/charts/mattermost-rtcd/values.yaml index 6e1d79f3..f1a4a8a8 100644 --- a/charts/mattermost-rtcd/values.yaml +++ b/charts/mattermost-rtcd/values.yaml @@ -33,7 +33,12 @@ securityContext: {} # readOnlyRootFilesystem: true # runAsNonRoot: true # runAsUser: 1000 -deployment: + +# Which deployment method you'd like to use "deployment" or "daemonset" +deploymentType: "deployment" + +configuration: + # Only needed if deploymentType is set to "deployment" replicas: 2 environmentVariables: {} From b4e7c24707eac5738b69d39cf53a7ef127a05ef0 Mon Sep 17 00:00:00 2001 From: Stylianos Rigas Date: Tue, 25 Apr 2023 16:28:49 +0300 Subject: [PATCH 17/52] CLD-5513 Add support for Apple APNS auth keys (#399) Co-authored-by: Stylianos Rigas --- charts/mattermost-push-proxy/Chart.yaml | 6 ++--- .../templates/deployment.yaml | 19 ++++++++++--- .../templates/push-config.tpl | 27 +++++++++++++++++++ .../templates/secrets.yaml | 7 ++--- charts/mattermost-push-proxy/values.yaml | 8 +++++- 5 files changed, 57 insertions(+), 10 deletions(-) diff --git a/charts/mattermost-push-proxy/Chart.yaml b/charts/mattermost-push-proxy/Chart.yaml index f5bf716e..42c785bd 100644 --- a/charts/mattermost-push-proxy/Chart.yaml +++ b/charts/mattermost-push-proxy/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Push Proxy server name: mattermost-push-proxy type: application -version: 0.7.0 -appVersion: 5.22.5 +version: 0.8.0 +appVersion: 5.24.0 keywords: - mattermost - communication @@ -23,5 +23,5 @@ sources: annotations: artifacthub.io/images: | - name: mattermost-push-proxy - image: mattermost/mattermost-push-proxy:5.22.5 + image: mattermost/mattermost-push-proxy:5.24.0 artifacthub.io/license: Apache-2.0 diff --git a/charts/mattermost-push-proxy/templates/deployment.yaml b/charts/mattermost-push-proxy/templates/deployment.yaml index 579832b3..29df6b7a 100644 --- a/charts/mattermost-push-proxy/templates/deployment.yaml +++ b/charts/mattermost-push-proxy/templates/deployment.yaml @@ -41,6 +41,11 @@ spec: - mountPath: /mattermost-push-proxy/config/config.json name: push-config-template subPath: push-config.json + {{- if .Values.applePushSettings.authKey }} + - mountPath: {{ .Values.applePushSettings.authKeyFile }} + name: apple-push-auth-key + subPath: {{ .Values.applePushSettings.authKeyFileName }} + {{- end }} {{- if .Values.applePushSettings.apple.privateCert }} - mountPath: /certs/apple-push-cert.pem name: apple-push-cert @@ -77,12 +82,20 @@ spec: items: - key: push-config.json path: push-config.json + {{- if .Values.applePushSettings.authKey }} + - name: apple-push-auth-key + secret: + secretName: {{ include "mattermost-push-proxy.fullname" . }}-apple-certs + items: + - key: apple_auth_key + path: {{ .Values.applePushSettings.authKeyFileName }} + {{- end }} {{- if .Values.applePushSettings.apple.privateCert }} - name: apple-push-cert secret: secretName: {{ include "mattermost-push-proxy.fullname" . }}-apple-certs items: - - key: apple + - key: apple_cert path: apple-push-cert.pem {{- end }} {{- if .Values.applePushSettings.apple_rn.privateCert }} @@ -90,7 +103,7 @@ spec: secret: secretName: {{ include "mattermost-push-proxy.fullname" . }}-apple-certs items: - - key: apple_rn + - key: apple_rn_cert path: apple-rn-push-cert.pem {{- end }} {{- if .Values.applePushSettings.apple_rnbeta.privateCert }} @@ -98,6 +111,6 @@ spec: secret: secretName: {{ include "mattermost-push-proxy.fullname" . }}-apple-certs items: - - key: apple_rnbeta + - key: apple_rnbeta_cert path: apple-rnbeta-push-cert.pem {{- end }} diff --git a/charts/mattermost-push-proxy/templates/push-config.tpl b/charts/mattermost-push-proxy/templates/push-config.tpl index 803c8a17..2997ed55 100644 --- a/charts/mattermost-push-proxy/templates/push-config.tpl +++ b/charts/mattermost-push-proxy/templates/push-config.tpl @@ -14,6 +14,15 @@ {{- else }} "ApplePushCertPrivate": "/certs/apple-push-cert.pem", {{- end }} + {{- if eq .Values.applePushSettings.authKey "" }} + "AppleAuthKeyFile":"", + "AppleAuthKeyID":"", + "AppleTeamID":"", + {{- else }} + "AppleAuthKeyFile": "{{ .Values.applePushSettings.authKeyFile }}", + "AppleAuthKeyID": "{{ .Values.applePushSettings.authKeyID }}", + "AppleTeamID": "{{ .Values.applePushSettings.teamID }}", + {{- end }} "ApplePushCertPassword":"{{ .Values.applePushSettings.apple.privateCertPassword }}", "ApplePushTopic":"{{ .Values.applePushSettings.apple.pushTopic }}" }, @@ -24,6 +33,15 @@ "ApplePushCertPrivate":"", {{- else }} "ApplePushCertPrivate": "/certs/apple-rn-push-cert.pem", + {{- end }} + {{- if eq .Values.applePushSettings.authKey "" }} + "AppleAuthKeyFile":"", + "AppleAuthKeyID":"", + "AppleTeamID":"", + {{- else }} + "AppleAuthKeyFile": "{{ .Values.applePushSettings.authKeyFile }}", + "AppleAuthKeyID": "{{ .Values.applePushSettings.authKeyID }}", + "AppleTeamID": "{{ .Values.applePushSettings.teamID }}", {{- end }} "ApplePushCertPassword":"{{ .Values.applePushSettings.apple_rn.privateCertPassword }}", "ApplePushTopic":"{{ .Values.applePushSettings.apple_rn.pushTopic }}" @@ -35,6 +53,15 @@ "ApplePushCertPrivate":"", {{- else }} "ApplePushCertPrivate": "/certs/apple-rnbeta-push-cert.pem", + {{- end }} + {{- if eq .Values.applePushSettings.authKey "" }} + "AppleAuthKeyFile":"", + "AppleAuthKeyID":"", + "AppleTeamID":"", + {{- else }} + "AppleAuthKeyFile": "{{ .Values.applePushSettings.authKeyFile }}", + "AppleAuthKeyID": "{{ .Values.applePushSettings.authKeyID }}", + "AppleTeamID": "{{ .Values.applePushSettings.teamID }}", {{- end }} "ApplePushCertPassword":"{{ .Values.applePushSettings.apple_rnbeta.privateCertPassword }}", "ApplePushTopic":"{{ .Values.applePushSettings.apple_rnbeta.pushTopic }}" diff --git a/charts/mattermost-push-proxy/templates/secrets.yaml b/charts/mattermost-push-proxy/templates/secrets.yaml index c2f084af..e1ac46e4 100644 --- a/charts/mattermost-push-proxy/templates/secrets.yaml +++ b/charts/mattermost-push-proxy/templates/secrets.yaml @@ -8,6 +8,7 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "mattermost-push-proxy.chart" . }} data: - apple: {{ default "" .Values.applePushSettings.apple.privateCert | b64enc | quote }} - apple_rn: {{ default "" .Values.applePushSettings.apple_rn.privateCert | b64enc | quote }} - apple_rnbeta: {{ default "" .Values.applePushSettings.apple_rnbeta.privateCert | b64enc | quote }} + apple_auth_key: {{ default "" .Values.applePushSettings.authKey | b64enc | quote }} + apple_cert: {{ default "" .Values.applePushSettings.apple.privateCert | b64enc | quote }} + apple_rn_cert: {{ default "" .Values.applePushSettings.apple_rn.privateCert | b64enc | quote }} + apple_rnbeta_cert: {{ default "" .Values.applePushSettings.apple_rnbeta.privateCert | b64enc | quote }} diff --git a/charts/mattermost-push-proxy/values.yaml b/charts/mattermost-push-proxy/values.yaml index 50b415d0..fa51fe97 100644 --- a/charts/mattermost-push-proxy/values.yaml +++ b/charts/mattermost-push-proxy/values.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: repository: mattermost/mattermost-push-proxy - tag: 5.22.5 + tag: 5.24.0 pullPolicy: Always resources: {} @@ -46,7 +46,13 @@ ingress: # hosts: # - push-proxy.example.local +# You cannot specify both the authKey and privateCert methods. applePushSettings: + authKey: "" + authKeyFile: "/mattermost-push-proxy/config/AuthKey_1234.p8" + authKeyFileName: "AuthKey_1234.p8" + authKeyID: "" + teamID: "" apple: privateCert: "" privateCertPassword: "" From f4fbf302f1c995e42b72b8de1ed859c8fdf7aec0 Mon Sep 17 00:00:00 2001 From: mattermod Date: Wed, 17 May 2023 17:44:32 +0000 Subject: [PATCH 18/52] Bump mattermost-enterprise-edition App Version to 7.10.1 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 32b10f54..b1ae6c90 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.24 -appVersion: 7.10.0 +version: 2.6.25 +appVersion: 7.10.1 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index 51ab6d87..c2db3058 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 7.10.0@sha256:6ac910121de030d6e8c619beb111075a9b4b9781d75f538b59aca07b00739d48 + tag: 7.10.1@sha256:f1688247b9c82802195a81434a24fd8119876761301ca599498d8a0c3bfb8283 pullPolicy: IfNotPresent strategy: From 21de455eb6d61b8563c0fd4f87aaa09a89947d3c Mon Sep 17 00:00:00 2001 From: mattermod Date: Wed, 17 May 2023 17:44:34 +0000 Subject: [PATCH 19/52] Bump mattermost-team-edition App Version to 7.10.1 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index f8a21e30..d004064c 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.24 -appVersion: 7.10.0 +version: 6.6.25 +appVersion: 7.10.1 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index a9ccf9a7..2bf4cfd5 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 7.10.0@sha256:ae38cc8231e280ad79ec45588663cde66b7287b1c296b162b1d0922fe607a7ad + tag: 7.10.1@sha256:4e202ca46e9083371ece175b2a778fff8b3206f68f37b329c8caf8ebbd487786 imagePullPolicy: IfNotPresent initContainerImage: From c2521150581552c34a60496e826098612fa50fb8 Mon Sep 17 00:00:00 2001 From: mattermod Date: Fri, 19 May 2023 07:49:59 +0000 Subject: [PATCH 20/52] Bump mattermost-enterprise-edition App Version to 7.10.2 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index b1ae6c90..13aa5fc3 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.25 -appVersion: 7.10.1 +version: 2.6.26 +appVersion: 7.10.2 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index c2db3058..9072978b 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 7.10.1@sha256:f1688247b9c82802195a81434a24fd8119876761301ca599498d8a0c3bfb8283 + tag: 7.10.2@sha256:8f44dc885f8fb8f8ac70dcbcd1c14d93ecd1e0cf902f7e577c0ffde2f0dc5483 pullPolicy: IfNotPresent strategy: From a42a7fc1caf49c4760377906f87735989f5d2529 Mon Sep 17 00:00:00 2001 From: mattermod Date: Fri, 19 May 2023 07:50:00 +0000 Subject: [PATCH 21/52] Bump mattermost-team-edition App Version to 7.10.2 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index d004064c..bb8ad30e 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.25 -appVersion: 7.10.1 +version: 6.6.26 +appVersion: 7.10.2 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 2bf4cfd5..3bddc1c8 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 7.10.1@sha256:4e202ca46e9083371ece175b2a778fff8b3206f68f37b329c8caf8ebbd487786 + tag: 7.10.2@sha256:cfa8fc843912bf66f3085571632bd4b34db7ef4764bed6fa0652aa231d0668eb imagePullPolicy: IfNotPresent initContainerImage: From bdadb8f7c5d61ae3c4f73cc6d8ee9b5d695d14c1 Mon Sep 17 00:00:00 2001 From: Gabe Jackson <3694686+gabrieljackson@users.noreply.github.com> Date: Tue, 6 Jun 2023 13:28:56 -0400 Subject: [PATCH 22/52] Bump Operator and Mattermost default versions (#403) --- charts/mattermost-operator/Chart.yaml | 4 ++-- charts/mattermost-operator/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/mattermost-operator/Chart.yaml b/charts/mattermost-operator/Chart.yaml index 7668392b..899c2ee1 100644 --- a/charts/mattermost-operator/Chart.yaml +++ b/charts/mattermost-operator/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: mattermost-operator description: A Helm chart for Mattermost Operator type: application -version: 0.3.4 -appVersion: 1.20.0 +version: 0.3.5 +appVersion: 1.20.1 keywords: - operator - mattermost diff --git a/charts/mattermost-operator/values.yaml b/charts/mattermost-operator/values.yaml index 4d7a42e3..4fd1c38a 100644 --- a/charts/mattermost-operator/values.yaml +++ b/charts/mattermost-operator/values.yaml @@ -10,7 +10,7 @@ mattermostCR: enabled: false name: mattermost-example spec: - version: 7.9.1 + version: 7.10.2 replicas: 1 ingress: enabled: true @@ -47,7 +47,7 @@ mattermostOperator: requeuOnLimitDelay: 20s image: repository: mattermost/mattermost-operator - tag: v1.20.0 + tag: v1.20.1 pullPolicy: IfNotPresent args: - --enable-leader-election From 7f028a341c2dd0df47b2c7648ecf2bc1e5451eb2 Mon Sep 17 00:00:00 2001 From: Spiros Economakis <812075+spirosoik@users.noreply.github.com> Date: Mon, 19 Jun 2023 16:52:48 +0300 Subject: [PATCH 23/52] Fix broken tests github job (#404) The current PRs are failing because of an issue with dependencies of chart-testing and helm repos. Co-authored-by: mattermod --- Makefile | 2 +- charts/mattermost-team-edition/Chart.yaml | 18 +++++++++--------- tests/ct.yaml | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 12d8ccde..3fc4a2d1 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CLUSTER_NAME ?= mattermost-helm-test DOCKER_IMAGE_SHELLCHECK ?= koalaman/shellcheck:v0.8.0@sha256:4c4427336d2b4bdb054a1e97396fa2e9ca0c329a1f43f831b99bcaae4ac24fcd # Official image of chart-testing[https://github.com/helm/chart-testing]. # Contains chart-testing cli, helm and kubectl. -DOCKER_IMAGE_CT ?= quay.io/helmpack/chart-testing:v3.7.0@sha256:2f87e56a0cebc6d9bb78d51cb6adac97858afb0887cac4d65f7f8c6a16054568 +DOCKER_IMAGE_CT ?= quay.io/helmpack/chart-testing:v3.7.1@sha256:ef453de0be68d5ded26f3b3ea0c5431b396c8c48f89e2a07be7b19c4c9a68b31 # Official image of chart-releaser[https://github.com/helm/chart-releaser]. # Contains chart-releaser cli. diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index bb8ad30e..96bdd8a4 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -5,16 +5,16 @@ name: mattermost-team-edition version: 6.6.26 appVersion: 7.10.2 keywords: -- mattermost -- communication -- team collaboration + - mattermost + - communication + - team collaboration home: https://mattermost.com icon: http://www.mattermost.org/wp-content/uploads/2016/04/icon.png sources: -- https://github.com/mattermost/mattermost-server -- https://github.com/mattermost/mattermost-helm + - https://github.com/mattermost/mattermost-server + - https://github.com/mattermost/mattermost-helm dependencies: -- name: mysql - version: 1.6.4 - repository: https://charts.helm.sh/stable - condition: mysql.enabled + - name: mysql + version: 1.6.4 + repository: https://charts.helm.sh/stable + condition: mysql.enabled diff --git a/tests/ct.yaml b/tests/ct.yaml index a0e758f4..8a3ae483 100644 --- a/tests/ct.yaml +++ b/tests/ct.yaml @@ -1,8 +1,8 @@ remote: origin target-branch: master -chart-repos: - - incubator=https://charts.helm.sh/incubator - - stable=https://charts.helm.sh/stable +chart-dirs: + - stable + - incubator helm-extra-args: --timeout 5m0s helm-repo-extra-args: - incubator=--repository-config /tmp/helm/repo.yaml --repository-cache /tmp/helm/repository From 5173bd7290beb2498ffe309fe6c41ad43b642334 Mon Sep 17 00:00:00 2001 From: Divyam Date: Mon, 19 Jun 2023 20:31:25 +0530 Subject: [PATCH 24/52] Add support for plugins with their own webservers (ex: matternelle) (#396) This pull request adds support for exposing extra ports which can be used by any plugins which require an open port . The new values.yaml file includes an extraPorts key which allows users to define additional ports to expose for the backend service. Impact: This change will enable users to easily configure additional ports for the backend service, making it possible to use plugins that require an open port. --------- Co-authored-by: mattermod Co-authored-by: Daniel Wierdsma Co-authored-by: Stylianos Rigas Co-authored-by: Stylianos Rigas Co-authored-by: Gabe Jackson <3694686+gabrieljackson@users.noreply.github.com> Co-authored-by: Mattermost Build --- charts/mattermost-team-edition/Chart.yaml | 2 +- charts/mattermost-team-edition/README.md | 10 ++++++++++ .../mattermost-team-edition/templates/deployment.yaml | 5 +++++ charts/mattermost-team-edition/templates/service.yaml | 6 ++++++ charts/mattermost-team-edition/values.yaml | 6 ++++++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index 96bdd8a4..7c761a82 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.26 +version: 6.6.27 appVersion: 7.10.2 keywords: - mattermost diff --git a/charts/mattermost-team-edition/README.md b/charts/mattermost-team-edition/README.md index 44a51e3f..63577084 100644 --- a/charts/mattermost-team-edition/README.md +++ b/charts/mattermost-team-edition/README.md @@ -220,6 +220,16 @@ externalDB: externalConnectionString: ":@tcp(:3306)/?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s" ``` +#### Expose extra ports +To use plugins that require extra ports to be exposed, you can use the following config + +```yaml +extraPorts: + - name: plugin-name + port: 8585 + protocol: TCP +``` + ### Local development For local testing use [minikube](https://github.com/kubernetes/minikube) diff --git a/charts/mattermost-team-edition/templates/deployment.yaml b/charts/mattermost-team-edition/templates/deployment.yaml index 6accbbdc..c02b7a4d 100644 --- a/charts/mattermost-team-edition/templates/deployment.yaml +++ b/charts/mattermost-team-edition/templates/deployment.yaml @@ -78,6 +78,11 @@ spec: - name: http containerPort: {{ .Values.service.internalPort }} protocol: TCP + {{- range .Values.extraPorts }} + - name: {{ .name }} + containerPort: {{ .port }} + protocol: {{ .protocol }} + {{- end }} livenessProbe: initialDelaySeconds: 90 timeoutSeconds: 5 diff --git a/charts/mattermost-team-edition/templates/service.yaml b/charts/mattermost-team-edition/templates/service.yaml index 001ea39b..6926ddea 100644 --- a/charts/mattermost-team-edition/templates/service.yaml +++ b/charts/mattermost-team-edition/templates/service.yaml @@ -22,6 +22,12 @@ spec: targetPort: http protocol: TCP name: {{ include "mattermost-team-edition.name" . }} + {{- range .Values.extraPorts }} + - name: {{ .name }} + port: {{ .port }} + targetPort: {{ .port }} + protocol: {{ .protocol }} + {{- end }} {{- if .Values.service.loadBalancerIP }} loadBalancerIP: {{ .Values.service.loadBalancerIP }} {{- end }} diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 3bddc1c8..357305e6 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -188,6 +188,12 @@ extraVolumeMounts: [] # mountPath: /host/var/log # readOnly: true +# Add additional ports to be exposed in the mattermost container (for plugins that start their own webservers) +extraPorts: [] + # - name: matternelle + # port: 8585 + # protocol: TCP + ## Node selector ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector nodeSelector: {} From e370f73a09a2eea70f1429ebb064b7a52f2d7e52 Mon Sep 17 00:00:00 2001 From: Pablo Suazo <102029997+pablo-suazo@users.noreply.github.com> Date: Tue, 20 Jun 2023 08:39:43 +0200 Subject: [PATCH 25/52] Fix for supporting ingressClassName (#389) Adds ingressClassName support to mattermost-team chart Fixes issue https://github.com/mattermost/mattermost-helm/issues/288 --------- Co-authored-by: Mattermost Build --- charts/mattermost-team-edition/Chart.yaml | 2 +- charts/mattermost-team-edition/templates/ingress.yaml | 3 +++ charts/mattermost-team-edition/values.yaml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index 7c761a82..31d9dbeb 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.27 +version: 6.6.28 appVersion: 7.10.2 keywords: - mattermost diff --git a/charts/mattermost-team-edition/templates/ingress.yaml b/charts/mattermost-team-edition/templates/ingress.yaml index 896e2f1e..3621a33e 100644 --- a/charts/mattermost-team-edition/templates/ingress.yaml +++ b/charts/mattermost-team-edition/templates/ingress.yaml @@ -22,6 +22,9 @@ metadata: {{- . | toYaml | nindent 4 }} {{- end }} spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} rules: {{ range $host := $ingress.hosts }} - host: {{ $host | quote }} diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 357305e6..3f584823 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -56,6 +56,7 @@ service: ingress: enabled: false + className: "" path: / annotations: {} # kubernetes.io/ingress.class: nginx From 8a95d68bba60a502f88ecdf1e1a0f0d2835e6ce0 Mon Sep 17 00:00:00 2001 From: Felipe Martin <812088+fmartingr@users.noreply.github.com> Date: Tue, 20 Jun 2023 09:20:29 +0200 Subject: [PATCH 26/52] docs: updates to link and enterprise fixes (#405) Co-authored-by: Mattermost Build --- .../mattermost-enterprise-edition/README.md | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/charts/mattermost-enterprise-edition/README.md b/charts/mattermost-enterprise-edition/README.md index fc6b1c58..741baab5 100644 --- a/charts/mattermost-enterprise-edition/README.md +++ b/charts/mattermost-enterprise-edition/README.md @@ -36,13 +36,13 @@ To expose the application outside of your network, configure an ingress if your We suggest using [nginx-ingress](https://github.com/kubernetes/ingress-nginx), which we use internally at Mattermost. -To install nginx-ingress in your Kubernetes cluster, follow [the official installation documentation](https://kubernetes.github.io/ingress-nginx/deploy/). You may also use the [helm charts](https://github.com/helm/charts/tree/master/stable/nginx-ingress) directly. +To install nginx-ingress in your Kubernetes cluster, follow [the official installation documentation](https://kubernetes.github.io/ingress-nginx/deploy/). You may also use the [helm charts](https://github.com/kubernetes/ingress-nginx/tree/main/charts/ingress-nginx) directly. To get the nginx cache to work, adjust the ConfigMap and Deployment from the above instructions. [See the ingress section of our blog post](https://mattermost.com/blog/mattermost-kubernetes/#ingress) to see how we did it for an AWS installation. ## 1.4 Certificate Manager -If you do not want to manually add SSL/TLS certificates, install [cert-manager](https://github.com/jetstack/cert-manager). You can follow [this documentation](https://cert-manager.io/docs/) or install the [helm charts](https://github.com/helm/charts/tree/master/stable/cert-manager). +If you do not want to manually add SSL/TLS certificates, install [cert-manager](https://github.com/jetstack/cert-manager). You can follow [this documentation](https://cert-manager.io/docs/) or install the [helm charts](https://artifacthub.io/packages/helm/cert-manager/cert-manager). To run with HTTPS you will need to add a Kubernetes secret for your SSL/TLS certificate, whether you use cert-manager or not. @@ -57,7 +57,7 @@ To learn more about the Mattermost configuration file, see https://docs.mattermo At minimum there are two settings you must update: * `global.siteURL` - set this to the URL your users will use to access Mattermost, e.g. `https://mattermost.example.com` -* `global.mattermostLicense` - set this to the contents of your license file or provide an existing secret. `global.existingLicenseSecret.name` `global.existingLicenseSecret.key` +* `global.mattermostLicense` - set this to the contents of your license file or provide an existing secret. `global.existingLicenseSecret.name` `global.existingLicenseSecret.key` Without these two settings, Mattermost will not run correctly. @@ -65,7 +65,7 @@ Without these two settings, Mattermost will not run correctly. To set the Mattermost application version, update: -* `mattermostApp.image.tag` - set this to the Mattermost server version you wish to install (e.g. `5.12.0`) +* `mattermostApp.image.tag` - set this to the Mattermost server version you wish to install (e.g. `7.10.2`) ## 2.3 Ingress @@ -82,7 +82,7 @@ where `mattermost.example.com` is your domain name and matches `global.siteURL`. ### 2.3.1 HTTPS -To run with HTTPS, add an SSL/TLS certificate as a secret to your Kubernetes cluster, either manually or [using cert-manager](#certificate-manager). +To run with HTTPS, add an SSL/TLS certificate as a secret to your Kubernetes cluster, either manually or [using cert-manager](#14-certificate-manager). Set the following under `mattermostApp` to enable HTTPS: @@ -147,19 +147,33 @@ If you would like to use an external database not managed by the Mattermost Helm By default push notifications are enabled using [HPNS](https://docs.mattermost.com/mobile/mobile-hpns.html). If you prefer to run your own push proxy, do the following: -* Set `global.features.notifications.useHPNS` to `false` -* Install the push proxy Helm chart, [see instructions here](#install-push-proxy) +* Set `global.features.notifications.push.useHPNS` to `false` +* Install the push proxy Helm chart, [see instructions here](#251-push-proxy) + +## 2.5.1 Push Proxy + +You can launch the Mattermost push proxy chart with: +```bash +$ helm repo add mattermost https://helm.mattermost.com +$ helm install mattermost/mattermost-push-proxy +``` + +To list options for mattermost-push-proxy: + +```bash +$ helm inspect values mattermost/mattermost-push-proxy +``` ## 2.6 Storage -We use [stable/minio](https://github.com/helm/charts/tree/master/stable/minio) for file storage. +We use [stable/minio](https://github.com/minio/operator/tree/master/helm/operator) for file storage. Minio is configured by default, but we recommend updating the following settings: * `minio.accessKey` * `minio.secretKey` -See the [stable/minio configuration settings](https://github.com/helm/charts/tree/master/stable/minio#configuration) for more options you can configure. +See the [stable/minio configuration settings](https://min.io/docs/minio/kubernetes/upstream/index.html) for more options you can configure. # 3. Install @@ -167,13 +181,13 @@ After adding the Mattermost repo (see section 1.2) you can install a version of ```bash $ helm repo add mattermost https://helm.mattermost.com -$ helm install mattermost/mattermost-enterprise-edition --version +$ helm install mattermost/mattermost-enterprise-edition --version ``` For example: ```bash $ helm repo add mattermost https://helm.mattermost.com -$ helm install mattermost/mattermost-enterprise-edition --version v0.8.2 +$ helm install mattermost/mattermost-enterprise-edition --version v0.8.2 ``` If no Helm Chart version is specified the latest version will be installed. @@ -192,20 +206,6 @@ $ helm upgrade -f config.yaml mattermost/mattermost-enterpri If you are done with your deployment and want to delete it, use `helm delete `. If you don't know the name of your release, use `helm ls` to find it. -## 3.2 Install Push Proxy - -You can launch the Mattermost push proxy chart with: -```bash -$ helm repo add mattermost https://helm.mattermost.com -$ helm install mattermost/mattermost-push-proxy -``` - -To list options for mattermost-push-proxy: - -```bash -$ helm inspect values mattermost/mattermost-push-proxy -``` - # 4. Upgrading to Mattermost Chart Version 1.0.0 This chart version uses the configuration in the database and environment variables for non-changing configuration. From f8cb932e89309943f1db04f56d220c5c385693b6 Mon Sep 17 00:00:00 2001 From: mattermod Date: Wed, 21 Jun 2023 13:27:09 +0000 Subject: [PATCH 27/52] Bump mattermost-enterprise-edition App Version to 7.10.3 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 13aa5fc3..c96eea30 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.26 -appVersion: 7.10.2 +version: 2.6.27 +appVersion: 7.10.3 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index 9072978b..3fad7214 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 7.10.2@sha256:8f44dc885f8fb8f8ac70dcbcd1c14d93ecd1e0cf902f7e577c0ffde2f0dc5483 + tag: 7.10.3@sha256:21d5eedddbbe99879dc0fc10022b80efc7bcaf0665bd59a5cce7963e34344f2b pullPolicy: IfNotPresent strategy: From 05205f7ae906138dc21432f3c0da23fbe4f8fdfd Mon Sep 17 00:00:00 2001 From: mattermod Date: Wed, 21 Jun 2023 13:27:11 +0000 Subject: [PATCH 28/52] Bump mattermost-team-edition App Version to 7.10.3 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index 31d9dbeb..4e193b53 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.28 -appVersion: 7.10.2 +version: 6.6.29 +appVersion: 7.10.3 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 3f584823..47c4dcef 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 7.10.2@sha256:cfa8fc843912bf66f3085571632bd4b34db7ef4764bed6fa0652aa231d0668eb + tag: 7.10.3@sha256:67d3248b051f00068920ec52d64299bed00eceb9f28babe067da62eeed6b1291 imagePullPolicy: IfNotPresent initContainerImage: From 3eae1432630302e451d93963ae0f22323bd783fe Mon Sep 17 00:00:00 2001 From: Stavros Foteinopoulos Date: Tue, 11 Jul 2023 17:17:24 +0300 Subject: [PATCH 29/52] Update configuration options in RTCD probes (#408) * Update configuration options in probes Signed-off-by: Stavros Foteinopoulos * bump RTCD version Signed-off-by: Stavros Foteinopoulos --------- Signed-off-by: Stavros Foteinopoulos --- charts/mattermost-rtcd/Chart.yaml | 2 +- charts/mattermost-rtcd/templates/daemonset.yaml | 9 +++++++++ charts/mattermost-rtcd/templates/deployment.yaml | 8 ++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/charts/mattermost-rtcd/Chart.yaml b/charts/mattermost-rtcd/Chart.yaml index 9948e333..6fc47c7b 100644 --- a/charts/mattermost-rtcd/Chart.yaml +++ b/charts/mattermost-rtcd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: mattermost-rtcd description: A Helm chart for Kubernetes to deploy Mattermost's RTCD type: application -version: 1.2.1 +version: 1.3.0 appVersion: latest keywords: - mattermost diff --git a/charts/mattermost-rtcd/templates/daemonset.yaml b/charts/mattermost-rtcd/templates/daemonset.yaml index 9e544110..caf2370b 100644 --- a/charts/mattermost-rtcd/templates/daemonset.yaml +++ b/charts/mattermost-rtcd/templates/daemonset.yaml @@ -63,10 +63,19 @@ spec: httpGet: path: /version port: api + initialDelaySeconds: {{ .Values.configuration.livenessProbeInitialDelaySeconds | default 30 }} + failureThreshold: {{ .Values.configuration.livenessProbeFailureThreshold | default 3 }} + periodSeconds: {{ .Values.configuration.livenessProbePeriodSeconds | default 10 }} + timeoutSeconds: {{ .Values.configuration.livenessProbeTimeoutSeconds | default 5 }} + readinessProbe: httpGet: path: /version port: api + initialDelaySeconds: {{ .Values.configuration.readinessProbeInitialDelaySeconds | default 30 }} + failureThreshold: {{ .Values.configuration.readinessProbeFailureThreshold | default 3 }} + periodSeconds: {{ .Values.configuration.readinessProbePeriodSeconds | default 10 }} + timeoutSeconds: {{ .Values.configuration.readinessProbeTimeoutSeconds | default 5 }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/charts/mattermost-rtcd/templates/deployment.yaml b/charts/mattermost-rtcd/templates/deployment.yaml index 6cae5ea9..25ce3dba 100644 --- a/charts/mattermost-rtcd/templates/deployment.yaml +++ b/charts/mattermost-rtcd/templates/deployment.yaml @@ -64,10 +64,18 @@ spec: httpGet: path: /version port: api + initialDelaySeconds: {{ .Values.configuration.livenessProbeInitialDelaySeconds | default 30 }} + failureThreshold: {{ .Values.configuration.livenessProbeFailureThreshold | default 3 }} + periodSeconds: {{ .Values.configuration.livenessProbePeriodSeconds | default 10 }} + timeoutSeconds: {{ .Values.configuration.livenessProbeTimeoutSeconds | default 5 }} readinessProbe: httpGet: path: /version port: api + initialDelaySeconds: {{ .Values.configuration.readinessProbeInitialDelaySeconds | default 30 }} + failureThreshold: {{ .Values.configuration.readinessProbeFailureThreshold | default 3 }} + periodSeconds: {{ .Values.configuration.readinessProbePeriodSeconds | default 10 }} + timeoutSeconds: {{ .Values.configuration.readinessProbeTimeoutSeconds | default 5 }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} From a16581eb82d244dcade30538a3cb76c118c80d41 Mon Sep 17 00:00:00 2001 From: mattermod Date: Thu, 13 Jul 2023 10:19:34 +0000 Subject: [PATCH 30/52] Bump mattermost-enterprise-edition App Version to 7.10.4 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index c96eea30..e2c06339 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.27 -appVersion: 7.10.3 +version: 2.6.28 +appVersion: 7.10.4 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index 3fad7214..ed0fb153 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 7.10.3@sha256:21d5eedddbbe99879dc0fc10022b80efc7bcaf0665bd59a5cce7963e34344f2b + tag: 7.10.4@sha256:3fab0067b0690b62815aa8d1af62f3f5fa72f3e66f671c895667edbf04c354eb pullPolicy: IfNotPresent strategy: From 3cebf7bdc039c53cecaf76aeb81b83b8aeed28a9 Mon Sep 17 00:00:00 2001 From: mattermod Date: Thu, 13 Jul 2023 10:19:36 +0000 Subject: [PATCH 31/52] Bump mattermost-team-edition App Version to 7.10.4 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index 4e193b53..c7d5f7d6 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.29 -appVersion: 7.10.3 +version: 6.6.30 +appVersion: 7.10.4 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 47c4dcef..d2e4fb88 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 7.10.3@sha256:67d3248b051f00068920ec52d64299bed00eceb9f28babe067da62eeed6b1291 + tag: 7.10.4@sha256:e7af6d9176fdec1660ea1a9257bede4036f78c3e1ad6f8c554bf3ba3289fae41 imagePullPolicy: IfNotPresent initContainerImage: From 8c5204a44c455b751592d9d4e29113c447fb0bcb Mon Sep 17 00:00:00 2001 From: Ruslan <97999957+mustdiechik@users.noreply.github.com> Date: Fri, 14 Jul 2023 11:54:14 +0300 Subject: [PATCH 32/52] Added startupProbe (#407) --- charts/mattermost-team-edition/Chart.yaml | 2 +- .../templates/deployment.yaml | 14 ++++++-------- charts/mattermost-team-edition/values.yaml | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index c7d5f7d6..1fd81840 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.30 +version: 6.6.31 appVersion: 7.10.4 keywords: - mattermost diff --git a/charts/mattermost-team-edition/templates/deployment.yaml b/charts/mattermost-team-edition/templates/deployment.yaml index c02b7a4d..488127a9 100644 --- a/charts/mattermost-team-edition/templates/deployment.yaml +++ b/charts/mattermost-team-edition/templates/deployment.yaml @@ -83,17 +83,15 @@ spec: containerPort: {{ .port }} protocol: {{ .protocol }} {{- end }} - livenessProbe: - initialDelaySeconds: 90 - timeoutSeconds: 5 - periodSeconds: 15 + startupProbe: {{- .Values.startupProbe | toYaml | nindent 10 }} + httpGet: + path: /healthz + port: http + livenessProbe: {{- .Values.livenessProbe | toYaml | nindent 10 }} httpGet: path: /api/v4/system/ping port: http - readinessProbe: - initialDelaySeconds: 15 - timeoutSeconds: 5 - periodSeconds: 15 + readinessProbe: {{- .Values.readinessProbe | toYaml | nindent 10 }} httpGet: path: /api/v4/system/ping port: http diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index d2e4fb88..dca4d0fd 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -225,3 +225,22 @@ serviceAccount: ## You can add any config here, but need to respect the format: MM__. ie: MM_SERVICESETTINGS_ENABLECOMMANDS: false config: MM_PLUGINSETTINGS_CLIENTDIRECTORY: "./client/plugins" + +## Configure startup, liveness and readiness probes +startupProbe: + initialDelaySeconds: 10 + failureThreshold: 30 + timeoutSeconds: 5 + periodSeconds: 10 + +livenessProbe: + initialDelaySeconds: 1 + failureThreshold: 3 + timeoutSeconds: 5 + periodSeconds: 10 + +readinessProbe: + initialDelaySeconds: 15 + failureThreshold: 3 + timeoutSeconds: 5 + periodSeconds: 10 From 19f25a72abdfc59b732d15a3edf17c21494234f6 Mon Sep 17 00:00:00 2001 From: mattermod Date: Tue, 18 Jul 2023 08:19:53 +0000 Subject: [PATCH 33/52] Bump mattermost-enterprise-edition App Version to 8.0.0 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index e2c06339..944701e4 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.28 -appVersion: 7.10.4 +version: 2.6.29 +appVersion: 8.0.0 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index ed0fb153..fed2a95a 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 7.10.4@sha256:3fab0067b0690b62815aa8d1af62f3f5fa72f3e66f671c895667edbf04c354eb + tag: 8.0.0@sha256:ba5ad2accb82bfa686bd4b90fdfa8c706aefb392b034f61acb98041cee642c1f pullPolicy: IfNotPresent strategy: From 996d6b182ecf1601670f474127f478ef46d35d36 Mon Sep 17 00:00:00 2001 From: mattermod Date: Tue, 18 Jul 2023 08:19:55 +0000 Subject: [PATCH 34/52] Bump mattermost-team-edition App Version to 8.0.0 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index 1fd81840..5da1f6c3 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.31 -appVersion: 7.10.4 +version: 6.6.32 +appVersion: 8.0.0 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index dca4d0fd..1babe11f 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 7.10.4@sha256:e7af6d9176fdec1660ea1a9257bede4036f78c3e1ad6f8c554bf3ba3289fae41 + tag: 8.0.0@sha256:a7522d592c5abef09db5d8b95e9d9d614247e23ef3cde6d4311a5f0b30acbc0e imagePullPolicy: IfNotPresent initContainerImage: From 73254495e285c988514fa0a4ae13c5fe529d16d6 Mon Sep 17 00:00:00 2001 From: Ruslan <97999957+mustdiechik@users.noreply.github.com> Date: Wed, 19 Jul 2023 12:54:20 +0300 Subject: [PATCH 35/52] Add extraDeploy to mattermost-team-edition (#409) To be able to add additional resources to the release. --- charts/mattermost-team-edition/templates/extra-deploy.yaml | 4 ++++ charts/mattermost-team-edition/values.yaml | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 charts/mattermost-team-edition/templates/extra-deploy.yaml diff --git a/charts/mattermost-team-edition/templates/extra-deploy.yaml b/charts/mattermost-team-edition/templates/extra-deploy.yaml new file mode 100644 index 00000000..cb8b3c8a --- /dev/null +++ b/charts/mattermost-team-edition/templates/extra-deploy.yaml @@ -0,0 +1,4 @@ +{{- range .Values.extraDeploy }} +--- + {{- tpl ( . | toYaml) $ }} +{{- end }} diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 1babe11f..7524e17a 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -195,6 +195,9 @@ extraPorts: [] # port: 8585 # protocol: TCP +# Array of extra objects to deploy with the release +extraDeploy: [] + ## Node selector ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector nodeSelector: {} From d62142fd5ee3a22fe6e0d6d2a535f831e10187cc Mon Sep 17 00:00:00 2001 From: mattermod Date: Thu, 27 Jul 2023 11:56:40 +0000 Subject: [PATCH 36/52] Bump mattermost-enterprise-edition App Version to 8.0.1 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 944701e4..2e139ce8 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.29 -appVersion: 8.0.0 +version: 2.6.30 +appVersion: 8.0.1 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index fed2a95a..2f058723 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 8.0.0@sha256:ba5ad2accb82bfa686bd4b90fdfa8c706aefb392b034f61acb98041cee642c1f + tag: 8.0.1@sha256:0bd945338e273b9ca76843b1072145d129ffb2632ed3de7c452ab35a7d166423 pullPolicy: IfNotPresent strategy: From bf92c8c3c158750423880f3e13ab81ae6227e846 Mon Sep 17 00:00:00 2001 From: mattermod Date: Thu, 27 Jul 2023 11:56:41 +0000 Subject: [PATCH 37/52] Bump mattermost-team-edition App Version to 8.0.1 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index 5da1f6c3..c93d3ea6 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.32 -appVersion: 8.0.0 +version: 6.6.33 +appVersion: 8.0.1 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 7524e17a..cc971011 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 8.0.0@sha256:a7522d592c5abef09db5d8b95e9d9d614247e23ef3cde6d4311a5f0b30acbc0e + tag: 8.0.1@sha256:554b811b8e9692fa0b3dbda4cc637fcb711ce3fc6699b2215312594ca32a6917 imagePullPolicy: IfNotPresent initContainerImage: From 90e3064cc369b0f8ac52285cc1f8f937cbb4f691 Mon Sep 17 00:00:00 2001 From: Stylianos Rigas Date: Wed, 2 Aug 2023 12:35:42 +0300 Subject: [PATCH 38/52] [CLD-5982] First commit of Mattermost Calls Offloader service Helm chart (#412) * CLD-5982 First commit of Mattermost Calls Offloader service Helm chart * CLD-5982 Move to autoscaling/v2 api * CLD-5982 Change service type to ClusterIP and default log level to info --------- Co-authored-by: Stylianos Rigas --- charts/mattermost-calls-offloader/.helmignore | 23 +++++ charts/mattermost-calls-offloader/Chart.yaml | 15 ++++ .../templates/NOTES.txt | 16 ++++ .../templates/_helpers.tpl | 62 ++++++++++++++ .../templates/deployment.yaml | 63 ++++++++++++++ .../templates/hpa.yaml | 28 +++++++ .../templates/role.yaml | 11 +++ .../templates/rolebinding.yaml | 11 +++ .../templates/service.yaml | 15 ++++ .../templates/serviceaccount.yaml | 12 +++ charts/mattermost-calls-offloader/values.yaml | 83 +++++++++++++++++++ 11 files changed, 339 insertions(+) create mode 100644 charts/mattermost-calls-offloader/.helmignore create mode 100644 charts/mattermost-calls-offloader/Chart.yaml create mode 100644 charts/mattermost-calls-offloader/templates/NOTES.txt create mode 100644 charts/mattermost-calls-offloader/templates/_helpers.tpl create mode 100644 charts/mattermost-calls-offloader/templates/deployment.yaml create mode 100644 charts/mattermost-calls-offloader/templates/hpa.yaml create mode 100644 charts/mattermost-calls-offloader/templates/role.yaml create mode 100644 charts/mattermost-calls-offloader/templates/rolebinding.yaml create mode 100644 charts/mattermost-calls-offloader/templates/service.yaml create mode 100644 charts/mattermost-calls-offloader/templates/serviceaccount.yaml create mode 100644 charts/mattermost-calls-offloader/values.yaml diff --git a/charts/mattermost-calls-offloader/.helmignore b/charts/mattermost-calls-offloader/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/charts/mattermost-calls-offloader/.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/mattermost-calls-offloader/Chart.yaml b/charts/mattermost-calls-offloader/Chart.yaml new file mode 100644 index 00000000..6d801b4d --- /dev/null +++ b/charts/mattermost-calls-offloader/Chart.yaml @@ -0,0 +1,15 @@ +apiVersion: v2 +name: mattermost-calls-offloader +description: A Helm chart for Kubernetes to deploy Mattermost's Calls Offloader service +type: application +version: 0.1.0 +appVersion: "0.3.0" +keywords: +- mattermost +- calls-offloader +maintainers: + - name: SRE Team + email: sre@mattermost.com +sources: +- https://github.com/mattermost/mattermost-helm +- https://github.com/mattermost/calls-offloader diff --git a/charts/mattermost-calls-offloader/templates/NOTES.txt b/charts/mattermost-calls-offloader/templates/NOTES.txt new file mode 100644 index 00000000..9470c773 --- /dev/null +++ b/charts/mattermost-calls-offloader/templates/NOTES.txt @@ -0,0 +1,16 @@ +1. Get the application URL by running these commands: +{{- if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "mattermost-calls-offloader.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "mattermost-calls-offloader.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "mattermost-calls-offloader.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "mattermost-calls-offloader.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/charts/mattermost-calls-offloader/templates/_helpers.tpl b/charts/mattermost-calls-offloader/templates/_helpers.tpl new file mode 100644 index 00000000..39d26848 --- /dev/null +++ b/charts/mattermost-calls-offloader/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "mattermost-calls-offloader.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 "mattermost-calls-offloader.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 "mattermost-calls-offloader.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "mattermost-calls-offloader.labels" -}} +helm.sh/chart: {{ include "mattermost-calls-offloader.chart" . }} +{{ include "mattermost-calls-offloader.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "mattermost-calls-offloader.selectorLabels" -}} +app.kubernetes.io/name: {{ include "mattermost-calls-offloader.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "mattermost-calls-offloader.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "mattermost-calls-offloader.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/mattermost-calls-offloader/templates/deployment.yaml b/charts/mattermost-calls-offloader/templates/deployment.yaml new file mode 100644 index 00000000..cf508cb0 --- /dev/null +++ b/charts/mattermost-calls-offloader/templates/deployment.yaml @@ -0,0 +1,63 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "mattermost-calls-offloader.fullname" . }} + labels: + {{- include "mattermost-calls-offloader.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "mattermost-calls-offloader.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "mattermost-calls-offloader.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "mattermost-calls-offloader.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: offloader + containerPort: 4545 + protocol: TCP + env: + {{- toYaml .Values.config | nindent 12 }} + livenessProbe: + httpGet: + path: /version + port: offloader + readinessProbe: + httpGet: + path: /version + port: offloader + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/mattermost-calls-offloader/templates/hpa.yaml b/charts/mattermost-calls-offloader/templates/hpa.yaml new file mode 100644 index 00000000..5100f877 --- /dev/null +++ b/charts/mattermost-calls-offloader/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "mattermost-calls-offloader.fullname" . }} + labels: + {{- include "mattermost-calls-offloader.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "mattermost-calls-offloader.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/charts/mattermost-calls-offloader/templates/role.yaml b/charts/mattermost-calls-offloader/templates/role.yaml new file mode 100644 index 00000000..64b92ed3 --- /dev/null +++ b/charts/mattermost-calls-offloader/templates/role.yaml @@ -0,0 +1,11 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: {{ include "mattermost-calls-offloader.name" . }} +rules: + - apiGroups: ["batch"] + resources: ["jobs"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] + - apiGroups: [""] + resources: ["pods", "pods/log"] + verbs: ["get", "list"] diff --git a/charts/mattermost-calls-offloader/templates/rolebinding.yaml b/charts/mattermost-calls-offloader/templates/rolebinding.yaml new file mode 100644 index 00000000..863077c8 --- /dev/null +++ b/charts/mattermost-calls-offloader/templates/rolebinding.yaml @@ -0,0 +1,11 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: {{ include "mattermost-calls-offloader.name" . }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ include "mattermost-calls-offloader.name" . }} +subjects: +- kind: ServiceAccount + name: {{ include "mattermost-calls-offloader.serviceAccountName" . }} diff --git a/charts/mattermost-calls-offloader/templates/service.yaml b/charts/mattermost-calls-offloader/templates/service.yaml new file mode 100644 index 00000000..980ae18d --- /dev/null +++ b/charts/mattermost-calls-offloader/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "mattermost-calls-offloader.fullname" . }} + labels: + {{- include "mattermost-calls-offloader.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: {{ .Values.service.targetPort }} + protocol: TCP + name: offloader + selector: + {{- include "mattermost-calls-offloader.selectorLabels" . | nindent 4 }} diff --git a/charts/mattermost-calls-offloader/templates/serviceaccount.yaml b/charts/mattermost-calls-offloader/templates/serviceaccount.yaml new file mode 100644 index 00000000..945da8f1 --- /dev/null +++ b/charts/mattermost-calls-offloader/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "mattermost-calls-offloader.serviceAccountName" . }} + labels: + {{- include "mattermost-calls-offloader.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/mattermost-calls-offloader/values.yaml b/charts/mattermost-calls-offloader/values.yaml new file mode 100644 index 00000000..67a8c10c --- /dev/null +++ b/charts/mattermost-calls-offloader/values.yaml @@ -0,0 +1,83 @@ +# Default values for mattermost-calls-offloader. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 2 + +image: + repository: mattermost/calls-offloader + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "v0.3.0" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 4545 + targetPort: 4545 + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} + +config: + - name: K8S_NAMESPACE # Forwarding the namespace to be used for creation of new resources. + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: LOGGER_ENABLEFILE + value: "false" + - name: JOBS_APITYPE + value: "kubernetes" + - name: JOBS_MAXCONCURRENTJOBS + value: "1" + - name: API_SECURITY_ALLOWSELFREGISTRATION # This should only be set to true if running the service inside a private network. + value: "true" + - name: LOGGER_CONSOLELEVEL + value: "INFO" From 9c31f8b5f3367deeab6bb76cdaeaf873655ecef7 Mon Sep 17 00:00:00 2001 From: Stylianos Rigas Date: Wed, 2 Aug 2023 16:39:24 +0300 Subject: [PATCH 39/52] Add basic Readmes for Mattermost RTCD and Calls Offloader (#413) Co-authored-by: Stylianos Rigas --- charts/mattermost-calls-offloader/README.md | 35 +++++++++++++++++++++ charts/mattermost-rtcd/README.md | 35 +++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 charts/mattermost-calls-offloader/README.md create mode 100644 charts/mattermost-rtcd/README.md diff --git a/charts/mattermost-calls-offloader/README.md b/charts/mattermost-calls-offloader/README.md new file mode 100644 index 00000000..2ec97339 --- /dev/null +++ b/charts/mattermost-calls-offloader/README.md @@ -0,0 +1,35 @@ +# mattermost-calls-offloader + +A Helm chart for Kubernetes and Mattermost Application Calls Offloader + +## How to install this chart + +Add Mattermost public chart repo: + +```console +helm repo add mattermost https://helm.mattermost.com +``` + +A simple install with default values: + +```console +helm install mattermost/mattermost-calls-offloader +``` + +To install the chart with the release name `my-release`: + +```console +helm install my-release mattermost/mattermost-calls-offloader +``` + +To install with some set values: + +```console +helm install my-release mattermost/mattermost-calls-offloader --set values_key1=value1 --set values_key2=value2 +``` + +To install with custom values file: + +```console +helm install my-release mattermost/mattermost-calls-offloader -f values.yaml +``` diff --git a/charts/mattermost-rtcd/README.md b/charts/mattermost-rtcd/README.md new file mode 100644 index 00000000..27108194 --- /dev/null +++ b/charts/mattermost-rtcd/README.md @@ -0,0 +1,35 @@ +# mattermost-rtcd + +A Helm chart for Kubernetes and Mattermost Application RTCD + +## How to install this chart + +Add Mattermost public chart repo: + +```console +helm repo add mattermost https://helm.mattermost.com +``` + +A simple install with default values: + +```console +helm install mattermost/mattermost-rtcd +``` + +To install the chart with the release name `my-release`: + +```console +helm install my-release mattermost/mattermost-rtcd +``` + +To install with some set values: + +```console +helm install my-release mattermost/mattermost-rtcd --set values_key1=value1 --set values_key2=value2 +``` + +To install with custom values file: + +```console +helm install my-release mattermost/mattermost-rtcd -f values.yaml +``` From 977935212b579a778faf81b6d846d2acf8a8e26d Mon Sep 17 00:00:00 2001 From: Stylianos Rigas Date: Fri, 11 Aug 2023 17:58:47 +0300 Subject: [PATCH 40/52] CLD-6125 Release calls offloader v0.3.1 (#414) Co-authored-by: Stylianos Rigas --- charts/mattermost-calls-offloader/Chart.yaml | 4 ++-- charts/mattermost-calls-offloader/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-calls-offloader/Chart.yaml b/charts/mattermost-calls-offloader/Chart.yaml index 6d801b4d..41a6c01c 100644 --- a/charts/mattermost-calls-offloader/Chart.yaml +++ b/charts/mattermost-calls-offloader/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: mattermost-calls-offloader description: A Helm chart for Kubernetes to deploy Mattermost's Calls Offloader service type: application -version: 0.1.0 -appVersion: "0.3.0" +version: 0.1.1 +appVersion: "0.3.1" keywords: - mattermost - calls-offloader diff --git a/charts/mattermost-calls-offloader/values.yaml b/charts/mattermost-calls-offloader/values.yaml index 67a8c10c..03f4e63a 100644 --- a/charts/mattermost-calls-offloader/values.yaml +++ b/charts/mattermost-calls-offloader/values.yaml @@ -8,7 +8,7 @@ image: repository: mattermost/calls-offloader pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "v0.3.0" + tag: "v0.3.1" imagePullSecrets: [] nameOverride: "" From 86b64d828c48d597b488c5783a5d04719f80b8f1 Mon Sep 17 00:00:00 2001 From: mattermod Date: Mon, 28 Aug 2023 07:22:57 +0000 Subject: [PATCH 41/52] Bump mattermost-enterprise-edition App Version to 8.1.0 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 2e139ce8..c4ac0361 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.30 -appVersion: 8.0.1 +version: 2.6.31 +appVersion: 8.1.0 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index 2f058723..c72c90da 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 8.0.1@sha256:0bd945338e273b9ca76843b1072145d129ffb2632ed3de7c452ab35a7d166423 + tag: 8.1.0@sha256:1173ecb976e51bc1732c1ccbb7d5245a57937b55419c922b25744a28c1d675f6 pullPolicy: IfNotPresent strategy: From 1d4acebc02de26c4b487e6d3bbed74fc8174d08f Mon Sep 17 00:00:00 2001 From: mattermod Date: Mon, 28 Aug 2023 07:22:59 +0000 Subject: [PATCH 42/52] Bump mattermost-team-edition App Version to 8.1.0 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index c93d3ea6..b96177fb 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.33 -appVersion: 8.0.1 +version: 6.6.34 +appVersion: 8.1.0 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index cc971011..b16bb4e5 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 8.0.1@sha256:554b811b8e9692fa0b3dbda4cc637fcb711ce3fc6699b2215312594ca32a6917 + tag: 8.1.0@sha256:f9bc0efb5ebe0f137c3d5448a9b9c4de274cae727872a34440fe9442c7302042 imagePullPolicy: IfNotPresent initContainerImage: From ef5f1d9f35bfa9c741f9fcfec8ed1e4dc64b4c27 Mon Sep 17 00:00:00 2001 From: mattermod Date: Tue, 5 Sep 2023 17:03:27 +0000 Subject: [PATCH 43/52] Bump mattermost-enterprise-edition App Version to 8.1.1 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index c4ac0361..424a0f60 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.31 -appVersion: 8.1.0 +version: 2.6.32 +appVersion: 8.1.1 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index c72c90da..8113d678 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 8.1.0@sha256:1173ecb976e51bc1732c1ccbb7d5245a57937b55419c922b25744a28c1d675f6 + tag: 8.1.1@sha256:d07dbd2f7f51ebe4f3679a8d453feab24c773e58f0ffbfb61b999cdea6f06be6 pullPolicy: IfNotPresent strategy: From b5f51c37b35b3b8170cf47c3f889a7e1449a2140 Mon Sep 17 00:00:00 2001 From: mattermod Date: Tue, 5 Sep 2023 17:03:28 +0000 Subject: [PATCH 44/52] Bump mattermost-team-edition App Version to 8.1.1 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index b96177fb..5612cd6c 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.34 -appVersion: 8.1.0 +version: 6.6.35 +appVersion: 8.1.1 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index b16bb4e5..7232080e 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 8.1.0@sha256:f9bc0efb5ebe0f137c3d5448a9b9c4de274cae727872a34440fe9442c7302042 + tag: 8.1.1@sha256:9d4945e61f7808aebceb0fb11f57a9c386eb7083c86f771d18f9c7a913e591a5 imagePullPolicy: IfNotPresent initContainerImage: From 7944a02058d06bc26acab0520e5c963f247861a0 Mon Sep 17 00:00:00 2001 From: Stylianos Rigas Date: Thu, 7 Sep 2023 12:12:52 +0300 Subject: [PATCH 45/52] CLD-6281 Release calls-offloader v0.3.3 (#418) Co-authored-by: Stylianos Rigas --- charts/mattermost-calls-offloader/Chart.yaml | 4 ++-- charts/mattermost-calls-offloader/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-calls-offloader/Chart.yaml b/charts/mattermost-calls-offloader/Chart.yaml index 41a6c01c..4355d725 100644 --- a/charts/mattermost-calls-offloader/Chart.yaml +++ b/charts/mattermost-calls-offloader/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: mattermost-calls-offloader description: A Helm chart for Kubernetes to deploy Mattermost's Calls Offloader service type: application -version: 0.1.1 -appVersion: "0.3.1" +version: 0.1.2 +appVersion: "0.3.3" keywords: - mattermost - calls-offloader diff --git a/charts/mattermost-calls-offloader/values.yaml b/charts/mattermost-calls-offloader/values.yaml index 03f4e63a..86e90ac1 100644 --- a/charts/mattermost-calls-offloader/values.yaml +++ b/charts/mattermost-calls-offloader/values.yaml @@ -8,7 +8,7 @@ image: repository: mattermost/calls-offloader pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "v0.3.1" + tag: "v0.3.3" imagePullSecrets: [] nameOverride: "" From f366c348646b11a92f52337304a4bf88294e891f Mon Sep 17 00:00:00 2001 From: Claudio Costa Date: Thu, 7 Sep 2023 16:13:05 -0600 Subject: [PATCH 46/52] [MM-53140] Allow TCP connectivity for Calls (#406) * Allow TCP connectivity for Calls * Update daemonset * Bump version --- charts/mattermost-rtcd/Chart.yaml | 2 +- charts/mattermost-rtcd/templates/daemonset.yaml | 6 +++++- charts/mattermost-rtcd/templates/deployment.yaml | 6 +++++- charts/mattermost-rtcd/templates/service.yaml | 8 ++++++-- charts/mattermost-rtcd/values.yaml | 5 ++++- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/charts/mattermost-rtcd/Chart.yaml b/charts/mattermost-rtcd/Chart.yaml index 6fc47c7b..bf06067e 100644 --- a/charts/mattermost-rtcd/Chart.yaml +++ b/charts/mattermost-rtcd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: mattermost-rtcd description: A Helm chart for Kubernetes to deploy Mattermost's RTCD type: application -version: 1.3.0 +version: 1.4.0 appVersion: latest keywords: - mattermost diff --git a/charts/mattermost-rtcd/templates/daemonset.yaml b/charts/mattermost-rtcd/templates/daemonset.yaml index caf2370b..d75277d5 100644 --- a/charts/mattermost-rtcd/templates/daemonset.yaml +++ b/charts/mattermost-rtcd/templates/daemonset.yaml @@ -55,10 +55,14 @@ spec: containerPort: {{ .Values.service.APIport }} hostPort: {{ .Values.service.APIport }} protocol: TCP - - name: rtc + - name: rtc-udp containerPort: {{ .Values.service.RTCport }} hostPort: {{ .Values.service.RTCport }} protocol: UDP + - name: rtc-tcp + containerPort: {{ .Values.service.RTCport }} + hostPort: {{ .Values.service.RTCport }} + protocol: TCP livenessProbe: httpGet: path: /version diff --git a/charts/mattermost-rtcd/templates/deployment.yaml b/charts/mattermost-rtcd/templates/deployment.yaml index 25ce3dba..8e2b6747 100644 --- a/charts/mattermost-rtcd/templates/deployment.yaml +++ b/charts/mattermost-rtcd/templates/deployment.yaml @@ -56,10 +56,14 @@ spec: containerPort: {{ .Values.service.APIport }} hostPort: {{ .Values.service.APIport }} protocol: TCP - - name: rtc + - name: rtc-udp containerPort: {{ .Values.service.RTCport }} hostPort: {{ .Values.service.RTCport }} protocol: UDP + - name: rtc-tcp + containerPort: {{ .Values.service.RTCport }} + hostPort: {{ .Values.service.RTCport }} + protocol: TCP livenessProbe: httpGet: path: /version diff --git a/charts/mattermost-rtcd/templates/service.yaml b/charts/mattermost-rtcd/templates/service.yaml index 3245bbbc..061dc025 100644 --- a/charts/mattermost-rtcd/templates/service.yaml +++ b/charts/mattermost-rtcd/templates/service.yaml @@ -12,8 +12,12 @@ spec: protocol: TCP name: api - port: {{ .Values.service.RTCport }} - targetPort: rtc + targetPort: rtc-udp protocol: UDP - name: rtc + name: rtc-udp + - port: {{ .Values.service.RTCport }} + targetPort: rtc-tcp + protocol: TCP + name: rtc-tcp selector: {{- include "mattermost-rtcd.selectorLabels" . | nindent 4 }} diff --git a/charts/mattermost-rtcd/values.yaml b/charts/mattermost-rtcd/values.yaml index f1a4a8a8..fbaeb308 100644 --- a/charts/mattermost-rtcd/values.yaml +++ b/charts/mattermost-rtcd/values.yaml @@ -44,8 +44,11 @@ configuration: environmentVariables: {} # All env vars that exist for RTCD: https://github.com/mattermost/rtcd/blob/master/docs/env_config.md # RTCD_API_SECURITY_ALLOWSELFREGISTRATION: "\"true\"" + # RTCD_RTC_ICESERVERS: "'[{\"urls\":[\"stun:stun.global.calls.mattermost.com:3478\"]}]'" # RTCD_LOGGER_CONSOLELEVEL: "\"DEBUG\"" # RTCD_LOGGER_ENABLEFILE: "\"false\"" + # RTCD_RTC_ICEPORTUDP: "\"8443\"" + # RTCD_RTC_ICEPORTTCP: "\"8443\"" maxUnavailable: 1 # Only used when updateStrategy is set to "RollingUpdate" updateStrategy: RollingUpdate @@ -64,7 +67,7 @@ configuration: service: # APIport is the port that websocket and API uses APIport: 8045 - # RTCport is the UDP port that RTC uses + # RTCport is the port (both UDP and TCP) that will serve calls related traffic (i.e. audio,video) RTCport: 8443 ingress: From 82d1d4843aa757f52a017928bf501c3229c178a2 Mon Sep 17 00:00:00 2001 From: mattermod Date: Wed, 13 Sep 2023 13:00:26 +0000 Subject: [PATCH 47/52] Bump mattermost-enterprise-edition App Version to 8.1.2 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 424a0f60..9c7312ea 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.32 -appVersion: 8.1.1 +version: 2.6.33 +appVersion: 8.1.2 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index 8113d678..0404699d 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 8.1.1@sha256:d07dbd2f7f51ebe4f3679a8d453feab24c773e58f0ffbfb61b999cdea6f06be6 + tag: 8.1.2@sha256:c20d53ef07a334d8b9acd3ced774014b47a2e594a7f8f113b8d612622c5289b5 pullPolicy: IfNotPresent strategy: From 659baf0de755c9f9df22390801a24b8649eb1730 Mon Sep 17 00:00:00 2001 From: mattermod Date: Wed, 13 Sep 2023 13:00:27 +0000 Subject: [PATCH 48/52] Bump mattermost-team-edition App Version to 8.1.2 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index 5612cd6c..bca14658 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.35 -appVersion: 8.1.1 +version: 6.6.36 +appVersion: 8.1.2 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 7232080e..27f24ede 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 8.1.1@sha256:9d4945e61f7808aebceb0fb11f57a9c386eb7083c86f771d18f9c7a913e591a5 + tag: 8.1.2@sha256:00a95d708b81f57662a04256f8db9926b9b9ea2af1d12c542a9b43516cf55b4b imagePullPolicy: IfNotPresent initContainerImage: From a54e470fdcd381b4d95b3604f5f1c7a712a8722d Mon Sep 17 00:00:00 2001 From: Stylianos Rigas Date: Thu, 14 Sep 2023 15:47:58 +0300 Subject: [PATCH 49/52] CLD-6287 Release new push proxy version 5.25.0 (#419) Co-authored-by: Stylianos Rigas --- charts/mattermost-push-proxy/Chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-push-proxy/Chart.yaml b/charts/mattermost-push-proxy/Chart.yaml index 42c785bd..e954560e 100644 --- a/charts/mattermost-push-proxy/Chart.yaml +++ b/charts/mattermost-push-proxy/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Push Proxy server name: mattermost-push-proxy type: application -version: 0.8.0 -appVersion: 5.24.0 +version: 0.9.0 +appVersion: 5.25.0 keywords: - mattermost - communication @@ -23,5 +23,5 @@ sources: annotations: artifacthub.io/images: | - name: mattermost-push-proxy - image: mattermost/mattermost-push-proxy:5.24.0 + image: mattermost/mattermost-push-proxy:5.25.0 artifacthub.io/license: Apache-2.0 From be9b9acc59b1f8d3d1b3e60ce23921715e10def5 Mon Sep 17 00:00:00 2001 From: mattermod Date: Wed, 27 Sep 2023 07:01:03 +0000 Subject: [PATCH 50/52] Bump mattermost-enterprise-edition App Version to 9.0.0 --- charts/mattermost-enterprise-edition/Chart.yaml | 4 ++-- charts/mattermost-enterprise-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml index 9c7312ea..bcdab51e 100644 --- a/charts/mattermost-enterprise-edition/Chart.yaml +++ b/charts/mattermost-enterprise-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Enterprise server with high availitibity. name: mattermost-enterprise-edition type: application -version: 2.6.33 -appVersion: 8.1.2 +version: 2.6.34 +appVersion: 9.0.0 keywords: - mattermost - communication diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml index 0404699d..f4e172c1 100644 --- a/charts/mattermost-enterprise-edition/values.yaml +++ b/charts/mattermost-enterprise-edition/values.yaml @@ -125,7 +125,7 @@ mattermostApp: replicaCount: 2 image: repository: mattermost/mattermost-enterprise-edition - tag: 8.1.2@sha256:c20d53ef07a334d8b9acd3ced774014b47a2e594a7f8f113b8d612622c5289b5 + tag: 9.0.0@sha256:cca0f4655c0124e49b24e7891a89d917217937c49f59194f763d0cace98a6884 pullPolicy: IfNotPresent strategy: From d28e512e5fde0261dad90963d0e0886a8ffb5209 Mon Sep 17 00:00:00 2001 From: mattermod Date: Wed, 27 Sep 2023 07:01:05 +0000 Subject: [PATCH 51/52] Bump mattermost-team-edition App Version to 9.0.0 --- charts/mattermost-team-edition/Chart.yaml | 4 ++-- charts/mattermost-team-edition/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index bca14658..26eb4ee3 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.36 -appVersion: 8.1.2 +version: 6.6.37 +appVersion: 9.0.0 keywords: - mattermost - communication diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index 27f24ede..eaa61122 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mattermost/mattermost-team-edition - tag: 8.1.2@sha256:00a95d708b81f57662a04256f8db9926b9b9ea2af1d12c542a9b43516cf55b4b + tag: 9.0.0@sha256:ee866c411f65a220b41d16271ba3e0a5b56ed81cbb926553d4547f53d071ac0f imagePullPolicy: IfNotPresent initContainerImage: From aa4b593ecfb1efcc9e94715c194234010c68002f Mon Sep 17 00:00:00 2001 From: Ruslan <97999957+mustdiechik@users.noreply.github.com> Date: Wed, 4 Oct 2023 09:55:28 +0300 Subject: [PATCH 52/52] Remove rand suffix in test job name (#417) Also added possibility to add additional annotations for test job. --- charts/mattermost-team-edition/Chart.yaml | 2 +- .../templates/tests/mattermost-test.yaml | 5 ++++- charts/mattermost-team-edition/values.yaml | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml index 26eb4ee3..cef69135 100644 --- a/charts/mattermost-team-edition/Chart.yaml +++ b/charts/mattermost-team-edition/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Mattermost Team Edition server. type: application name: mattermost-team-edition -version: 6.6.37 +version: 6.6.38 appVersion: 9.0.0 keywords: - mattermost diff --git a/charts/mattermost-team-edition/templates/tests/mattermost-test.yaml b/charts/mattermost-team-edition/templates/tests/mattermost-test.yaml index aa3c231c..bb8b85dd 100644 --- a/charts/mattermost-team-edition/templates/tests/mattermost-test.yaml +++ b/charts/mattermost-team-edition/templates/tests/mattermost-test.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Pod metadata: - name: "{{ include "mattermost-team-edition.fullname" . }}-test-{{ randAlphaNum 5 | lower }}" + name: "{{ include "mattermost-team-edition.fullname" . }}-test" labels: app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -9,6 +9,9 @@ metadata: helm.sh/chart: {{ include "mattermost-team-edition.chart" . }} annotations: "helm.sh/hook": test-success + {{- with .Values.testJob.annotations }} + {{- . | toYaml | nindent 4 }} + {{- end }} spec: containers: - name: {{ .Release.Name }}-test diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml index eaa61122..39ee9ea1 100644 --- a/charts/mattermost-team-edition/values.yaml +++ b/charts/mattermost-team-edition/values.yaml @@ -247,3 +247,8 @@ readinessProbe: failureThreshold: 3 timeoutSeconds: 5 periodSeconds: 10 + +## Additional annotations for test job + +testJob: + annotations: {}