From 64b6f748fec30626c01fef2555c94add0a6c3d9b Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Mon, 25 Apr 2022 14:54:25 -0700 Subject: [PATCH] Updates for Fleet 4.13.2 (#5361) Co-authored-by: Michal Nicpon --- CHANGELOG.md | 4 ++++ Makefile | 2 +- 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 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a88ff726..5008da909 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## Fleet 4.13.2 (Apr 25, 2022) + +* Fix a bug with os versions not being updated. Affected deployments using MySQL < 5.7.22 or equivalent AWS RDS Aurora < 2.10.1. + ## Fleet 4.13.1 (Apr 20, 2022) * Fixes an SSO login issue introduced in 4.13.0. diff --git a/Makefile b/Makefile index 75358e86f..620cfb1d9 100644 --- a/Makefile +++ b/Makefile @@ -258,7 +258,7 @@ e2e-serve-premium: e2e-reset-db ./build/fleet serve --dev_license --mysql_address=localhost:3307 --mysql_username=root --mysql_password=toor --mysql_database=e2e --server_address=0.0.0.0:8642 changelog: - sh -c "find changes -type file | grep -v .keep | xargs -I {} sh -c 'grep \"\S\" {}; echo' > new-CHANGELOG.md" + sh -c "find changes -type f | grep -v .keep | xargs -I {} sh -c 'grep \"\S\" {}; echo' > new-CHANGELOG.md" sh -c "cat new-CHANGELOG.md CHANGELOG.md > tmp-CHANGELOG.md && rm new-CHANGELOG.md && mv tmp-CHANGELOG.md CHANGELOG.md" sh -c "git rm changes/*" diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml index 0ffcbb124..96f0ab49f 100644 --- a/charts/fleet/Chart.yaml +++ b/charts/fleet/Chart.yaml @@ -4,8 +4,8 @@ name: fleet keywords: - fleet - osquery -version: v4.13.1 +version: v4.13.2 home: https://github.com/fleetdm/fleet sources: - https://github.com/fleetdm/fleet.git -appVersion: v4.13.1 +appVersion: v4.13.2 diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml index af50c3b02..ec32f521c 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.13.1 # Version of Fleet to deploy +imageTag: v4.13.2 # Version of Fleet to deploy createIngress: true # Whether or not to automatically create an Ingress ingressAnnotations: {} # Additional annotation to add to the Ingress podAnnotations: {} # Additional annotations to add to the Fleet pod diff --git a/infrastructure/dogfood/terraform/aws/variables.tf b/infrastructure/dogfood/terraform/aws/variables.tf index b924cf408..ae5d9fb77 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.13.1" + default = "fleetdm/fleet:v4.13.2" } variable "software_inventory" { diff --git a/infrastructure/dogfood/terraform/gcp/variables.tf b/infrastructure/dogfood/terraform/gcp/variables.tf index 90eb3b863..6fb615816 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.13.1" + default = "fleet:v4.13.2" } diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json index 4028fff39..cc9c495d8 100644 --- a/tools/fleetctl-npm/package.json +++ b/tools/fleetctl-npm/package.json @@ -1,6 +1,6 @@ { "name": "fleetctl", - "version": "v4.13.1", + "version": "v4.13.2", "description": "Installer for the fleetctl CLI tool", "bin": { "fleetctl": "./run.js"