Skip to content

Commit

Permalink
Adding changes for Fleet v4.54.2 (#21738)
Browse files Browse the repository at this point in the history
  • Loading branch information
georgekarrv committed Aug 31, 2024
1 parent 0ef149f commit fae0cb0
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 24 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## Fleet 4.54.2 (Aug 30, 2024)

### Bug fixes

* Removed validation of APNS certificate from server startup. This was no longer necessary because we now allow for APNS certificates to be renewed in the UI.

## Fleet 4.54.1 (Jul 24, 2024)

### Bug fixes
Expand Down
2 changes: 0 additions & 2 deletions changes/21683-apns-cert-validation-on-start

This file was deleted.

2 changes: 1 addition & 1 deletion charts/fleet/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version: v6.2.0
home: https://github.com/fleetdm/fleet
sources:
- https://github.com/fleetdm/fleet.git
appVersion: v4.54.1
appVersion: v4.54.2
dependencies:
- name: mysql
condition: mysql.enabled
Expand Down
2 changes: 1 addition & 1 deletion charts/fleet/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
hostName: fleet.localhost
replicas: 3 # The number of Fleet instances to deploy
imageRepository: fleetdm/fleet
imageTag: v4.54.1 # Version of Fleet to deploy
imageTag: v4.54.2 # Version of Fleet to deploy
podAnnotations: {} # Additional annotations to add to the Fleet pod
serviceAccountAnnotations: {} # Additional annotations to add to the Fleet service account
resources:
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/dogfood/terraform/aws/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ variable "database_name" {

variable "fleet_image" {
description = "the name of the container image to run"
default = "fleetdm/fleet:v4.54.1"
default = "fleetdm/fleet:v4.54.2"
}

variable "software_inventory" {
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/dogfood/terraform/gcp/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ variable "redis_mem" {
}

variable "image" {
default = "fleet:v4.54.1"
default = "fleet:v4.54.2"
}
2 changes: 1 addition & 1 deletion terraform/README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions terraform/addons/vuln-processing/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ variable "fleet_config" {
vuln_processing_cpu = optional(number, 2048)
vuln_data_stream_mem = optional(number, 1024)
vuln_data_stream_cpu = optional(number, 512)
image = optional(string, "fleetdm/fleet:v4.54.1")
image = optional(string, "fleetdm/fleet:v4.54.2")
family = optional(string, "fleet-vuln-processing")
sidecars = optional(list(any), [])
extra_environment_variables = optional(map(string), {})
Expand Down Expand Up @@ -82,7 +82,7 @@ variable "fleet_config" {
vuln_processing_cpu = 2048
vuln_data_stream_mem = 1024
vuln_data_stream_cpu = 512
image = "fleetdm/fleet:v4.54.1"
image = "fleetdm/fleet:v4.54.2"
family = "fleet-vuln-processing"
sidecars = []
extra_environment_variables = {}
Expand Down
2 changes: 1 addition & 1 deletion terraform/byo-vpc/README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion terraform/byo-vpc/byo-db/README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion terraform/byo-vpc/byo-db/byo-ecs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ No modules.
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_ecs_cluster"></a> [ecs\_cluster](#input\_ecs\_cluster) | The name of the ECS cluster to use | `string` | n/a | yes |
| <a name="input_fleet_config"></a> [fleet\_config](#input\_fleet\_config) | The configuration object for Fleet itself. Fields that default to null will have their respective resources created if not specified. | <pre>object({<br> task_mem = optional(number, null)<br> task_cpu = optional(number, null)<br> mem = optional(number, 4096)<br> cpu = optional(number, 512)<br> pid_mode = optional(string, null)<br> image = optional(string, "fleetdm/fleet:v4.54.1")<br> family = optional(string, "fleet")<br> sidecars = optional(list(any), [])<br> depends_on = optional(list(any), [])<br> mount_points = optional(list(any), [])<br> volumes = optional(list(any), [])<br> extra_environment_variables = optional(map(string), {})<br> extra_iam_policies = optional(list(string), [])<br> extra_execution_iam_policies = optional(list(string), [])<br> extra_secrets = optional(map(string), {})<br> security_groups = optional(list(string), null)<br> security_group_name = optional(string, "fleet")<br> iam_role_arn = optional(string, null)<br> repository_credentials = optional(string, "")<br> private_key_secret_name = optional(string, "fleet-server-private-key")<br> service = optional(object({<br> name = optional(string, "fleet")<br> }), {<br> name = "fleet"<br> })<br> database = object({<br> password_secret_arn = string<br> user = string<br> database = string<br> address = string<br> rr_address = optional(string, null)<br> })<br> redis = object({<br> address = string<br> use_tls = optional(bool, true)<br> })<br> awslogs = optional(object({<br> name = optional(string, null)<br> region = optional(string, null)<br> create = optional(bool, true)<br> prefix = optional(string, "fleet")<br> retention = optional(number, 5)<br> }), {<br> name = null<br> region = null<br> prefix = "fleet"<br> retention = 5<br> })<br> loadbalancer = object({<br> arn = string<br> })<br> extra_load_balancers = optional(list(any), [])<br> networking = object({<br> subnets = optional(list(string), null)<br> security_groups = optional(list(string), null)<br> ingress_sources = object({<br> cidr_blocks = optional(list(string), [])<br> ipv6_cidr_blocks = optional(list(string), [])<br> security_groups = optional(list(string), [])<br> prefix_list_ids = optional(list(string), [])<br> })<br> })<br> autoscaling = optional(object({<br> max_capacity = optional(number, 5)<br> min_capacity = optional(number, 1)<br> memory_tracking_target_value = optional(number, 80)<br> cpu_tracking_target_value = optional(number, 80)<br> }), {<br> max_capacity = 5<br> min_capacity = 1<br> memory_tracking_target_value = 80<br> cpu_tracking_target_value = 80<br> })<br> iam = optional(object({<br> role = optional(object({<br> name = optional(string, "fleet-role")<br> policy_name = optional(string, "fleet-iam-policy")<br> }), {<br> name = "fleet-role"<br> policy_name = "fleet-iam-policy"<br> })<br> execution = optional(object({<br> name = optional(string, "fleet-execution-role")<br> policy_name = optional(string, "fleet-execution-role")<br> }), {<br> name = "fleet-execution-role"<br> policy_name = "fleet-iam-policy-execution"<br> })<br> }), {<br> name = "fleetdm-execution-role"<br> })<br> software_installers = optional(object({<br> create_bucket = optional(bool, true)<br> bucket_name = optional(string, null)<br> bucket_prefix = optional(string, "fleet-software-installers-")<br> s3_object_prefix = optional(string, "")<br> }), {<br> create_bucket = true<br> bucket_name = null<br> bucket_prefix = "fleet-software-installers-"<br> s3_object_prefix = ""<br> })<br> })</pre> | <pre>{<br> "autoscaling": {<br> "cpu_tracking_target_value": 80,<br> "max_capacity": 5,<br> "memory_tracking_target_value": 80,<br> "min_capacity": 1<br> },<br> "awslogs": {<br> "create": true,<br> "name": null,<br> "prefix": "fleet",<br> "region": null,<br> "retention": 5<br> },<br> "cpu": 256,<br> "database": {<br> "address": null,<br> "database": null,<br> "password_secret_arn": null,<br> "rr_address": null,<br> "user": null<br> },<br> "depends_on": [],<br> "extra_environment_variables": {},<br> "extra_execution_iam_policies": [],<br> "extra_iam_policies": [],<br> "extra_load_balacners": [],<br> "extra_secrets": {},<br> "family": "fleet",<br> "iam": {<br> "execution": {<br> "name": "fleet-execution-role",<br> "policy_name": "fleet-iam-policy-execution"<br> },<br> "role": {<br> "name": "fleet-role",<br> "policy_name": "fleet-iam-policy"<br> }<br> },<br> "iam_role_arn": null,<br> "image": "fleetdm/fleet:v4.54.1",<br> "loadbalancer": {<br> "arn": null<br> },<br> "mem": 512,<br> "mount_points": [],<br> "networking": {<br> "ingress_sources": {<br> "cidr_blocks": [],<br> "ipv6_cidr_blocks": [],<br> "prefix_list_ids": [],<br> "security_groups": []<br> },<br> "security_groups": null,<br> "subnets": null<br> },<br> "pid_mode": null,<br> "private_key_secret_name": "fleet-server-private-key",<br> "redis": {<br> "address": null,<br> "use_tls": true<br> },<br> "repository_credentials": "",<br> "security_group_name": "fleet",<br> "security_groups": null,<br> "service": {<br> "name": "fleet"<br> },<br> "sidecars": [],<br> "software_installers": {<br> "bucket_name": null,<br> "bucket_prefix": "fleet-software-installers-",<br> "create_bucket": true,<br> "s3_object_prefix": ""<br> },<br> "task_cpu": null,<br> "task_mem": null,<br> "volumes": []<br>}</pre> | no |
| <a name="input_fleet_config"></a> [fleet\_config](#input\_fleet\_config) | The configuration object for Fleet itself. Fields that default to null will have their respective resources created if not specified. | <pre>object({<br> task_mem = optional(number, null)<br> task_cpu = optional(number, null)<br> mem = optional(number, 4096)<br> cpu = optional(number, 512)<br> pid_mode = optional(string, null)<br> image = optional(string, "fleetdm/fleet:v4.54.2")<br> family = optional(string, "fleet")<br> sidecars = optional(list(any), [])<br> depends_on = optional(list(any), [])<br> mount_points = optional(list(any), [])<br> volumes = optional(list(any), [])<br> extra_environment_variables = optional(map(string), {})<br> extra_iam_policies = optional(list(string), [])<br> extra_execution_iam_policies = optional(list(string), [])<br> extra_secrets = optional(map(string), {})<br> security_groups = optional(list(string), null)<br> security_group_name = optional(string, "fleet")<br> iam_role_arn = optional(string, null)<br> repository_credentials = optional(string, "")<br> private_key_secret_name = optional(string, "fleet-server-private-key")<br> service = optional(object({<br> name = optional(string, "fleet")<br> }), {<br> name = "fleet"<br> })<br> database = object({<br> password_secret_arn = string<br> user = string<br> database = string<br> address = string<br> rr_address = optional(string, null)<br> })<br> redis = object({<br> address = string<br> use_tls = optional(bool, true)<br> })<br> awslogs = optional(object({<br> name = optional(string, null)<br> region = optional(string, null)<br> create = optional(bool, true)<br> prefix = optional(string, "fleet")<br> retention = optional(number, 5)<br> }), {<br> name = null<br> region = null<br> prefix = "fleet"<br> retention = 5<br> })<br> loadbalancer = object({<br> arn = string<br> })<br> extra_load_balancers = optional(list(any), [])<br> networking = object({<br> subnets = optional(list(string), null)<br> security_groups = optional(list(string), null)<br> ingress_sources = object({<br> cidr_blocks = optional(list(string), [])<br> ipv6_cidr_blocks = optional(list(string), [])<br> security_groups = optional(list(string), [])<br> prefix_list_ids = optional(list(string), [])<br> })<br> })<br> autoscaling = optional(object({<br> max_capacity = optional(number, 5)<br> min_capacity = optional(number, 1)<br> memory_tracking_target_value = optional(number, 80)<br> cpu_tracking_target_value = optional(number, 80)<br> }), {<br> max_capacity = 5<br> min_capacity = 1<br> memory_tracking_target_value = 80<br> cpu_tracking_target_value = 80<br> })<br> iam = optional(object({<br> role = optional(object({<br> name = optional(string, "fleet-role")<br> policy_name = optional(string, "fleet-iam-policy")<br> }), {<br> name = "fleet-role"<br> policy_name = "fleet-iam-policy"<br> })<br> execution = optional(object({<br> name = optional(string, "fleet-execution-role")<br> policy_name = optional(string, "fleet-execution-role")<br> }), {<br> name = "fleet-execution-role"<br> policy_name = "fleet-iam-policy-execution"<br> })<br> }), {<br> name = "fleetdm-execution-role"<br> })<br> software_installers = optional(object({<br> create_bucket = optional(bool, true)<br> bucket_name = optional(string, null)<br> bucket_prefix = optional(string, "fleet-software-installers-")<br> s3_object_prefix = optional(string, "")<br> }), {<br> create_bucket = true<br> bucket_name = null<br> bucket_prefix = "fleet-software-installers-"<br> s3_object_prefix = ""<br> })<br> })</pre> | <pre>{<br> "autoscaling": {<br> "cpu_tracking_target_value": 80,<br> "max_capacity": 5,<br> "memory_tracking_target_value": 80,<br> "min_capacity": 1<br> },<br> "awslogs": {<br> "create": true,<br> "name": null,<br> "prefix": "fleet",<br> "region": null,<br> "retention": 5<br> },<br> "cpu": 256,<br> "database": {<br> "address": null,<br> "database": null,<br> "password_secret_arn": null,<br> "rr_address": null,<br> "user": null<br> },<br> "depends_on": [],<br> "extra_environment_variables": {},<br> "extra_execution_iam_policies": [],<br> "extra_iam_policies": [],<br> "extra_load_balacners": [],<br> "extra_secrets": {},<br> "family": "fleet",<br> "iam": {<br> "execution": {<br> "name": "fleet-execution-role",<br> "policy_name": "fleet-iam-policy-execution"<br> },<br> "role": {<br> "name": "fleet-role",<br> "policy_name": "fleet-iam-policy"<br> }<br> },<br> "iam_role_arn": null,<br> "image": "fleetdm/fleet:v4.54.2",<br> "loadbalancer": {<br> "arn": null<br> },<br> "mem": 512,<br> "mount_points": [],<br> "networking": {<br> "ingress_sources": {<br> "cidr_blocks": [],<br> "ipv6_cidr_blocks": [],<br> "prefix_list_ids": [],<br> "security_groups": []<br> },<br> "security_groups": null,<br> "subnets": null<br> },<br> "pid_mode": null,<br> "private_key_secret_name": "fleet-server-private-key",<br> "redis": {<br> "address": null,<br> "use_tls": true<br> },<br> "repository_credentials": "",<br> "security_group_name": "fleet",<br> "security_groups": null,<br> "service": {<br> "name": "fleet"<br> },<br> "sidecars": [],<br> "software_installers": {<br> "bucket_name": null,<br> "bucket_prefix": "fleet-software-installers-",<br> "create_bucket": true,<br> "s3_object_prefix": ""<br> },<br> "task_cpu": null,<br> "task_mem": null,<br> "volumes": []<br>}</pre> | no |
| <a name="input_migration_config"></a> [migration\_config](#input\_migration\_config) | The configuration object for Fleet's migration task. | <pre>object({<br> mem = number<br> cpu = number<br> })</pre> | <pre>{<br> "cpu": 1024,<br> "mem": 2048<br>}</pre> | no |
| <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | n/a | `string` | `null` | no |

Expand Down
4 changes: 2 additions & 2 deletions terraform/byo-vpc/byo-db/byo-ecs/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ variable "fleet_config" {
mem = optional(number, 4096)
cpu = optional(number, 512)
pid_mode = optional(string, null)
image = optional(string, "fleetdm/fleet:v4.54.1")
image = optional(string, "fleetdm/fleet:v4.54.2")
family = optional(string, "fleet")
sidecars = optional(list(any), [])
depends_on = optional(list(any), [])
Expand Down Expand Up @@ -120,7 +120,7 @@ variable "fleet_config" {
mem = 512
cpu = 256
pid_mode = null
image = "fleetdm/fleet:v4.54.1"
image = "fleetdm/fleet:v4.54.2"
family = "fleet"
sidecars = []
depends_on = []
Expand Down
4 changes: 2 additions & 2 deletions terraform/byo-vpc/byo-db/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ variable "fleet_config" {
mem = optional(number, 4096)
cpu = optional(number, 512)
pid_mode = optional(string, null)
image = optional(string, "fleetdm/fleet:v4.54.1")
image = optional(string, "fleetdm/fleet:v4.54.2")
family = optional(string, "fleet")
sidecars = optional(list(any), [])
depends_on = optional(list(any), [])
Expand Down Expand Up @@ -206,7 +206,7 @@ variable "fleet_config" {
mem = 512
cpu = 256
pid_mode = null
image = "fleetdm/fleet:v4.54.1"
image = "fleetdm/fleet:v4.54.2"
family = "fleet"
sidecars = []
depends_on = []
Expand Down
2 changes: 1 addition & 1 deletion terraform/byo-vpc/example/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ provider "aws" {
}

locals {
fleet_image = "fleetdm/fleet:v4.54.1"
fleet_image = "fleetdm/fleet:v4.54.2"
domain_name = "example.com"
}

Expand Down
4 changes: 2 additions & 2 deletions terraform/byo-vpc/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ variable "fleet_config" {
mem = optional(number, 4096)
cpu = optional(number, 512)
pid_mode = optional(string, null)
image = optional(string, "fleetdm/fleet:v4.54.1")
image = optional(string, "fleetdm/fleet:v4.54.2")
family = optional(string, "fleet")
sidecars = optional(list(any), [])
depends_on = optional(list(any), [])
Expand Down Expand Up @@ -299,7 +299,7 @@ variable "fleet_config" {
mem = 512
cpu = 256
pid_mode = null
image = "fleetdm/fleet:v4.54.1"
image = "fleetdm/fleet:v4.54.2"
family = "fleet"
sidecars = []
depends_on = []
Expand Down
4 changes: 2 additions & 2 deletions terraform/example/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ module "fleet" {

fleet_config = {
# To avoid pull-rate limiting from dockerhub, consider using our quay.io mirror
# for the Fleet image. e.g. "quay.io/fleetdm/fleet:v4.54.1"
image = "fleetdm/fleet:v4.54.1" # override default to deploy the image you desire
# for the Fleet image. e.g. "quay.io/fleetdm/fleet:v4.54.2"
image = "fleetdm/fleet:v4.54.2" # override default to deploy the image you desire
# See https://fleetdm.com/docs/deploy/reference-architectures#aws for appropriate scaling
# memory and cpu.
autoscaling = {
Expand Down
Loading

0 comments on commit fae0cb0

Please sign in to comment.