From 076fe894c5ee97ff1cb8612cddd1a07b7eb92b7d Mon Sep 17 00:00:00 2001
From: George Karr <georgekarrv@users.noreply.github.com>
Date: Thu, 20 Feb 2025 10:02:42 -0600
Subject: [PATCH] Adding changes for Fleet v4.63.1 (#26471)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de84732b1b..1fc3604b2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Fleet 4.63.1 (Feb 19, 2025)
+
+### Bug fixes
+
+- Fixed an issue where the abm token teams were being reset when making updates to the app config
+
 ## Fleet 4.63.0 (Feb 03, 2025)
 
 ## Device management (MDM)
diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml
index fd2afcb95a..47aca91dad 100644
--- a/charts/fleet/Chart.yaml
+++ b/charts/fleet/Chart.yaml
@@ -4,11 +4,11 @@ name: fleet
 keywords:
   - fleet
   - osquery
-version: v6.4.0
+version: v6.4.2
 home: https://github.com/fleetdm/fleet
 sources:
   - https://github.com/fleetdm/fleet.git
-appVersion: v4.63.0
+appVersion: v4.63.1
 dependencies:
   - name: mysql
     condition: mysql.enabled
diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml
index 1b0f8d7498..b5c5caf723 100644
--- a/charts/fleet/values.yaml
+++ b/charts/fleet/values.yaml
@@ -3,7 +3,7 @@
 hostName: fleet.localhost
 replicas: 3 # The number of Fleet instances to deploy
 imageRepository: fleetdm/fleet
-imageTag: v4.63.0 # Version of Fleet to deploy
+imageTag: v4.63.1 # Version of Fleet to deploy
 podAnnotations: {} # Additional annotations to add to the Fleet pod
 serviceAnnotations: {} # Additional annotations to add to the Fleet service
 serviceAccountAnnotations: {} # Additional annotations to add to the Fleet service account
diff --git a/infrastructure/dogfood/terraform/aws/variables.tf b/infrastructure/dogfood/terraform/aws/variables.tf
index de092235df..8cfabe2da5 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.63.0"
+  default     = "fleetdm/fleet:v4.63.1"
 
 variable "software_inventory" {
   description = "enable/disable software inventory (default is enabled)"
diff --git a/infrastructure/dogfood/terraform/gcp/variables.tf b/infrastructure/dogfood/terraform/gcp/variables.tf
index 93b6de606a..6ef93a98c8 100644
--- a/infrastructure/dogfood/terraform/gcp/variables.tf
+++ b/infrastructure/dogfood/terraform/gcp/variables.tf
@@ -68,7 +68,7 @@ variable "redis_mem" {
 }
 
 variable "image" {
-  default = "fleetdm/fleet:v4.63.0"
+  default = "fleetdm/fleet:v4.63.1"
 }
 
 variable "software_installers_bucket_name" {
diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json
index 032e46a9c5..48be23a2f0 100644
--- a/tools/fleetctl-npm/package.json
+++ b/tools/fleetctl-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleetctl",
-  "version": "v4.63.0",
+  "version": "v4.63.1",
   "description": "Installer for the fleetctl CLI tool",
   "bin": {
     "fleetctl": "./run.js"