diff --git a/Makefile b/Makefile index 617ddf9cea..d3e6a2bcf6 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ export DEEPFENCE_FARGATE_DIR=$(DEEPFENCE_AGENT_DIR)/agent-binary export IMAGE_REPOSITORY?=quay.io/deepfenceio export DF_IMG_TAG?=latest export IS_DEV_BUILD?=false -export VERSION?=2.2.0 +export VERSION?=2.2.1 export AGENT_BINARY_BUILD=$(DEEPFENCE_FARGATE_DIR)/build export AGENT_BINARY_BUILD_RELATIVE=deepfence_agent/agent-binary/build export AGENT_BINARY_DIST=$(DEEPFENCE_FARGATE_DIR)/dist diff --git a/deployment-scripts/docker-compose.yml b/deployment-scripts/docker-compose.yml index 1260e8f3da..7910a5ca42 100644 --- a/deployment-scripts/docker-compose.yml +++ b/deployment-scripts/docker-compose.yml @@ -57,7 +57,7 @@ services: deepfence-postgres: container_name: deepfence-postgres - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_postgres_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_postgres_ce:${DF_IMG_TAG:-2.2.1} ulimits: core: 0 restart: unless-stopped @@ -72,7 +72,7 @@ services: deepfence-redis: container_name: deepfence-redis - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_redis_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_redis_ce:${DF_IMG_TAG:-2.2.1} ulimits: core: 0 restart: unless-stopped @@ -87,7 +87,7 @@ services: deepfence-neo4j: container_name: deepfence-neo4j - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_neo4j_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_neo4j_ce:${DF_IMG_TAG:-2.2.1} ulimits: core: 0 @@ -118,7 +118,7 @@ services: deepfence-console-agent: container_name: deepfence-console-agent - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_agent_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_agent_ce:${DF_IMG_TAG:-2.2.1} ulimits: core: 0 deploy: @@ -151,7 +151,7 @@ services: deepfence-router: container_name: deepfence-router - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_router_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_router_ce:${DF_IMG_TAG:-2.2.1} ulimits: core: 0 networks: @@ -173,7 +173,7 @@ services: # this service can be commented in case S3 or external file server is used deepfence-file-server: container_name: deepfence-file-server - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_file_server_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_file_server_ce:${DF_IMG_TAG:-2.2.1} ulimits: core: 0 networks: @@ -195,7 +195,7 @@ services: deepfence-server: container_name: deepfence-server - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_server_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_server_ce:${DF_IMG_TAG:-2.2.1} ulimits: core: 0 tmpfs: @@ -225,7 +225,7 @@ services: deepfence-worker: container_name: deepfence-worker - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_worker_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_worker_ce:${DF_IMG_TAG:-2.2.1} ulimits: core: 0 restart: unless-stopped @@ -247,7 +247,7 @@ services: # deepfence-worker-2: # container_name: deepfence-worker-2 - # image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_worker_ce:${DF_IMG_TAG:-2.2.0} + # image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_worker_ce:${DF_IMG_TAG:-2.2.1} # ulimits: # core: 0 # restart: unless-stopped @@ -268,7 +268,7 @@ services: # deepfence-worker-3: # container_name: deepfence-worker-3 - # image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_worker_ce:${DF_IMG_TAG:-2.2.0} + # image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_worker_ce:${DF_IMG_TAG:-2.2.1} # ulimits: # core: 0 # restart: unless-stopped @@ -289,7 +289,7 @@ services: deepfence-scheduler: container_name: deepfence-scheduler - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_worker_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_worker_ce:${DF_IMG_TAG:-2.2.1} ulimits: core: 0 restart: unless-stopped @@ -311,7 +311,7 @@ services: deepfence-ui: container_name: deepfence-ui - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_ui_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_ui_ce:${DF_IMG_TAG:-2.2.1} ulimits: core: 0 networks: @@ -325,7 +325,7 @@ services: max-size: "100m" deepfence-kafka-broker: - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_kafka_broker_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_kafka_broker_ce:${DF_IMG_TAG:-2.2.1} hostname: deepfence-kafka-broker container_name: deepfence-kafka-broker # environment: @@ -344,7 +344,7 @@ services: restart: unless-stopped deepfence-ingester: - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_worker_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_worker_ce:${DF_IMG_TAG:-2.2.1} hostname: deepfence-ingester container_name: deepfence-ingester ports: @@ -363,7 +363,7 @@ services: restart: unless-stopped deepfence-telemetry: - image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_telemetry_ce:${DF_IMG_TAG:-2.2.0} + image: ${IMAGE_REPOSITORY:-quay.io/deepfenceio}/deepfence_telemetry_ce:${DF_IMG_TAG:-2.2.1} hostname: deepfence-telemetry container_name: deepfence-telemetry ports: diff --git a/deployment-scripts/helm-charts/deepfence-agent/Chart.yaml b/deployment-scripts/helm-charts/deepfence-agent/Chart.yaml index 981936128c..72c19b60fe 100644 --- a/deployment-scripts/helm-charts/deepfence-agent/Chart.yaml +++ b/deployment-scripts/helm-charts/deepfence-agent/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.2.0 +version: 2.2.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 2.2.0 \ No newline at end of file +appVersion: 2.2.1 \ No newline at end of file diff --git a/deployment-scripts/helm-charts/deepfence-agent/values.yaml b/deployment-scripts/helm-charts/deepfence-agent/values.yaml index 454c27551a..5017c06e29 100644 --- a/deployment-scripts/helm-charts/deepfence-agent/values.yaml +++ b/deployment-scripts/helm-charts/deepfence-agent/values.yaml @@ -11,7 +11,7 @@ commonLabels: {} global: # this image tag is used every where for agents # to override set tag at agents level - imageTag: 2.2.0 + imageTag: 2.2.1 imagePullSecret: # Specifies whether a image pull secret should be created @@ -28,7 +28,7 @@ imagePullSecret: agent: image: name: quay.io/deepfenceio/deepfence_agent_ce - # tag: 2.2.0 + # tag: 2.2.1 pullPolicy: Always affinity: {} podLabels: {} @@ -52,7 +52,7 @@ agent: cluster_agent: image: name: quay.io/deepfenceio/deepfence_cluster_agent_ce - # tag: 2.2.0 + # tag: 2.2.1 pullPolicy: Always affinity: {} podLabels: {} diff --git a/deployment-scripts/helm-charts/deepfence-console/Chart.yaml b/deployment-scripts/helm-charts/deepfence-console/Chart.yaml index 3b6053741d..f8b2090566 100644 --- a/deployment-scripts/helm-charts/deepfence-console/Chart.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: deepfence-console description: A Helm chart for Kubernetes type: application -version: 2.2.0 -appVersion: 2.2.0 +version: 2.2.1 +appVersion: 2.2.1 diff --git a/deployment-scripts/helm-charts/deepfence-console/values.yaml b/deployment-scripts/helm-charts/deepfence-console/values.yaml index 1461a23045..48ab226f2c 100644 --- a/deployment-scripts/helm-charts/deepfence-console/values.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/values.yaml @@ -13,7 +13,7 @@ global: # imageRepoPrefix: "docker.io" # this image tag is used everywhere for console services # to override set tag at service level - imageTag: 2.2.0 + imageTag: 2.2.1 storageClass: "" serviceAccount: @@ -55,7 +55,7 @@ kafka: repository: deepfenceio/deepfence_kafka_broker_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 config: # required, recommended to generate new UUID using kafka-storage tool STORAGE_UUID: hNQ55qppT5GGybF52ZGlOQ @@ -93,7 +93,7 @@ postgres: repository: deepfenceio/deepfence_postgres_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 storageClass: "" volumeSize: 50G resources: @@ -122,7 +122,7 @@ redis: repository: deepfenceio/deepfence_redis_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 storageClass: "" volumeSize: 30G resources: @@ -161,7 +161,7 @@ fileserver: repository: deepfenceio/deepfence_file_server_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 storageClass: "" volumeSize: 100G resources: @@ -222,7 +222,7 @@ neo4j: image: repository: deepfenceio/deepfence_neo4j_ce pullPolicy: Always - # tag: 2.2.0 + # tag: 2.2.1 storageClass: "" volumeSize: 100G resources: @@ -276,7 +276,7 @@ router: repository: deepfenceio/deepfence_router_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 forceHttpsRedirect: true # used to in service name generation # ..svc. @@ -342,7 +342,7 @@ server: repository: deepfenceio/deepfence_server_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 podAnnotations: {} podSecurityContext: {} securityContext: {} @@ -374,7 +374,7 @@ worker: repository: deepfenceio/deepfence_worker_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 podAnnotations: {} podSecurityContext: {} securityContext: {} @@ -405,7 +405,7 @@ ingester: repository: deepfenceio/deepfence_worker_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 podAnnotations: {} podSecurityContext: {} securityContext: {} @@ -435,7 +435,7 @@ scheduler: repository: deepfenceio/deepfence_worker_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 service: type: ClusterIP port: 8080 @@ -460,7 +460,7 @@ ui: repository: deepfenceio/deepfence_ui_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 service: type: ClusterIP port: 8081 @@ -509,7 +509,7 @@ console_agents: repository: deepfenceio/deepfence_agent_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 resources: requests: cpu: 150m @@ -533,7 +533,7 @@ console_agents: repository: deepfenceio/deepfence_cluster_agent_ce pullPolicy: Always # Overrides the image tag whose default is .global.imageTag - # tag: 2.2.0 + # tag: 2.2.1 resources: requests: cpu: 25m diff --git a/deployment-scripts/helm-charts/deepfence-router/Chart.yaml b/deployment-scripts/helm-charts/deepfence-router/Chart.yaml index 1dfd9f4694..d963569c4f 100644 --- a/deployment-scripts/helm-charts/deepfence-router/Chart.yaml +++ b/deployment-scripts/helm-charts/deepfence-router/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: 2.2.0 +appVersion: 2.2.1 description: Deepfence Router - Helm chart for Kubernetes name: deepfence-router type: application -version: 2.2.0 +version: 2.2.1 diff --git a/deployment-scripts/helm-charts/index.yaml b/deployment-scripts/helm-charts/index.yaml index aa5b223561..255d0f830c 100644 --- a/deployment-scripts/helm-charts/index.yaml +++ b/deployment-scripts/helm-charts/index.yaml @@ -1,6 +1,16 @@ apiVersion: v1 entries: deepfence-agent: + - apiVersion: v2 + appVersion: 2.2.1 + created: "2024-05-09T16:45:43.903779+05:30" + description: Deepfence Agent - Helm chart for Kubernetes + digest: 0b1b25f2684956ee73cf372372fe84fcba51ec8e73fe7e10644b64517064dcad + name: deepfence-agent + type: application + urls: + - deepfence-agent-2.2.1.tgz + version: 2.2.1 - apiVersion: v2 appVersion: 2.2.0 created: "2024-04-30T15:34:03.692317+05:30" @@ -262,9 +272,19 @@ entries: - deepfence-agent-1.0.0.tgz version: 1.0.0 deepfence-console: + - apiVersion: v2 + appVersion: 2.2.1 + created: "2024-05-09T16:45:43.906664+05:30" + description: A Helm chart for Kubernetes + digest: aea9b7a9b263a2707809898e0b7cd31005e52218813496c08a47f7dc7e78d844 + name: deepfence-console + type: application + urls: + - deepfence-console-2.2.1.tgz + version: 2.2.1 - apiVersion: v2 appVersion: 2.2.0 - created: "2024-05-09T16:06:18.594892+05:30" + created: "2024-05-09T16:45:43.905391+05:30" description: A Helm chart for Kubernetes digest: 89d2e4e72a4a1bba4f2b5a781771e9c663cf9ed69da474f182158e14da584f62 name: deepfence-console @@ -533,6 +553,16 @@ entries: - deepfence-console-1.0.0.tgz version: 1.0.0 deepfence-router: + - apiVersion: v2 + appVersion: 2.2.1 + created: "2024-05-09T16:45:43.906973+05:30" + description: Deepfence Router - Helm chart for Kubernetes + digest: e2be7bc533da973b3bb985330423cffd65f5fb25a64f7a4df83e2697828b1829 + name: deepfence-router + type: application + urls: + - deepfence-router-2.2.1.tgz + version: 2.2.1 - apiVersion: v2 appVersion: 2.2.0 created: "2024-04-30T15:34:03.694205+05:30" @@ -693,4 +723,4 @@ entries: urls: - deepfence-router-1.0.0.tgz version: 1.0.0 -generated: "2024-05-09T16:06:18.593301+05:30" +generated: "2024-05-09T16:45:43.903232+05:30" diff --git a/deployment-scripts/start-agent.sh b/deployment-scripts/start-agent.sh index c8ece36857..26d4ae775f 100755 --- a/deployment-scripts/start-agent.sh +++ b/deployment-scripts/start-agent.sh @@ -113,7 +113,7 @@ start_agent() { -e DEEPFENCE_KEY="$DEEPFENCE_KEY" \ -e DF_USE_DUMMY_SCOPE="$DF_USE_DUMMY_SCOPE" \ -e DF_USE_FAT_DUMMY_SCOPE="$DF_USE_FAT_DUMMY_SCOPE" \ - "$IMAGE_REPOSITORY"/deepfence_agent_ce:"${DF_IMG_TAG:-2.2.0}" + "$IMAGE_REPOSITORY"/deepfence_agent_ce:"${DF_IMG_TAG:-2.2.1}" } main() { diff --git a/deployment-scripts/start-podman-agent.sh b/deployment-scripts/start-podman-agent.sh index 4ed09f7142..1a4037abad 100755 --- a/deployment-scripts/start-podman-agent.sh +++ b/deployment-scripts/start-podman-agent.sh @@ -111,7 +111,7 @@ start_agent() { -e DEEPFENCE_KEY="$DEEPFENCE_KEY" \ -e DF_USE_DUMMY_SCOPE="$DF_USE_DUMMY_SCOPE" \ -e DF_USE_FAT_DUMMY_SCOPE="$DF_USE_FAT_DUMMY_SCOPE" \ - "$IMAGE_REPOSITORY"/deepfence_agent_ce:"${DF_IMG_TAG:-2.2.0}" + "$IMAGE_REPOSITORY"/deepfence_agent_ce:"${DF_IMG_TAG:-2.2.1}" } main() { diff --git a/install.sh b/install.sh index 6cb592e1c2..920cb5ffe8 100755 --- a/install.sh +++ b/install.sh @@ -12,7 +12,7 @@ CROSS="${RED}✘${NC}" INFO="${BLUE}ℹ${NC}" # Default values -DEFAULT_IMAGE_TAG="2.2.0" +DEFAULT_IMAGE_TAG="2.2.1" DEFAULT_STORAGE_CLASS="" # Auto-generate default Neo4j password DEFAULT_NEO4J_PASSWORD=$(openssl rand -base64 12 | tr -dc 'a-zA-Z0-9' | head -c 12)