From d7b26be167f38d4610140ef6a324ce6e6ad8e6b2 Mon Sep 17 00:00:00 2001 From: Victor Lyuboslavsky Date: Tue, 19 Nov 2024 08:52:26 -0600 Subject: [PATCH] Removing delete-other-teams workaround, fixed in Fleet 4.59.0 (#58) --- .github/workflows/workflow.yml | 1 - README.md | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 053602c..2dffdd7 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -32,7 +32,6 @@ jobs: with: # Run GitOps in dry-run mode for pull requests. dry-run-only: ${{ github.event_name == 'pull_request' && 'true' || 'false' }} - # delete-other-teams: false # Add FLEET_URL and FLEET_API_TOKEN to the repository secrets. # In addition, specify or add secrets for all the environment variables that are mentioned in the global/team YAML files. env: diff --git a/README.md b/README.md index 4b91c1e..108ee8a 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,7 @@ This is the starter repository for using [Fleet](https://fleetdm.com) with a Git 3. Add `FLEET_GLOBAL_ENROLL_SECRET` secret to your new repository's secrets. The enroll secret must be an alphanumeric string of at least 32 and at most 255 characters. - If you have a Premium Fleet license, also add `FLEET_WORKSTATIONS_ENROLL_SECRET` and `FLEET_WORKSTATIONS_CANARY_ENROLL_SECRET`. - - If you do not have a Premium Fleet license, uncomment the following line in `.github/workflows/workflow.yml`: -```yaml - # delete-other-teams: false -``` + - If you do not have a Premium Fleet license, delete the `teams` directory. 4. In GitHub, enable the `Apply latest configuration to Fleet` GitHub Actions workflow, and run workflow manually. Now, when anyone pushes a new commit to the default branch, the action will run and update Fleet. For pull requests, the workflow will do a dry run only. @@ -24,9 +21,10 @@ This is the starter repository for using [Fleet](https://fleetdm.com) with a Git 2. Add `FLEET_URL` and `FLEET_API_TOKEN` as masked CI/CD variables. Learn how [here](https://docs.gitlab.com/ee/ci/variables/#define-a-cicd-variable-in-the-ui). Set `FLEET_URL` to your Fleet instance's URL (ex. https://organization.fleet.com). Set `FLEET_API_TOKEN` to an API token for an API-only user in Fleet. Learn how [here](https://fleetdm.com/docs/using-fleet/fleetctl-cli#create-api-only-user). 3. Add `FLEET_GLOBAL_ENROLL_SECRET` secret as a masked CI/CD variable. The enroll secret must be an alphanumeric string of at least 32 and at most 255 characters. - - If you have a Premium Fleet license, also add `FLEET_WORKSTATIONS_ENROLL_SECRET` and `FLEET_WORKSTATIONS_CANARY_ENROLL_SECRET`. + - If you have a Premium Fleet license, also add `FLEET_WORKSTATIONS_ENROLL_SECRET` and `FLEET_WORKSTATIONS_CANARY_ENROLL_SECRET`. + - If you do not have a Premium Fleet license, delete the `teams` directory. -5. Now, when anyone pushes a new commit to the default branch, the pipeline will run and update Fleet. For merge requests, the pipeline will do a dry run only. +4. Now, when anyone pushes a new commit to the default branch, the pipeline will run and update Fleet. For merge requests, the pipeline will do a dry run only. ## Configuration options