Skip to content

Commit

Permalink
Prepare for Fleet v4.12.1
Browse files Browse the repository at this point in the history
  • Loading branch information
zwass committed Apr 5, 2022
1 parent 12351bf commit 61b87a8
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 11 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* Fix non-SSO login bug when running Fleet with MySQL read replica/s.

## Fleet 4.12.0 (Mar 24, 2022)

* Add ability to update which platform (macOS, Windows, Linux) a policy is checked on.
Expand Down
1 change: 0 additions & 1 deletion changes/issue-4469-read-replica-non-sso-login

This file was deleted.

4 changes: 2 additions & 2 deletions charts/fleet/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ name: fleet
keywords:
- fleet
- osquery
version: v4.12.0
version: v4.12.1
home: https://github.com/fleetdm/fleet
sources:
- https://github.com/fleetdm/fleet.git
appVersion: v4.12.0
appVersion: v4.12.1
2 changes: 1 addition & 1 deletion charts/fleet/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.0 # Version of Fleet to deploy
imageTag: v4.12.1 # 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
Expand Down
6 changes: 3 additions & 3 deletions docs/Contributing/Releasing-Fleet.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Note: Please prefix versions with `fleet-v` (eg. `fleet-v4.0.0`) in git tags, He

Update version numbers in the relevant files:

- [package.json](https://github.com/fleetdm/fleet/blob/main/tools/fleetctl-npm/package.json) (do not yet `npm publish`)
- [Helm chart](https://github.com/fleetdm/fleet/blob/main/charts/fleet/Chart.yaml) and [values file](https://github.com/fleetdm/fleet/blob/main/charts/fleet/values.yaml)
- [Terraform variables](https://github.com/fleetdm/fleet/blob/main/tools/terraform/variables.tf)
- [fleetctl package.json](https://github.com/fleetdm/fleet/blob/main/tools/fleetctl-npm/package.json) (do not yet `npm publish`)
- [Helm chart.yaml](https://github.com/fleetdm/fleet/blob/main/charts/fleet/Chart.yaml) and [values file](https://github.com/fleetdm/fleet/blob/main/charts/fleet/values.yaml)
- Terraform variables ([AWS](https://github.com/fleetdm/fleet/blob/main/tools/terraform/variables.tf)/[GCP](https://github.com/fleetdm/fleet/blob/main/tools/terraform/gcp/variables.tf))

Commit these changes via Pull Request and pull the changes on the `main` branch locally. Check that
`HEAD` of the `main` branch points to the commit with these changes.
Expand Down
7 changes: 5 additions & 2 deletions tools/fleetctl-npm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fleetctl",
"version": "v4.12.0",
"version": "v4.12.1",
"description": "Installer for the fleetctl CLI tool",
"bin": {
"fleetctl": "./run.js"
Expand All @@ -20,5 +20,8 @@
"rimraf": "3.0.2",
"tar": "^6.1.9"
},
"keywords": ["osquery", "security"]
"keywords": [
"osquery",
"security"
]
}
2 changes: 1 addition & 1 deletion tools/terraform/gcp/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ variable "redis_mem" {
}

variable "image" {
default = "fleet:v4.12.0"
default = "fleet:v4.12.1"
}
2 changes: 1 addition & 1 deletion tools/terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ variable "database_name" {

variable "fleet_image" {
description = "the name of the container image to run"
default = "fleetdm/fleet:v4.12.0"
default = "fleetdm/fleet:v4.12.1"
}

variable "software_inventory" {
Expand Down

0 comments on commit 61b87a8

Please sign in to comment.