Revert these PRs: (#13001)

https://github.com/fleetdm/fleet/pull/12763/files
https://github.com/fleetdm/fleet/pull/12854/files
https://github.com/fleetdm/fleet/pull/12764/files

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

- [ ] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [ ] Documented any API changes (docs/Using-Fleet/REST-API.md or
docs/Contributing/API-for-contributors.md)
- [ ] Documented any permissions changes
- [ ] Input data is properly validated, `SELECT *` is avoided, SQL
injection is prevented (using placeholders for values in statements)
- [ ] Added support on fleet's osquery simulator `cmd/osquery-perf` for
new osquery data ingestion features.
- [ ] Added/updated tests
- [ ] Manual QA for all new/changed functionality
  - For Orbit and Fleet Desktop changes:
- [ ] Manual QA must be performed in the three main OSs, macOS, Windows
and Linux.
- [ ] Auto-update manual QA, from released version of component to new
version (see [tools/tuf/test](../tools/tuf/test/README.md)).
This commit is contained in:
Zachary Winnerman 2023-07-27 14:57:11 -04:00 committed by GitHub
parent 64f0198cce
commit fc7c7544a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 13 deletions

View File

@ -6,7 +6,7 @@ import (
"log"
"os"
"os/exec"
"time"
//"time"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
@ -66,6 +66,7 @@ func deleteIngress(id, name, ddbTable string) {
log.Fatal(err)
}
/*
// Delete the cronjob so we don't spam the database for stuff that's not running
err = clientset.BatchV1().CronJobs("default").Delete(context.Background(), id, v1.DeleteOptions{})
if err != nil {
@ -85,6 +86,7 @@ func deleteIngress(id, name, ddbTable string) {
if err != nil {
log.Fatal(err)
}
*/
svc := dynamodb.New(sess)
err = updateFleetInstanceState(id, ddbTable, svc)

View File

@ -14,6 +14,7 @@ spec:
# see https://docs.google.com/document/d/1-4KmOlgfGEksNZnQo79a9nRLgM_i7ar2qovoZO3s_6g/edit.
concurrencyPolicy: Forbid
schedule: "{{ .Values.crons.vulnerabilities }}"
suspend: true
# EKS Fargate keeps resources running to show the job history.
# This saves significantly on compute in AWS.
# https://docs.google.com/document/d/1-4KmOlgfGEksNZnQo79a9nRLgM_i7ar2qovoZO3s_6g/edit
@ -35,10 +36,10 @@ spec:
resources:
limits:
cpu: {{ .Values.resources.limits.cpu }}
memory: "2Gi"
memory: {{ .Values.resources.limits.memory }}
requests:
cpu: {{ .Values.resources.requests.cpu }}
memory: "2Gi"
memory: {{ .Values.resources.requests.memory }}
env:
## BEGIN FLEET SECTION
- name: FLEET_SERVER_SANDBOX_ENABLED

View File

@ -212,16 +212,6 @@ resource "helm_release" "main" {
name = "apm.token"
value = var.apm_token
}
set {
name = "resources.limits.memory"
value = "512Mi"
}
set {
name = "resources.requests.memory"
value = "512Mi"
}
}
data "aws_iam_policy_document" "main" {