From 4b9f84190236eb656eef2e84d70a3f386eb00fce Mon Sep 17 00:00:00 2001 From: ramanan-ravi Date: Mon, 25 Mar 2024 22:28:13 +0530 Subject: [PATCH] Fix docker compose --- deepfence_server/auth/policy.csv | 1 + deepfence_worker/cronjobs/agent.go | 2 +- deepfence_worker/ingesters/cloud_resource.go | 3 +-- deployment-scripts/docker-compose.yml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deepfence_server/auth/policy.csv b/deepfence_server/auth/policy.csv index 88d86868f6..bbf2d289e2 100644 --- a/deepfence_server/auth/policy.csv +++ b/deepfence_server/auth/policy.csv @@ -36,6 +36,7 @@ p, standard-user, cloud-report, ingest p, admin, cloud-node, register p, admin, cloud-node, write p, admin, cloud-node, read +p, admin, cloud-node, update p, standard-user, cloud-node, register p, standard-user, cloud-node, write p, standard-user, cloud-node, read diff --git a/deepfence_worker/cronjobs/agent.go b/deepfence_worker/cronjobs/agent.go index 4478de0459..0e81d3afa7 100644 --- a/deepfence_worker/cronjobs/agent.go +++ b/deepfence_worker/cronjobs/agent.go @@ -28,7 +28,7 @@ type ListingFormat struct { } `json:"available"` } -const DefaultConsoleVersion = "v2.1.1" +const DefaultConsoleVersion = "v2.2.0" var ConsoleVersion string diff --git a/deepfence_worker/ingesters/cloud_resource.go b/deepfence_worker/ingesters/cloud_resource.go index c4706396c2..dfdef4bb3c 100644 --- a/deepfence_worker/ingesters/cloud_resource.go +++ b/deepfence_worker/ingesters/cloud_resource.go @@ -20,7 +20,6 @@ const ( AwsEc2ResourceId = "aws_ec2_instance" GcpComputeResourceId = "gcp_compute_instance" AzureComputeResourceId = "azure_compute_virtual_machine" - DeepfenceVersion = "2.1.1" ) func CommitFuncCloudResource(ctx context.Context, ns string, cs []ingestersUtil.CloudResource) error { @@ -150,7 +149,7 @@ func ResourceToMaps(ms []ingestersUtil.CloudResource) ([]map[string]interface{}, "active": true, "cloud_provider": v.CloudProvider, "agent_running": false, - "version": DeepfenceVersion, + "version": "", "instance_id": newmap["node_id"], "host_name": v.Name, "node_id": v.Name, diff --git a/deployment-scripts/docker-compose.yml b/deployment-scripts/docker-compose.yml index a23ac402e8..60391dbc0a 100644 --- a/deployment-scripts/docker-compose.yml +++ b/deployment-scripts/docker-compose.yml @@ -46,10 +46,10 @@ x-telemetry-variables: &telemetry-variables x-proxy-variables: &proxy-variables # use below variables to set http/s proxy env - # http_proxy: "" - # https_proxy: "" + http_proxy: "" + https_proxy: "" # no need to proxy internal services - # no_proxy: "127.0.0.1,localhost,deepfence-file-server,deepfence-postgres,deepfence-redis,deepfence-neo4j,deepfence-kafka-broker,deepfence-ui,deepfence-server,deepfence-router" + no_proxy: "127.0.0.1,localhost,deepfence-file-server,deepfence-postgres,deepfence-redis,deepfence-neo4j,deepfence-kafka-broker,deepfence-ui,deepfence-server,deepfence-router" services: