Adding changes for patch 4.49.1

georgekarrv · georgekarrv · commit 5c5d4972ffe0 · 2024-04-26T10:28:47.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Fleet 4.49.1 (Apr 26, 2024)
+
+### Bug fixes
+
+* Fixed a bug that prevented the Fleet server from starting if Windows MDM was configured but Apple MDM wasn't.
+
 ## Fleet 4.49.0 (Apr 24, 2024)
 
 ### Endpoint operations
diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml
@@ -8,7 +8,7 @@ version: v6.0.2
 home: https://github.com/fleetdm/fleet
 sources:
   - https://github.com/fleetdm/fleet.git
-appVersion: v4.49.0
+appVersion: v4.49.1
 dependencies:
   - name: mysql
     condition: mysql.enabled
diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml
@@ -2,7 +2,7 @@
 # All settings related to how Fleet is deployed in Kubernetes
 hostName: fleet.localhost
 replicas: 3 # The number of Fleet instances to deploy
-imageTag: v4.49.0 # Version of Fleet to deploy
+imageTag: v4.49.1 # 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:
diff --git a/infrastructure/dogfood/terraform/aws/variables.tf b/infrastructure/dogfood/terraform/aws/variables.tf
@@ -56,7 +56,7 @@ variable "database_name" {
 
 variable "fleet_image" {
   description = "the name of the container image to run"
-  default     = "fleetdm/fleet:v4.49.0"
+  default     = "fleetdm/fleet:v4.49.1"
 }
 
 variable "software_inventory" {
diff --git a/infrastructure/dogfood/terraform/gcp/variables.tf b/infrastructure/dogfood/terraform/gcp/variables.tf
@@ -68,5 +68,5 @@ variable "redis_mem" {
 }
 
 variable "image" {
-  default = "fleet:v4.49.0"
+  default = "fleet:v4.49.1"
 }
diff --git a/terraform/README.md b/terraform/README.md
diff --git a/terraform/byo-vpc/README.md b/terraform/byo-vpc/README.md
diff --git a/terraform/byo-vpc/byo-db/byo-ecs/variables.tf b/terraform/byo-vpc/byo-db/byo-ecs/variables.tf
@@ -13,7 +13,7 @@ variable "fleet_config" {
   type = object({
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
-    image                        = optional(string, "fleetdm/fleet:v4.49.0")
+    image                        = optional(string, "fleetdm/fleet:v4.49.1")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
diff --git a/terraform/byo-vpc/byo-db/variables.tf b/terraform/byo-vpc/byo-db/variables.tf
@@ -74,7 +74,7 @@ variable "fleet_config" {
   type = object({
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
-    image                        = optional(string, "fleetdm/fleet:v4.49.0")
+    image                        = optional(string, "fleetdm/fleet:v4.49.1")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
diff --git a/terraform/byo-vpc/example/main.tf b/terraform/byo-vpc/example/main.tf
@@ -17,7 +17,7 @@ provider "aws" {
 }
 
 locals {
-  fleet_image = "fleetdm/fleet:v4.49.0"
+  fleet_image = "fleetdm/fleet:v4.49.1"
   domain_name = "example.com"
 }
 
diff --git a/terraform/byo-vpc/variables.tf b/terraform/byo-vpc/variables.tf
@@ -167,7 +167,7 @@ variable "fleet_config" {
   type = object({
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
-    image                        = optional(string, "fleetdm/fleet:v4.49.0")
+    image                        = optional(string, "fleetdm/fleet:v4.49.1")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
diff --git a/terraform/example/main.tf b/terraform/example/main.tf
@@ -59,8 +59,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.49.0"
-    image = "fleetdm/fleet:v4.49.0" # override default to deploy the image you desire
+    # for the Fleet image. e.g. "quay.io/fleetdm/fleet:v4.49.1"
+    image = "fleetdm/fleet:v4.49.1" # override default to deploy the image you desire
     # See https://fleetdm.com/docs/deploy/reference-architectures#aws for appropriate scaling
     # memory and cpu.
     autoscaling = {
diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -215,7 +215,7 @@ variable "fleet_config" {
   type = object({
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
-    image                        = optional(string, "fleetdm/fleet:v4.49.0")
+    image                        = optional(string, "fleetdm/fleet:v4.49.1")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleetctl",
-  "version": "v4.49.0",
+  "version": "v4.49.1",
   "description": "Installer for the fleetctl CLI tool",
   "bin": {
     "fleetctl": "./run.js"

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ variable "database_name" {`
`56`	`56`
`57`	`57`	`variable "fleet_image" {`
`58`	`58`	`description = "the name of the container image to run"`
`59`		`- default = "fleetdm/fleet:v4.49.0"`
	`59`	`+ default = "fleetdm/fleet:v4.49.1"`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`variable "software_inventory" {`
Original file line number	Diff line number	Diff line change
`@@ -68,5 +68,5 @@ variable "redis_mem" {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`variable "image" {`
`71`		`- default = "fleet:v4.49.0"`
	`71`	`+ default = "fleet:v4.49.1"`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ provider "aws" {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`locals {`
`20`		`- fleet_image = "fleetdm/fleet:v4.49.0"`
	`20`	`+ fleet_image = "fleetdm/fleet:v4.49.1"`
`21`	`21`	`domain_name = "example.com"`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "fleetctl",`
`3`		`- "version": "v4.49.0",`
	`3`	`+ "version": "v4.49.1",`
`4`	`4`	`"description": "Installer for the fleetctl CLI tool",`
`5`	`5`	`"bin": {`
`6`	`6`	`"fleetctl": "./run.js"`