Major/remove default fluentbit setup (#299)

* major: Delete templates/application-glueops-fluentbit.yaml this can live in our docs * major: removing fluentbit values from values.yaml * docs: automated helm-docs action * major: removing fluentbit ports from values.yaml * docs: automated helm-docs action * major: remove fluentbit AWS details from main.tf * major: remove fluentbit variable details from main.tf * major: remove fluentbit s3 exporter details from values.yaml * docs: automated helm-docs action * chore: bump rc version * docs: automated helm-docs action --------- Co-authored-by: GlueOps <[email protected]>
GlueOps · May 20, 2024 · 6e5a93e · 6e5a93e
1 parent f6556dd
commit 6e5a93e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 241 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: v0.1.0
 description: This chart deploys the GlueOps Platform
 name: glueops-platform
-version: 0.43.0-rc11
+version: 0.43.0-rc12
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # glueops-platform
 
-![Version: 0.43.0-rc11](https://img.shields.io/badge/Version-0.43.0--rc11-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
+![Version: 0.43.0-rc12](https://img.shields.io/badge/Version-0.43.0--rc12-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
 
 This chart deploys the GlueOps Platform
 
@@ -32,9 +32,6 @@ This chart deploys the GlueOps Platform
 | container_images.app_fluent_operator.image.registry | string | `"docker.io"` |  |
 | container_images.app_fluent_operator.image.repository | string | `"kubesphere/fluent-operator"` |  |
 | container_images.app_fluent_operator.image.tag | string | `"v2.7.0"` |  |
-| container_images.app_fluentbit.image.registry | string | `"docker.io"` |  |
-| container_images.app_fluentbit.image.repository | string | `"kubesphere/fluent-bit"` |  |
-| container_images.app_fluentbit.image.tag | string | `"v2.2.0"` |  |
 | container_images.app_glueops_alerts.cluster_monitoring.image.registry | string | `"ghcr.io"` |  |
 | container_images.app_glueops_alerts.cluster_monitoring.image.repository | string | `"glueops/cluster-monitoring"` |  |
 | container_images.app_glueops_alerts.cluster_monitoring.image.tag | string | `"v0.5.0@sha256:5a51c82b954c9b533439ec82776f8102b2d861059d8c4cc20b4b911d3fa34ef6"` |  |
@@ -93,9 +90,6 @@ This chart deploys the GlueOps Platform
 | gitHub.tenant_github_org | string | `"placeholder_tenant_github_org_name"` |  |
 | gitHub.tenant_github_org_and_team | string | `"placeholder_tenant_github_org_name:developers"` | The format is: <github-org-name>:<github-team-name> (The team should include the developers) |
 | glueops_alerts.opsgenie_apikey | string | `"placeholder_opsgenie_api_key"` | Found at `opsgenie_credentials` in the json output that is part of `opsgenie_prometheus_api_keys` output from terraform-module-cloud-multy-prerequisites: https://github.com/GlueOps/terraform-module-cloud-multy-prerequisites |
-| glueops_backups.fluentbit_exporter_to_s3.aws_accessKey | string | `"placeholder_fluentbit_exporter_aws_access_key"` | Part of `fluentbit_log_exporter` output from terraform-module-cloud-multy-prerequisites: https://github.com/GlueOps/terraform-module-cloud-multy-prerequisites |
-| glueops_backups.fluentbit_exporter_to_s3.aws_region | string | `"placeholder_aws_region"` | Should be the same `primary_region` you used in: https://github.com/GlueOps/terraform-module-cloud-multy-prerequisites |
-| glueops_backups.fluentbit_exporter_to_s3.aws_secretKey | string | `"placeholder_fluentbit_exporter_aws_secret_key"` | Part of `fluentbit_log_exporter` output from terraform-module-cloud-multy-prerequisites: https://github.com/GlueOps/terraform-module-cloud-multy-prerequisites |
 | glueops_backups.loki_exporter_to_s3.aws_accessKey | string | `"placeholder_loki_exporter_aws_access_key"` | Part of `loki_log_exporter` output from terraform-module-cloud-multy-prerequisites: https://github.com/GlueOps/terraform-module-cloud-multy-prerequisites |
 | glueops_backups.loki_exporter_to_s3.aws_region | string | `"placeholder_aws_region"` | Should be the same `primary_region` you used in: https://github.com/GlueOps/terraform-module-cloud-multy-prerequisites |
 | glueops_backups.loki_exporter_to_s3.aws_secretKey | string | `"placeholder_loki_exporter_aws_secret_key"` | Part of `loki_log_exporter` output from terraform-module-cloud-multy-prerequisites: https://github.com/GlueOps/terraform-module-cloud-multy-prerequisites |
@@ -124,8 +118,6 @@ This chart deploys the GlueOps Platform
 | host_network.cert_manager.webhook_secure_port | int | `45020` |  |
 | host_network.enabled | string | `"placeholder_enable_host_network"` |  |
 | host_network.external_secrets.webhook_port | int | `45010` |  |
-| host_network.fluentbit.app_port | int | `45070` |  |
-| host_network.fluentbit.metrics_port | int | `45071` |  |
 | host_network.keda.prometheus.metricServer.port | int | `45056` |  |
 | host_network.keda.prometheus.operator.port | int | `45055` |  |
 | host_network.keda.prometheus.webhooks.port | int | `45054` |  |

diff --git a/main.tf b/main.tf
@@ -33,14 +33,6 @@ variable "loki_exporter_aws_secret_key" {
   description = "AWS secret key for Loki exporter"
 }
 
-variable "fluentbit_exporter_aws_access_key" {
-  description = "AWS access key for FluentBit exporter"
-}
-
-variable "fluentbit_exporter_aws_secret_key" {
-  description = "AWS secret key for FluentBit exporter"
-}
-
 variable "externaldns_aws_access_key" {
   description = "AWS access key for external DNS"
 }
@@ -241,7 +233,7 @@ variable "glueops_operators_web_acl_aws_secret_key" {
 
 output "helm_values" {
   value = replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(
-    replace(replace(replace(replace(replace(replace(replace(replace(replace(
+    replace(replace(replace(replace(replace(replace(replace(
       data.local_file.platform_values_template.content,
     "placeholder_tenant_key", var.tenant_key),
     "placeholder_captain_repo_b64enc_private_deploy_key", var.captain_repo_b64encoded_private_deploy_key),
@@ -256,8 +248,6 @@ output "helm_values" {
     "placeholder_vault_aws_secret_key", var.vault_aws_secret_key),
     "placeholder_loki_exporter_aws_access_key", var.loki_exporter_aws_access_key),
     "placeholder_loki_exporter_aws_secret_key", var.loki_exporter_aws_secret_key),
-    "placeholder_fluentbit_exporter_aws_access_key", var.fluentbit_exporter_aws_access_key),
-    "placeholder_fluentbit_exporter_aws_secret_key", var.fluentbit_exporter_aws_secret_key),
     "placeholder_externaldns_aws_access_key", var.externaldns_aws_access_key),
     "placeholder_externaldns_aws_secret_key", var.externaldns_aws_secret_key),
     "placeholder_certmanager_aws_access_key", var.certmanager_aws_access_key),

diff --git a/templates/application-glueops-fluentbit.yaml b/templates/application-glueops-fluentbit.yaml
diff --git a/values.yaml b/values.yaml
@@ -35,9 +35,6 @@ host_network:
         port: 45055
       metricServer:
         port: 45056
-  fluentbit:
-    app_port: 45070
-    metrics_port: 45071
 
 
 
@@ -64,13 +61,6 @@ glueops_backups:
     # @ignored
     cron_expression: "0 */6 * * *"
     company_key: placeholder_tenant_key
-  fluentbit_exporter_to_s3:
-    # -- Should be the same `primary_region` you used in: https://github.com/GlueOps/terraform-module-cloud-multy-prerequisites
-    aws_region: placeholder_aws_region
-    # -- Part of `fluentbit_log_exporter` output from terraform-module-cloud-multy-prerequisites: https://github.com/GlueOps/terraform-module-cloud-multy-prerequisites
-    aws_accessKey: placeholder_fluentbit_exporter_aws_access_key
-    # -- Part of `fluentbit_log_exporter` output from terraform-module-cloud-multy-prerequisites: https://github.com/GlueOps/terraform-module-cloud-multy-prerequisites
-    aws_secretKey: placeholder_fluentbit_exporter_aws_secret_key
   loki_exporter_to_s3:
     # -- Should be the same `primary_region` you used in: https://github.com/GlueOps/terraform-module-cloud-multy-prerequisites
     aws_region: placeholder_aws_region
@@ -351,9 +341,5 @@ container_images:
       registry: docker.io
       repository: kubesphere/fluent-operator
       tag: v2.7.0
-  app_fluentbit:
-    image:
-      registry: docker.io
-      repository: kubesphere/fluent-bit
-      tag: v2.2.0
+