From f3b9bcc02ac89ed241cb397181dab20f525e6fdb Mon Sep 17 00:00:00 2001 From: Luke Heath Date: Thu, 10 Aug 2023 08:43:52 -0700 Subject: [PATCH] Prepare v4.35.1 (#13163) --- CHANGELOG.md | 6 ++++++ changes/13137-migration-fix | 1 - changes/13154-fix-host-details-custom-query-route | 1 - charts/fleet/Chart.yaml | 2 +- charts/fleet/values.yaml | 2 +- infrastructure/dogfood/terraform/aws/variables.tf | 2 +- infrastructure/dogfood/terraform/gcp/variables.tf | 2 +- infrastructure/sandbox/JITProvisioner/jitprovisioner.tf | 2 +- .../sandbox/PreProvisioner/lambda/deploy_terraform/main.tf | 2 +- tools/fleetctl-npm/package.json | 2 +- 10 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 changes/13137-migration-fix delete mode 100644 changes/13154-fix-host-details-custom-query-route diff --git a/CHANGELOG.md b/CHANGELOG.md index 834921d9db01..e24707f295f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## Fleet 4.35.1 (Aug 4, 2023) + +* Fixed a migration to account for columns with NULL values as a result of either creating schedules via the API without providing all values or by a race condition with database replicas. + +* Fixed a bug that occurred when a user tried to create a custom query from the "query" action on a host's details page. + ## Fleet 4.35.0 (Jul 31, 2023) * Combined the query and schedule features to provide a single interface for creating, scheduling, and tweaking queries at the global and team level. diff --git a/changes/13137-migration-fix b/changes/13137-migration-fix deleted file mode 100644 index 71a83c969ea5..000000000000 --- a/changes/13137-migration-fix +++ /dev/null @@ -1 +0,0 @@ -* Fixed a migration to account for columns with NULL values as a result of either creating schedules via the API without providing all values or by a race condition with database replicas. diff --git a/changes/13154-fix-host-details-custom-query-route b/changes/13154-fix-host-details-custom-query-route deleted file mode 100644 index ad3ce32d6ed3..000000000000 --- a/changes/13154-fix-host-details-custom-query-route +++ /dev/null @@ -1 +0,0 @@ -* Fixed a bug that occurred when a user tries to create a custom query from the "query" action on a host's details page. diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml index 4212b398b7b5..d0676b7899a1 100644 --- a/charts/fleet/Chart.yaml +++ b/charts/fleet/Chart.yaml @@ -8,4 +8,4 @@ version: v5.0.1 home: https://github.com/fleetdm/fleet sources: - https://github.com/fleetdm/fleet.git -appVersion: v4.35.0 +appVersion: v4.35.1 diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml index 440f61faa265..a5753258275c 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.35.0 # Version of Fleet to deploy +imageTag: v4.35.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 index 18c666cc5124..0d1fc8abffc6 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.35.0" + default = "fleetdm/fleet:v4.35.1" } variable "software_inventory" { diff --git a/infrastructure/dogfood/terraform/gcp/variables.tf b/infrastructure/dogfood/terraform/gcp/variables.tf index d269e6b27549..2720096b86ab 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.35.0" + default = "fleet:v4.35.1" } diff --git a/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf b/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf index 4baa36488675..585167b13882 100644 --- a/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf +++ b/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf @@ -206,7 +206,7 @@ resource "random_uuid" "jitprovisioner" { # Use the local to make the trigger work. locals { - fleet_tag = "v4.35.0" + fleet_tag = "v4.35.1" } resource "null_resource" "standard-query-library" { diff --git a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf index 138351cce1ec..9d51f86f726a 100644 --- a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf +++ b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf @@ -165,7 +165,7 @@ resource "helm_release" "main" { set { name = "imageTag" - value = "v4.35.0" + value = "v4.35.1" } set { diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json index c8fa2ad9ab21..9b1c9f9d76f4 100644 --- a/tools/fleetctl-npm/package.json +++ b/tools/fleetctl-npm/package.json @@ -1,6 +1,6 @@ { "name": "fleetctl", - "version": "v4.35.0", + "version": "v4.35.1", "description": "Installer for the fleetctl CLI tool", "bin": { "fleetctl": "./run.js"