From feaf46a55a029fcf08f01bd14bebe89c5807c52d Mon Sep 17 00:00:00 2001
From: Roberto Dip <me@roperzh.com>
Date: Fri, 28 Oct 2022 12:24:30 -0300
Subject: [PATCH] cherry-pick changes from fleet-v4.22.1 (#8481)

---
 CHANGELOG.md                                      | 4 ++++
 charts/fleet/Chart.yaml                           | 1 -
 charts/fleet/values.yaml                          | 2 +-
 docs/Deploying/Server-Installation.md             | 2 +-
 infrastructure/dogfood/terraform/aws/variables.tf | 2 +-
 infrastructure/dogfood/terraform/gcp/variables.tf | 2 +-
 tools/fleetctl-npm/package.json                   | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1228b95d0..4c9eacf796 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Fleet 4.22.1 (Oct 27, 2022)
+
+* Fixed the error response of the `/device/:token/desktop` endpoint causing problems on free Fleet Desktop instances on versions `1.3.x`.
+
 ## Fleet 4.22.0 (Oct 20, 2022)
 
 * Added usage statistics for the weekly count of aggregate policy violation days. One policy violation day is counted for each policy that a host is failing, measured as of the time the count increments. The count increments once per 24-hour interval and resets each week.
diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml
index 8f21c2b247..263cac957c 100644
--- a/charts/fleet/Chart.yaml
+++ b/charts/fleet/Chart.yaml
@@ -9,4 +9,3 @@ home: https://github.com/fleetdm/fleet
 sources:
   - https://github.com/fleetdm/fleet.git
 appVersion: v5.0.0
-
diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml
index 26b54b1e14..28adef9de0 100644
--- 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.22.0 # Version of Fleet to deploy
+imageTag: v4.22.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/docs/Deploying/Server-Installation.md b/docs/Deploying/Server-Installation.md
index 2288b4943f..60c4645f9d 100644
--- a/docs/Deploying/Server-Installation.md
+++ b/docs/Deploying/Server-Installation.md
@@ -264,7 +264,7 @@ spec:
     spec:
       containers:
       - name: fleet
-        image: fleetdm/fleet:4.22.0
+        image: fleetdm/fleet:4.22.1
         env:
           # if running Fleet behind external ingress controller that terminates TLS
           - name: FLEET_SERVER_TLS
diff --git a/infrastructure/dogfood/terraform/aws/variables.tf b/infrastructure/dogfood/terraform/aws/variables.tf
index d3e2521022..27d52b063f 100644
--- 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.22.0"
+  default     = "fleetdm/fleet:v4.22.1"
 }
 
 variable "software_inventory" {
diff --git a/infrastructure/dogfood/terraform/gcp/variables.tf b/infrastructure/dogfood/terraform/gcp/variables.tf
index 3c40f16ca5..66c6ee999b 100644
--- 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.22.0"
+  default = "fleet:v4.22.1"
 }
diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json
index f852ad933e..f41a5e6b8e 100644
--- a/tools/fleetctl-npm/package.json
+++ b/tools/fleetctl-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleetctl",
-  "version": "v4.22.0",
+  "version": "v4.22.1",
   "description": "Installer for the fleetctl CLI tool",
   "bin": {
     "fleetctl": "./run.js"