Skip to content

Commit d7b26be

Browse files
authored
Removing delete-other-teams workaround, fixed in Fleet 4.59.0 (#58)
1 parent 9bf5f27 commit d7b26be

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

.github/workflows/workflow.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
with:
3333
# Run GitOps in dry-run mode for pull requests.
3434
dry-run-only: ${{ github.event_name == 'pull_request' && 'true' || 'false' }}
35-
# delete-other-teams: false
3635
# Add FLEET_URL and FLEET_API_TOKEN to the repository secrets.
3736
# In addition, specify or add secrets for all the environment variables that are mentioned in the global/team YAML files.
3837
env:

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ This is the starter repository for using [Fleet](https://fleetdm.com) with a Git
1010

1111
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.
1212
- If you have a Premium Fleet license, also add `FLEET_WORKSTATIONS_ENROLL_SECRET` and `FLEET_WORKSTATIONS_CANARY_ENROLL_SECRET`.
13-
- If you do not have a Premium Fleet license, uncomment the following line in `.github/workflows/workflow.yml`:
14-
```yaml
15-
# delete-other-teams: false
16-
```
13+
- If you do not have a Premium Fleet license, delete the `teams` directory.
1714

1815
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.
1916

@@ -24,9 +21,10 @@ This is the starter repository for using [Fleet](https://fleetdm.com) with a Git
2421
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).
2522

2623
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.
27-
- If you have a Premium Fleet license, also add `FLEET_WORKSTATIONS_ENROLL_SECRET` and `FLEET_WORKSTATIONS_CANARY_ENROLL_SECRET`.
24+
- If you have a Premium Fleet license, also add `FLEET_WORKSTATIONS_ENROLL_SECRET` and `FLEET_WORKSTATIONS_CANARY_ENROLL_SECRET`.
25+
- If you do not have a Premium Fleet license, delete the `teams` directory.
2826

29-
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.
27+
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.
3028

3129
## Configuration options
3230

0 commit comments

Comments
 (0)